Skip to content

Commit db32a9b

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into darc-release/8.0.4xx-8db430b9-8261-414a-b4e6-99062ac70230
2 parents 9b1097b + 970a419 commit db32a9b

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

‎NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
<add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
3434
<add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
3535
<add key="darc-pub-dotnet-templating-40256cc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-40256cc3/nuget/v3/index.json" />
36+
<add key="darc-pub-dotnet-templating-93a5894-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-8/nuget/v3/index.json" />
37+
<add key="darc-pub-dotnet-templating-93a5894-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-7/nuget/v3/index.json" />
38+
<add key="darc-pub-dotnet-templating-93a5894-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-6/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-93a5894-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-5/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-93a5894-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-4/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-93a5894-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-3/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-93a5894-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-2/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-93a5894-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-93a58944-1/nuget/v3/index.json" />
3644
<!-- End: Package sources from dotnet-templating -->
3745
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3846
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,9 @@
354354
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
359+
<Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25105.2">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
496+
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25066.6">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25105.2">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
501+
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25066.6">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25105.2">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
505+
<Sha>f9e274e2269d2cda748e78344afe681411748157</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25105.2">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
509+
<Sha>f9e274e2269d2cda748e78344afe681411748157</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.25066.6</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25105.2</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25105.2</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎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.25066.6",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25105.2"
1919
}
2020
}

0 commit comments

Comments
 (0)