Skip to content

Commit fc9103f

Browse files
SimonZhao888SimonZhao888
authored
[release/9.0.3xx] Update dependencies from dotnet/arcade (#50804)
2 parents 1f477f9 + 61ef73b commit fc9103f

File tree

6 files changed

+36
-22
lines changed

6 files changed

+36
-22
lines changed

‎NuGet.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<add key="darc-int-dotnet-aspnetcore-ff66c26-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ff66c263-1/nuget/v3/index.json" />
3232
<!-- End: Package sources from dotnet-aspnetcore -->
3333
<!-- Begin: Package sources from dotnet-emsdk -->
34+
<add key="darc-pub-dotnet-emsdk-dc8e347" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dc8e3478/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-emsdk-dc8e347-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dc8e3478-4/nuget/v3/index.json" />
36+
<add key="darc-pub-dotnet-emsdk-dc8e347-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dc8e3478-3/nuget/v3/index.json" />
37+
<add key="darc-pub-dotnet-emsdk-dc8e347-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dc8e3478-2/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-emsdk-dc8e347-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dc8e3478-1/nuget/v3/index.json" />
3439
<!-- End: Package sources from dotnet-emsdk -->
3540
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3641
<add key="darc-pub-DotNet-msbuild-Trusted-c9a5370" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c9a53703/nuget/v3/index.json" />

‎eng/Version.Details.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Uri>https://github.com/dotnet/core-setup</Uri>
6060
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
62+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
6363
<Uri>https://github.com/dotnet/emsdk</Uri>
6464
<Sha>dc8e3478c4aa5f6a103329333c2bdbcd07a07741</Sha>
6565
</Dependency>
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
560+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25460.1">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25462.4">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
564+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25460.1">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25462.4">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
568+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25460.1">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25462.4">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
572+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25460.1">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25462.4">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
576+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25460.1">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25462.4">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
580+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25460.1">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25462.4">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
585+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<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
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25460.1</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25460.1</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25460.1</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25462.4</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25462.4</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25462.4</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- 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)