diff --git a/NuGet.config b/NuGet.config index 6cb00e2877f..fc5b2cdc330 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,6 @@ - - - - - @@ -22,11 +17,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5050eb6ac8a..f51ccda99d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,19 +71,19 @@ - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de https://github.com/nuget/nuget.client @@ -98,9 +98,9 @@ df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - \ No newline at end of file + diff --git a/eng/Versions.props b/eng/Versions.props index 299c910ffbd..e4f1854bb62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,8 @@ - 17.12.9release + 17.12.10 + release 17.11.4 15.1.0.0 preview @@ -49,7 +50,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 9.0.0-beta.24516.2 + 9.0.0-beta.24562.13 7.0.0 6.0.1 4.12.0-3.24463.9 diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index bd4f01e64ce..c5a9c1f8275 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -4,4 +4,4 @@ steps: is1ESPipeline: true ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index 808f3174635..83760c9798e 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -4,4 +4,4 @@ steps: is1ESPipeline: false ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/global.json b/global.json index 03cd1994123..e571c259338 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.10.0-pre.4.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13" } }