From 08961e5fdb37f440a0d5092f421e620d188f4b45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jan 2026 02:01:58 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20260114.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 11.0.0-beta.26062.1 -> To Version 11.0.0-beta.26064.2 --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/publish-build-assets.yml | 2 +- eng/common/core-templates/post-build/post-build.yml | 4 ++-- eng/common/templates/variables/pool-providers.yml | 2 +- global.json | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e919db8c9e9..76fc8f43dbb 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props 5.0.0-2.25480.7 5.0.0-2.25480.7 - 11.0.0-beta.26062.1 + 11.0.0-beta.26064.2 1.0.0-prerelease.25502.1 1.0.0-prerelease.25502.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3afe10a80ce..ba2d6f0c00b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -76,9 +76,9 @@ - + https://github.com/dotnet/arcade - 594f3bcba9361908a75c769c1d2d5668facc0dea + 24b29186c16793fff7079515483f26585e5b2881 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 8b5c635fe80..c9ee8ffd8f1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 06864cd1feb..3bed9cdb49d 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index e0b19c14a07..18693ea120d 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index 0c68626c404..1656a410636 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100", + "version": "11.0.100-alpha.1.25618.104", "allowPrerelease": true, "paths": [ ".dotnet", @@ -9,7 +9,7 @@ "errorMessage": "The .NET SDK could not be found, please run ./eng/common/dotnet.sh." }, "tools": { - "dotnet": "10.0.100", + "dotnet": "11.0.100-alpha.1.25618.104", "vs": { "version": "18.0", "components": [ @@ -22,7 +22,7 @@ "perl": "5.38.2.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26062.1", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26064.2", "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2" } } From 5b796c14cffcc9702f95c2a4b6878ef9023a264b Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Thu, 15 Jan 2026 09:26:09 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 1656a410636..6b1345eb0b1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-alpha.1.25618.104", + "version": "10.0.100", "allowPrerelease": true, "paths": [ ".dotnet", @@ -9,7 +9,7 @@ "errorMessage": "The .NET SDK could not be found, please run ./eng/common/dotnet.sh." }, "tools": { - "dotnet": "11.0.100-alpha.1.25618.104", + "dotnet": "10.0.100", "vs": { "version": "18.0", "components": [