Skip to content

Commit f7f8937

Browse files
[release/9.0] Update dependencies from dotnet/arcade (#5260)
[release/9.0] Update dependencies from dotnet/arcade
1 parent 5486923 commit f7f8937

File tree

5 files changed

+26
-17
lines changed

5 files changed

+26
-17
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
157+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25460.1">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.25462.4">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
161+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25460.1">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25462.4">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
165+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25460.1">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25462.4">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
169+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25460.1">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25462.4">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
173+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25460.1">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.25462.4">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
177+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksArchivesVersion>
16-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksInstallersVersion>
15+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksArchivesVersion>
16+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksInstallersVersion>
1717
<!-- corefx -->
1818
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1919
<SystemDataSqlClientVersion>4.9.0</SystemDataSqlClientVersion>

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "9.0.110"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25460.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)