diff --git a/NuGet.config b/NuGet.config
index afc7b78a0c6..9cf6ae26306 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,11 +4,6 @@
-
-
-
-
-
@@ -27,11 +22,6 @@
-
-
-
-
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cb3c58a056d..3b97bcbca32 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
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
diff --git a/eng/Versions.props b/eng/Versions.props
index d9e5a2c55d8..747816e726d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,9 +56,9 @@
- 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
17.4.0-preview-20220707-01
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 67bd5f1565c..78d0f0208d2 100644
--- a/global.json
+++ b/global.json
@@ -14,9 +14,9 @@
"version": "8.0.120"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25461.1",
- "Microsoft.DotNet.CMake.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.CMake.Sdk": "8.0.0-beta.25473.1",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "8.0.20-servicing.25419.14"
},