Skip to content

Commit 7a36174

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250912.4 (#36782)
[release/9.0] Update dependencies from dotnet/arcade
1 parent bd6018a commit 7a36174

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed

NuGet.config

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-893c2eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-893c2eb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-4/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-893c2eb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-3/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-893c2eb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-2/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-893c2eb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-1/nuget/v3/index.json" />
127
<!-- End: Package sources from dotnet-runtime -->
138
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
149
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,11 +20,6 @@
2520
<clear />
2621
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2722
<!-- Begin: Package sources from dotnet-runtime -->
28-
<add key="darc-int-dotnet-runtime-893c2eb-1" value="true" />
29-
<add key="darc-int-dotnet-runtime-893c2eb-2" value="true" />
30-
<add key="darc-int-dotnet-runtime-893c2eb-3" value="true" />
31-
<add key="darc-int-dotnet-runtime-893c2eb-4" value="true" />
32-
<add key="darc-int-dotnet-runtime-893c2eb" value="true" />
3323
<!-- End: Package sources from dotnet-runtime -->
3424
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3525
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
72+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25460.1">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25462.4">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
76+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25460.1">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25462.4">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
80+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemFormatsAsn1Version>9.0.9</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
37-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksTemplatingVersion>
37+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksTemplatingVersion>
3838
</PropertyGroup>
3939
<PropertyGroup Label="Other dependencies">
4040
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

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
@@ -13,7 +13,7 @@
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1"
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4"
1818
}
1919
}

0 commit comments

Comments
 (0)