From 634313c42993da5b4ad0214b3cc394a1320c2b19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Sep 2025 02:02:25 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20250912.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25461.1 -> To Version 8.0.0-beta.25462.5 --- eng/Version.Details.xml | 8 ++++---- .../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 ++-- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c2428439c..5614e93918 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + dc4d6c8c4c747fd66c63126fc933615fc69ebe9b - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + dc4d6c8c4c747fd66c63126fc933615fc69ebe9b diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 7a320e9bab..a99d79df86 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 803a95aacf..03aa64e174 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 2956d8117f..1fcdcc9adc 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 34387a8c7a..7eafc25675 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 789305590f..58dc00b1b1 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.120" }, "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.25462.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.5" } } From cb885a3a05265ef2c10163e13786cb004b94539d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Sep 2025 02:02:19 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20250912.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25461.1 -> To Version 8.0.0-beta.25462.6 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5614e93918..8a00eba6f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - dc4d6c8c4c747fd66c63126fc933615fc69ebe9b + 1df8dfdfc8068e5180687a3079427b120de18eed - + https://github.com/dotnet/arcade - dc4d6c8c4c747fd66c63126fc933615fc69ebe9b + 1df8dfdfc8068e5180687a3079427b120de18eed diff --git a/global.json b/global.json index 58dc00b1b1..7bb419ac4b 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.120" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.6", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.6" } } From cc9cb36a62e303fef51a138846adff16b588ba1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Sep 2025 02:02:04 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20250915.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.25461.1 -> To Version 8.0.0-beta.25465.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a00eba6f4..5a07ed47d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 1df8dfdfc8068e5180687a3079427b120de18eed + 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af - + https://github.com/dotnet/arcade - 1df8dfdfc8068e5180687a3079427b120de18eed + 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af diff --git a/global.json b/global.json index 7bb419ac4b..dba94d5dc3 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.120" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.6", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25465.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25465.1" } }