Skip to content

Commit 3a384f2

Browse files
authored
Merge pull request #9338 from dotnet/darc-release/9.0.1xx-902ed1bf-8b57-4790-9969-59b3201ba8db
[release/9.0.1xx] Update dependencies from dotnet/arcade
2 parents 9b91cf6 + 4b76fab commit 3a384f2

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
24+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
2525
</Dependency>
2626
<!-- Intermediate is necessary for source build. -->
27-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25460.1">
27+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25462.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
29+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
3030
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3131
</Dependency>
3232
<!-- Dependencies required for source build. We'll still update manually -->

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ parameters:
3434

3535
repositoryAlias: self
3636

37+
officialBuildId: ''
38+
3739
jobs:
3840
- job: Asset_Registry_Publish
3941

@@ -56,6 +58,11 @@ jobs:
5658
value: false
5759
# unconditional - needed for logs publishing (redactor tool version)
5860
- template: /eng/common/core-templates/post-build/common-variables.yml
61+
- name: OfficialBuildId
62+
${{ if ne(parameters.officialBuildId, '') }}:
63+
value: ${{ parameters.officialBuildId }}
64+
${{ else }}:
65+
value: $(Build.BuildNumber)
5966

6067
pool:
6168
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -100,7 +107,7 @@ jobs:
100107
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
101108
/p:MaestroApiEndpoint=https://maestro.dot.net
102109
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
103-
/p:OfficialBuildId=$(Build.BuildNumber)
110+
/p:OfficialBuildId=$(OfficialBuildId)
104111
condition: ${{ parameters.condition }}
105112
continueOnError: ${{ parameters.continueOnError }}
106113

eng/common/core-templates/jobs/jobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -119,3 +120,4 @@ jobs:
119120
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
120121
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
121122
repositoryAlias: ${{ parameters.repositoryAlias }}
123+
officialBuildId: ${{ parameters.officialBuildId }}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "9.0.110"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1"
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4"
77
}
88
}

0 commit comments

Comments
 (0)