diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index bd4cf04e..362e405f 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -4,11 +4,6 @@ steps: inputs: useGlobalJson: true -- task: UseDotNet@2 - displayName: 'Installing dotnet 3.1 to run srgen (To be removed after srgen is updated)' - inputs: - version: 3.1.406 - - task: BatchScript@1 displayName: 'Run script build.cmd' inputs: diff --git a/build.cake b/build.cake index 3b15753b..a90f2f2d 100644 --- a/build.cake +++ b/build.cake @@ -643,7 +643,7 @@ Task("SRGen") } // Run SRGen - var dotnetArgs = string.Format("{0} -or \"{1}\" -oc \"{2}\" -ns \"{3}\" -an \"{4}\" -cn SR -l CS -dnx \"{5}\"", + var dotnetArgs = string.Format("--roll-forward Major {0} -or \"{1}\" -oc \"{2}\" -ns \"{3}\" -an \"{4}\" -cn SR -l CS -dnx \"{5}\"", srgenPath, outputResx, outputCs, projectName, projectNameSpace, projectStrings); Information("{0}", dotnetcli); Information("{0}", dotnetArgs); diff --git a/scripts/packages.config b/scripts/packages.config index f618c64b..8adc549b 100644 --- a/scripts/packages.config +++ b/scripts/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Microsoft.Kusto.ServiceLayer/Localization/sr.cs b/src/Microsoft.Kusto.ServiceLayer/Localization/sr.cs index ba7f753f..ddd3e3c3 100644 --- a/src/Microsoft.Kusto.ServiceLayer/Localization/sr.cs +++ b/src/Microsoft.Kusto.ServiceLayer/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // diff --git a/src/Microsoft.SqlTools.Credentials/Localization/sr.cs b/src/Microsoft.SqlTools.Credentials/Localization/sr.cs index b1c0aeb2..6d6e9cf7 100755 --- a/src/Microsoft.SqlTools.Credentials/Localization/sr.cs +++ b/src/Microsoft.SqlTools.Credentials/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // diff --git a/src/Microsoft.SqlTools.Hosting/Localization/sr.cs b/src/Microsoft.SqlTools.Hosting/Localization/sr.cs index 19f58919..9f0d86a0 100755 --- a/src/Microsoft.SqlTools.Hosting/Localization/sr.cs +++ b/src/Microsoft.SqlTools.Hosting/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // diff --git a/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs index f814a0b9..9888dd90 100644 --- a/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs +++ b/src/Microsoft.SqlTools.ManagedBatchParser/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // diff --git a/src/Microsoft.SqlTools.ResourceProvider.Core/Localization/sr.cs b/src/Microsoft.SqlTools.ResourceProvider.Core/Localization/sr.cs index f933e783..b5a3b94e 100644 --- a/src/Microsoft.SqlTools.ResourceProvider.Core/Localization/sr.cs +++ b/src/Microsoft.SqlTools.ResourceProvider.Core/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // diff --git a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Localization/sr.cs b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Localization/sr.cs index 12cc7b9f..c4807dd0 100644 --- a/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Localization/sr.cs +++ b/src/Microsoft.SqlTools.ResourceProvider.DefaultImpl/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // diff --git a/src/Microsoft.SqlTools.ResourceProvider/Localization/sr.cs b/src/Microsoft.SqlTools.ResourceProvider/Localization/sr.cs index f9f7af79..554d9b00 100755 --- a/src/Microsoft.SqlTools.ResourceProvider/Localization/sr.cs +++ b/src/Microsoft.SqlTools.ResourceProvider/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs index 5f98fa99..00a0b60c 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs @@ -1,5 +1,5 @@ // WARNING: -// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0 +// This file was generated by the Microsoft DataWarehouse String Resource Tool 5.0.0.0 // from information in sr.strings // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN //