Skip to content

Commit 286ec9c

Browse files
authored
[release/9.0.1xx] Update dependencies from dotnet/arcade (#50803)
2 parents 749d24c + 1c1a027 commit 286ec9c

File tree

5 files changed

+30
-21
lines changed

5 files changed

+30
-21
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
594+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25460.1">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25462.4">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
598+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25460.1">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25462.4">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
602+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25460.1">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25462.4">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
606+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25460.1">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25462.4">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
610+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25460.1">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25462.4">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
614+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25460.1">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25462.4">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
619+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.9">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25460.1</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25460.1</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25460.1</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25462.4</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25462.4</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25462.4</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)