From 8b8a801a2e3b5e67971b77a21f52c55426871e9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Sep 2025 21:55:41 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20250923.2 (#36852) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a794cd9393e..95ced671466 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 diff --git a/eng/Versions.props b/eng/Versions.props index 3c237a79703..f98ff80b7a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 9.0.9 - 9.0.0-beta.25465.2 + 9.0.0-beta.25473.2 17.8.3 diff --git a/global.json b/global.json index b7c7b8d2157..a6d224765e3 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25465.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25473.2" } } From 700efeddb7de9189466ae7e839b4d3efc35e0d9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Sep 2025 23:20:10 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20250923.1 (#36853) [release/8.0] Update dependencies from dotnet/arcade --- NuGet.config | 10 ---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/publish-build-assets.yml | 9 ++++++++- eng/common/templates-official/jobs/jobs.yml | 2 ++ eng/common/templates/job/publish-build-assets.yml | 9 ++++++++- eng/common/templates/jobs/jobs.yml | 2 ++ global.json | 4 ++-- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5910b9f5fe..77b2bf048ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,6 @@ - - - - - @@ -23,11 +18,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c75ca80844..b202ffaeeb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,17 +60,17 @@ - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e diff --git a/eng/Versions.props b/eng/Versions.props index f65abbb9b13..d2a3446ead0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 8.0.20-servicing.25419.14 - 8.0.0-beta.25461.1 + 8.0.0-beta.25473.1 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 7a320e9bab2..a99d79df863 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -52,6 +54,11 @@ jobs: value: false - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates-official/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -93,7 +100,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 803a95aacf4..03aa64e1741 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -41,6 +41,7 @@ parameters: enableSourceIndex: false sourceIndexParams: {} repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -97,3 +98,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 2956d8117f7..1fcdcc9adc3 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -52,6 +54,11 @@ jobs: value: false - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -91,7 +98,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 34387a8c7ac..7eafc256758 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -41,6 +41,7 @@ parameters: enableSourceIndex: false sourceIndexParams: {} repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -97,3 +98,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index 5f45975b61d..b3ad775c719 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25461.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25461.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1" } } From df3b20c682c8169ac84cab0c34880782055cbb30 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Wed, 24 Sep 2025 11:07:22 -0700 Subject: [PATCH 3/4] [release/8.0] Remove OSX.13.Amd64 target from HelixTargetQueues (#36855) --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3898b4b6198..8a47f80c44c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -209,7 +209,7 @@ extends: - name: _HelixBuildConfig value: $(_BuildConfig) - name: HelixTargetQueues - value: Windows.10.Amd64;OSX.13.Amd64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64 + value: Windows.10.Amd64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64 - name: _HelixAccessToken # Needed for internal queues value: $(HelixApiAccessToken) From e95f432fc0ccf23719bdf90286ddc61a47af7a9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 19:22:04 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20250925.3 (#36867) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95ced671466..8f109386f73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c diff --git a/eng/Versions.props b/eng/Versions.props index f98ff80b7a4..17d539eb414 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 9.0.9 - 9.0.0-beta.25473.2 + 9.0.0-beta.25475.3 17.8.3 diff --git a/global.json b/global.json index a6d224765e3..019a28d41d7 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25473.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25475.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25475.3" } }