From 52c107ced0f4a6e3649dcbcc1b3378dfcb9d0b00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 01:22:37 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20251204.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25515.1 -> To Version 8.0.0-beta.25604.1 --- eng/Version.Details.xml | 4 ++-- eng/common/templates-official/job/publish-build-assets.yml | 5 +++++ eng/common/templates-official/job/source-build.yml | 2 +- eng/common/templates-official/post-build/post-build.yml | 5 +++++ eng/common/templates-official/steps/source-build.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 5 +++++ eng/common/templates/post-build/post-build.yml | 5 +++++ eng/common/templates/steps/source-build.yml | 2 +- global.json | 2 +- 9 files changed, 26 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b21366102..b04c50c37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,9 +39,9 @@ - + https://github.com/dotnet/arcade - 6544413e02741855b701468aa8afc6cf8ca62c72 + 73fd0fca28e08b5228968c48260e771f65c6229b diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index a99d79df8..53109246d 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -152,6 +152,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 7b9c58a90..f75400757 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -61,7 +61,7 @@ jobs: ${{ 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: 1es-azurelinux-3 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 817e2d80d..07837055e 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -271,6 +271,11 @@ stages: - task: NuGetAuthenticate@1 + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index b63043da4..c307825c9 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1fcdcc9ad..b4ece772c 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -148,6 +148,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ea1785a8a..96ca06882 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -267,6 +267,11 @@ stages: - task: NuGetAuthenticate@1 + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ae06b26ea..d08a0e92c 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 828f7f2fe..2bbe7d690 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From b4c1938ab55251f9d1a2dc1bb75850619371a5de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Dec 2025 03:22:21 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20251205.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25515.1 -> To Version 8.0.0-beta.25605.4 --- eng/Version.Details.xml | 4 ++-- eng/common/templates-official/job/source-index-stage1.yml | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b04c50c37..a59136b96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,9 +39,9 @@ - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 0579e692f..8de0dfaf3 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' diff --git a/global.json b/global.json index 2bbe7d690..900f9bf39 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From c61dc09c73b12bd603046b7823cd2ba7686e9081 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Dec 2025 18:52:02 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20251209.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.25515.1 -> To Version 8.0.0-beta.25609.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a59136b96..c7504775d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,9 +39,9 @@ - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 diff --git a/global.json b/global.json index 900f9bf39..65c29a96e 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25609.3", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" }