From d1e525ee4bfe8ca0d0796050314540a2fbfb74c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Jan 2026 05:02:27 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20260112.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.26057.1 -> To Version 10.0.0-beta.26062.3 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 2 +- .../job/publish-build-assets.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +-- .../templates/variables/pool-providers.yml | 2 +- global.json | 4 +-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02339578d2..e12ad75fbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - 13323fc374efc77953ec0ac9a0927da69f14a584 + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 - + https://github.com/dotnet/arcade - 13323fc374efc77953ec0ac9a0927da69f14a584 + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 - + https://github.com/dotnet/arcade - 13323fc374efc77953ec0ac9a0927da69f14a584 + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 - + https://github.com/dotnet/arcade - 13323fc374efc77953ec0ac9a0927da69f14a584 + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 - + https://github.com/dotnet/arcade - 13323fc374efc77953ec0ac9a0927da69f14a584 + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 - + https://github.com/dotnet/arcade - 13323fc374efc77953ec0ac9a0927da69f14a584 + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 - + https://github.com/dotnet/arcade - 13323fc374efc77953ec0ac9a0927da69f14a584 + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 diff --git a/eng/Versions.props b/eng/Versions.props index 806c6d3e5c..e107a2b1aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.26057.1 + 10.0.0-beta.26062.3 9.0.4 0.0.6-test 0.0.13-test diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3437087c80..b955fac6e1 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 9423d71ca3..b942a79ef0 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 e0b19c14a0..18693ea120 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 d598386714..4aaf3d860a 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26057.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26057.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26062.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" } From caa21ddb9562d7185c813ede13ee50c559d67a13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jan 2026 05:02:57 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/arcade build 20260116.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.26057.1 -> To Version 10.0.0-beta.26066.3 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 2 +- .../core-templates/job/source-build.yml | 2 +- global.json | 4 +-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e12ad75fbc..7ccd0f7489 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 + af17297350d5e5357d2ab3d69369d2a58b8bc4ab - + https://github.com/dotnet/arcade - 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 + af17297350d5e5357d2ab3d69369d2a58b8bc4ab - + https://github.com/dotnet/arcade - 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 + af17297350d5e5357d2ab3d69369d2a58b8bc4ab - + https://github.com/dotnet/arcade - 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 + af17297350d5e5357d2ab3d69369d2a58b8bc4ab - + https://github.com/dotnet/arcade - 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 + af17297350d5e5357d2ab3d69369d2a58b8bc4ab - + https://github.com/dotnet/arcade - 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 + af17297350d5e5357d2ab3d69369d2a58b8bc4ab - + https://github.com/dotnet/arcade - 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 + af17297350d5e5357d2ab3d69369d2a58b8bc4ab diff --git a/eng/Versions.props b/eng/Versions.props index e107a2b1aa..d0b44f261d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.26062.3 + 10.0.0-beta.26066.3 9.0.4 0.0.6-test 0.0.13-test diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb..c08b3ad8ad 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: Azure-Linux-3-Amd64 os: linux ${{ else }}: pool: diff --git a/global.json b/global.json index 4aaf3d860a..da028bdce6 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26062.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26066.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26066.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" } From dd33df0d3154146aa22d688fcca646ca17a7923e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Feb 2026 05:02:43 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/arcade build 20260130.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.26057.1 -> To Version 10.0.0-beta.26080.4 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 2 +- .../core-templates/job/source-build.yml | 6 ++-- global.json | 4 +-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ccd0f7489..f18922250a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 - + https://github.com/dotnet/arcade - af17297350d5e5357d2ab3d69369d2a58b8bc4ab + b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 diff --git a/eng/Versions.props b/eng/Versions.props index d0b44f261d..65aa00ebf3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.26066.3 + 10.0.0-beta.26080.4 9.0.4 0.0.6-test 0.0.13-test diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad..4cb769473f 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,7 +60,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals Azure-Linux-3-Amd64-Public ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] image: Azure-Linux-3-Amd64 @@ -69,10 +69,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + demands: ImageOverride -equals Azure-Linux-3-Amd64-Public ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 + demands: ImageOverride -equals Azure-Linux-3-Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/global.json b/global.json index da028bdce6..9a5696e2e2 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26066.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26066.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26080.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" } From b85235ac7d2647dde0ce1bb53c71f58d81cf93c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Feb 2026 05:03:30 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/arcade build 20260206.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.26057.1 -> To Version 10.0.0-beta.26106.4 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 2 +- .../core-templates/job/source-build.yml | 8 +++--- global.json | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f18922250a..ab8f0e24e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 + 58d75363f4b03e408aa2502e0db546173be722d4 - + https://github.com/dotnet/arcade - b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 + 58d75363f4b03e408aa2502e0db546173be722d4 - + https://github.com/dotnet/arcade - b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 + 58d75363f4b03e408aa2502e0db546173be722d4 - + https://github.com/dotnet/arcade - b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 + 58d75363f4b03e408aa2502e0db546173be722d4 - + https://github.com/dotnet/arcade - b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 + 58d75363f4b03e408aa2502e0db546173be722d4 - + https://github.com/dotnet/arcade - b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 + 58d75363f4b03e408aa2502e0db546173be722d4 - + https://github.com/dotnet/arcade - b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95 + 58d75363f4b03e408aa2502e0db546173be722d4 diff --git a/eng/Versions.props b/eng/Versions.props index 65aa00ebf3..e6e6d78912 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.26080.4 + 10.0.0-beta.26106.4 9.0.4 0.0.6-test 0.0.13-test diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 4cb769473f..1997c2ae00 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,19 +60,19 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Azure-Linux-3-Amd64-Public + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: Azure-Linux-3-Amd64 + image: build.azurelinux.3.amd64 os: linux ${{ else }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Azure-Linux-3-Amd64-Public + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Azure-Linux-3-Amd64 + demands: ImageOverride -equals build.azurelinux.3.amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/global.json b/global.json index 9a5696e2e2..3c6323630f 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26080.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26106.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26106.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" } From 6004091235ecf820ab957fbed209785821bd2507 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Feb 2026 05:03:03 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/arcade build 20260210.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.26057.1 -> To Version 10.0.0-beta.26110.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab8f0e24e0..aec787062c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - 58d75363f4b03e408aa2502e0db546173be722d4 + 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d - + https://github.com/dotnet/arcade - 58d75363f4b03e408aa2502e0db546173be722d4 + 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d - + https://github.com/dotnet/arcade - 58d75363f4b03e408aa2502e0db546173be722d4 + 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d - + https://github.com/dotnet/arcade - 58d75363f4b03e408aa2502e0db546173be722d4 + 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d - + https://github.com/dotnet/arcade - 58d75363f4b03e408aa2502e0db546173be722d4 + 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d - + https://github.com/dotnet/arcade - 58d75363f4b03e408aa2502e0db546173be722d4 + 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d - + https://github.com/dotnet/arcade - 58d75363f4b03e408aa2502e0db546173be722d4 + 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d diff --git a/eng/Versions.props b/eng/Versions.props index e6e6d78912..ef75ff3eaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.26106.4 + 10.0.0-beta.26110.1 9.0.4 0.0.6-test 0.0.13-test diff --git a/global.json b/global.json index 3c6323630f..fc46141fe7 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26106.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26106.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26110.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" } From aee40d87b15840ad2800a975e0de592738875e2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Feb 2026 05:02:50 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20260219.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.26057.1 -> To Version 10.0.0-beta.26119.2 --- eng/Version.Details.xml | 28 +++++++++--------- eng/Versions.props | 2 +- eng/common/templates/steps/vmr-sync.yml | 21 -------------- eng/common/templates/vmr-build-pr.yml | 1 + eng/common/tools.ps1 | 5 ++++ eng/common/tools.sh | 8 +++++- eng/common/vmr-sync.ps1 | 38 +++++++++++++++++++++---- eng/common/vmr-sync.sh | 30 +++++++++++++++---- global.json | 4 +-- 9 files changed, 87 insertions(+), 50 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aec787062c..b702d3dd47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d + 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 - + https://github.com/dotnet/arcade - 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d + 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 - + https://github.com/dotnet/arcade - 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d + 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 - + https://github.com/dotnet/arcade - 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d + 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 - + https://github.com/dotnet/arcade - 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d + 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 - + https://github.com/dotnet/arcade - 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d + 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 - + https://github.com/dotnet/arcade - 4bf37ce670528cf2aef4d9b1cd892554b1b02d9d + 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 diff --git a/eng/Versions.props b/eng/Versions.props index ef75ff3eaf..c28b0816e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.26110.1 + 10.0.0-beta.26119.2 9.0.4 0.0.6-test 0.0.13-test diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml index 599afb6186..eb619c5026 100644 --- a/eng/common/templates/steps/vmr-sync.yml +++ b/eng/common/templates/steps/vmr-sync.yml @@ -38,27 +38,6 @@ steps: displayName: Label PR commit workingDirectory: $(Agent.BuildDirectory)/repo -- script: | - vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml) - echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha" - displayName: Obtain the vmr sha from Version.Details.xml (Unix) - condition: ne(variables['Agent.OS'], 'Windows_NT') - workingDirectory: $(Agent.BuildDirectory)/repo - -- powershell: | - [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml - $vmr_sha = $xml.SelectSingleNode("//Source").Sha - Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha" - displayName: Obtain the vmr sha from Version.Details.xml (Windows) - condition: eq(variables['Agent.OS'], 'Windows_NT') - workingDirectory: $(Agent.BuildDirectory)/repo - -- script: | - git fetch --all - git checkout $(vmr_sha) - displayName: Checkout VMR at correct sha for repo flow - workingDirectory: ${{ parameters.vmrPath }} - - script: | git config --global user.name "dotnet-maestro[bot]" git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com" diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml index ce3c29a62f..2f3694fa13 100644 --- a/eng/common/templates/vmr-build-pr.yml +++ b/eng/common/templates/vmr-build-pr.yml @@ -34,6 +34,7 @@ resources: type: github name: dotnet/dotnet endpoint: dotnet + ref: refs/heads/main # Set to whatever VMR branch the PR build should insert into stages: - template: /eng/pipelines/templates/stages/vmr-build.yml@vmr diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db99..977a2d4b10 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -824,6 +824,11 @@ function MSBuild-Core() { $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" + # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable + if ($env:MSBUILD_MT_ENABLED -eq "1") { + $cmdArgs += ' -mt' + } + if ($warnAsError) { $cmdArgs += ' /warnaserror /p:TreatWarningsAsErrors=true' } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd..1b296f646c 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -526,7 +526,13 @@ function MSBuild-Core { } } - RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" + # Add -mt flag for MSBuild multithreaded mode if enabled via environment variable + local mt_switch="" + if [[ "${MSBUILD_MT_ENABLED:-}" == "1" ]]; then + mt_switch="-mt" + fi + + RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } function GetDarc { diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 index 97302f3205..b37992d91c 100644 --- a/eng/common/vmr-sync.ps1 +++ b/eng/common/vmr-sync.ps1 @@ -103,12 +103,20 @@ Set-StrictMode -Version Latest Highlight 'Installing .NET, preparing the tooling..' . .\eng\common\tools.ps1 $dotnetRoot = InitializeDotNetCli -install:$true +$env:DOTNET_ROOT = $dotnetRoot $darc = Get-Darc -$dotnet = "$dotnetRoot\dotnet.exe" Highlight "Starting the synchronization of VMR.." # Synchronize the VMR +$versionDetailsPath = Resolve-Path (Join-Path $PSScriptRoot '..\Version.Details.xml') | Select-Object -ExpandProperty Path +[xml]$versionDetails = Get-Content -Path $versionDetailsPath +$repoName = $versionDetails.SelectSingleNode('//Source').Mapping +if (-not $repoName) { + Fail "Failed to resolve repo mapping from $versionDetailsPath" + exit 1 +} + $darcArgs = ( "vmr", "forwardflow", "--tmp", $tmpDir, @@ -130,9 +138,27 @@ if ($LASTEXITCODE -eq 0) { Highlight "Synchronization succeeded" } else { - Fail "Synchronization of repo to VMR failed!" - Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)." - Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)." - Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." - exit 1 + Highlight "Failed to flow code into the local VMR. Falling back to resetting the VMR to match repo contents..." + git -C $vmrDir reset --hard + + $resetArgs = ( + "vmr", "reset", + "${repoName}:HEAD", + "--vmr", $vmrDir, + "--tmp", $tmpDir, + "--additional-remotes", "${repoName}:${repoRoot}" + ) + + & "$darc" $resetArgs + + if ($LASTEXITCODE -eq 0) { + Highlight "Successfully reset the VMR using 'darc vmr reset'" + } + else { + Fail "Synchronization of repo to VMR failed!" + Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)." + Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)." + Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 + } } diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh index 44239e331c..198caec59b 100644 --- a/eng/common/vmr-sync.sh +++ b/eng/common/vmr-sync.sh @@ -186,6 +186,13 @@ fi # Synchronize the VMR +version_details_path=$(cd "$scriptroot/.."; pwd -P)/Version.Details.xml +repo_name=$(grep -m 1 ' Date: Mon, 2 Mar 2026 05:03:15 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/arcade build 20260223.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.26057.1 -> To Version 10.0.0-beta.26123.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b702d3dd47..c40119c01e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,38 +7,38 @@ - + https://github.com/dotnet/arcade - 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 + 4d898652733deb7dd274237ac06d27ee2ad85b36 - + https://github.com/dotnet/arcade - 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 + 4d898652733deb7dd274237ac06d27ee2ad85b36 - + https://github.com/dotnet/arcade - 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 + 4d898652733deb7dd274237ac06d27ee2ad85b36 - + https://github.com/dotnet/arcade - 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 + 4d898652733deb7dd274237ac06d27ee2ad85b36 - + https://github.com/dotnet/arcade - 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 + 4d898652733deb7dd274237ac06d27ee2ad85b36 - + https://github.com/dotnet/arcade - 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 + 4d898652733deb7dd274237ac06d27ee2ad85b36 - + https://github.com/dotnet/arcade - 062ea8ab27da7dbb7d4f630bd50aeab94c9ffb93 + 4d898652733deb7dd274237ac06d27ee2ad85b36 diff --git a/eng/Versions.props b/eng/Versions.props index c28b0816e2..bb600a6dc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ 9.0.0-beta.24212.4 5.0.0-preview.5.20278.1 8.0.0-beta.24525.2 - 10.0.0-beta.26119.2 + 10.0.0-beta.26123.2 9.0.4 0.0.6-test 0.0.13-test diff --git a/global.json b/global.json index 6dfcddbbfb..2c92b29ed9 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26119.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26119.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26123.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26123.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0" }