diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b005b576cc8..70056971387 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 diff --git a/eng/Versions.props b/eng/Versions.props index a5d72e191ff..ce40ec140b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,9 +57,9 @@ - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 - 9.0.0-beta.25460.1 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 17.4.0-preview-20220707-01 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b103b7ee168..a58c8a418e8 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -34,6 +34,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -56,6 +58,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-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) @@ -100,7 +107,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/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 3129670b338..bf33cdc2cc7 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' 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. @@ -119,3 +120,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index c01fdf33f1a..e07e5f0f361 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25460.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "9.0.9" },