diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a79aec52284be..46ecf35d10ab60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness fc7f1ca0ff5b949ba7b7500e5aa9a01e4a43d894 - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2048aadb25fed1..2e051e9dc7b507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 2.5.1-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 2.5.1-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 6.0.0-preview.1.102 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 7a320e9bab20a2..a99d79df863c35 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 803a95aacf4e01..03aa64e1741ff6 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 2956d8117f73c0..1fcdcc9adc342e 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 34387a8c7acddc..7eafc256758fe3 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 a5c4619b098036..84cbccc8f62719 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "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.SharedFramework.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", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25473.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"