Skip to content

Commit 1e223ac

Browse files
nagilsonnagilson
authored
[release/8.0.4xx] Update dependencies from dotnet/arcade (#51605)
2 parents 1f6b664 + 58cfc4b commit 1e223ac

File tree

8 files changed

+32
-21
lines changed

8 files changed

+32
-21
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +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-emsdk -->
7-
<add key="darc-pub-dotnet-emsdk-42532a7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-42532a75/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-emsdk -->
98
<!-- Begin: Package sources from dotnet-format -->
109
<add key="darc-pub-dotnet-format-64cbc6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-64cbc6c3/nuget/v3/index.json" />
@@ -14,21 +13,17 @@
1413
<add key="darc-pub-dotnet-format-64cbc6c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-64cbc6c3-1/nuget/v3/index.json" />
1514
<!-- End: Package sources from dotnet-format -->
1615
<!-- Begin: Package sources from dotnet-aspnetcore -->
17-
<add key="darc-int-dotnet-aspnetcore-6254f5c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-6254f5ca/nuget/v3/index.json" />
1816
<!-- End: Package sources from dotnet-aspnetcore -->
1917
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
20-
<add key="darc-int-DotNet-msbuild-Trusted-02bf662" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-02bf6629/nuget/v3/index.json" />
2118
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2219
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2320
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2421
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-362ab66" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-362ab666/nuget/v3/index.json" />
2622
<!-- End: Package sources from dotnet-runtime -->
2723
<!-- Begin: Package sources from dotnet-templating -->
2824
<add key="darc-pub-dotnet-templating-d5ddb7f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d5ddb7f6/nuget/v3/index.json" />
2925
<!-- End: Package sources from dotnet-templating -->
3026
<!-- Begin: Package sources from dotnet-windowsdesktop -->
31-
<add key="darc-int-dotnet-windowsdesktop-74e82c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-74e82c7a/nuget/v3/index.json" />
3227
<!-- End: Package sources from dotnet-windowsdesktop -->
3328
<!-- Begin: Package sources from dotnet-winforms -->
3429
<!-- End: Package sources from dotnet-winforms -->
@@ -55,18 +50,14 @@
5550
<!-- Begin: Package sources from dotnet-templating -->
5651
<!-- End: Package sources from dotnet-templating -->
5752
<!-- Begin: Package sources from dotnet-aspnetcore -->
58-
<add key="darc-int-dotnet-aspnetcore-6254f5c" value="true" />
5953
<!-- End: Package sources from dotnet-aspnetcore -->
6054
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
61-
<add key="darc-int-DotNet-msbuild-Trusted-02bf662" value="true" />
6255
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6356
<!-- Begin: Package sources from dotnet-format -->
6457
<!-- End: Package sources from dotnet-format -->
6558
<!-- Begin: Package sources from dotnet-runtime -->
66-
<add key="darc-int-dotnet-runtime-362ab66" value="true" />
6759
<!-- End: Package sources from dotnet-runtime -->
6860
<!-- Begin: Package sources from dotnet-windowsdesktop -->
69-
<add key="darc-int-dotnet-windowsdesktop-74e82c7" value="true" />
7061
<!-- Begin: Package sources from dotnet-winforms -->
7162
<!-- End: Package sources from dotnet-winforms -->
7263
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25515.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25555.2">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
496+
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25515.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25555.2">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
501+
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25515.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25555.2">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
505+
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25515.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25555.2">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
509+
<Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25515.1</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25555.2</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -215,7 +215,7 @@
215215
<PropertyGroup>
216216
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
217217
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
218-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25515.1</MicrosoftDotNetXUnitExtensionsVersion>
218+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25555.2</MicrosoftDotNetXUnitExtensionsVersion>
219219
<MoqPackageVersion>4.18.4</MoqPackageVersion>
220220
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
221221
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/templates-official/job/publish-build-assets.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ jobs:
152152
BARBuildId: ${{ parameters.BARBuildId }}
153153
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
154154

155+
# Darc is targeting 8.0, so make sure it's installed
156+
- task: UseDotNet@2
157+
inputs:
158+
version: 8.0.x
159+
155160
- task: AzureCLI@2
156161
displayName: Publish Using Darc
157162
inputs:

‎eng/common/templates-official/post-build/post-build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ stages:
271271

272272
- task: NuGetAuthenticate@1
273273

274+
# Darc is targeting 8.0, so make sure it's installed
275+
- task: UseDotNet@2
276+
inputs:
277+
version: 8.0.x
278+
274279
- task: AzureCLI@2
275280
displayName: Publish Using Darc
276281
inputs:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ jobs:
148148
BARBuildId: ${{ parameters.BARBuildId }}
149149
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
150150

151+
# Darc is targeting 8.0, so make sure it's installed
152+
- task: UseDotNet@2
153+
inputs:
154+
version: 8.0.x
155+
151156
- task: AzureCLI@2
152157
displayName: Publish Using Darc
153158
inputs:

‎eng/common/templates/post-build/post-build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,11 @@ stages:
267267

268268
- task: NuGetAuthenticate@1
269269

270+
# Darc is targeting 8.0, so make sure it's installed
271+
- task: UseDotNet@2
272+
inputs:
273+
version: 8.0.x
274+
270275
- task: AzureCLI@2
271276
displayName: Publish Using Darc
272277
inputs:

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25515.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25515.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25555.2",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25555.2"
1919
}
2020
}

0 commit comments

Comments
 (0)