diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d0194c1fc9b04c..e02f0d85d7e9a4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25461.1 19.1.0-alpha.1.25461.1 - 5.0.0-2.25467.107 - 5.0.0-2.25467.107 - 5.0.0-2.25467.107 - 10.0.100-rc.2.25467.107 - 10.0.100-rc.2.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 0.11.5-alpha.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 10.0.0-beta.25467.107 - 2.9.3-beta.25467.107 - 2.9.3-beta.25467.107 - 10.0.0-beta.25467.107 - 5.0.0-2.25467.107 - 10.0.0-rc.2.25467.107 - 10.0.100-rc.2.25467.107 - 10.0.0-rc.2.25467.107 - 10.0.0-rc.2.25467.107 - 7.0.0-preview.2.46807 - 7.0.0-preview.2.46807 - 7.0.0-preview.2.46807 - 7.0.0-preview.2.46807 - 10.0.0-rc.2.25467.107 - 2.0.0-rc.2.25467.107 - 10.0.0-rc.2.25467.107 - 10.0.0-rc.2.25467.107 - 10.0.0-rc.2.25467.107 + 5.0.0-2.25468.104 + 5.0.0-2.25468.104 + 5.0.0-2.25468.104 + 10.0.100-rc.2.25468.104 + 10.0.100-rc.2.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 0.11.5-alpha.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 10.0.0-beta.25468.104 + 2.9.3-beta.25468.104 + 2.9.3-beta.25468.104 + 10.0.0-beta.25468.104 + 5.0.0-2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.100-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 7.0.0-preview.2.46904 + 7.0.0-preview.2.46904 + 7.0.0-preview.2.46904 + 7.0.0-preview.2.46904 + 10.0.0-rc.2.25468.104 + 2.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25468.104 10.0.0-beta.25418.1 10.0.0-beta.25418.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60c73ba8a3a763..0d5f66759746b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 2cfe42ea4a7fe364dcb197beca469af8edec0ad6 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness dbb478b6aafa222529ae95be344a1b91485c4adf - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 3910cd6230be3d4d283edd6a52bff27f549dd675 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 https://github.com/dotnet/node diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 348cd16376f10d..37dff559fc1b9a 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -40,6 +40,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -62,6 +64,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) @@ -124,7 +131,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net - /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 b637cb6e94808e..01ada747665145 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. @@ -116,3 +117,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index 80ad5f68194879..371b7c75a57e94 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25467.107", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25467.107", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25467.107", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25468.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25467.107" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.2.25468.104" } }