Skip to content

Commit fde77f9

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into darc-release/8.0.3xx-37f0997d-65dd-4184-9354-9b402bb6dcf9
2 parents 2d61130 + cb47314 commit fde77f9

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<add key="darc-int-dotnet-aspnetcore-277e317-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d-1/nuget/v3/index.json" />
2323
<!-- End: Package sources from dotnet-aspnetcore -->
2424
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
25-
<add key="darc-pub-DotNet-msbuild-Trusted-cac01d6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-cac01d67/nuget/v3/index.json" />
25+
<add key="darc-pub-DotNet-msbuild-Trusted-da89d7e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-da89d7e7/nuget/v3/index.json" />
2626
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2727
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2828
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.35">
58+
<Dependency Name="Microsoft.Build" Version="17.10.37">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>cac01d670cd054af080c4b696a8e8261549146e1</Sha>
60+
<Sha>da89d7e734ee4174f5a95703b2cdd4ea592f4f69</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.35-servicing-25404-02">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.37-servicing-25408-07">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>cac01d670cd054af080c4b696a8e8261549146e1</Sha>
64+
<Sha>da89d7e734ee4174f5a95703b2cdd4ea592f4f69</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.35-servicing-25404-02">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.37-servicing-25408-07">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>cac01d670cd054af080c4b696a8e8261549146e1</Sha>
68+
<Sha>da89d7e734ee4174f5a95703b2cdd4ea592f4f69</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25378.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
496+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25378.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
501+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25378.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25407.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
505+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25378.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25407.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
509+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25378.1</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25407.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.10.35</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.10.37</MicrosoftBuildPackageVersion>
130130
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
131131
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
132132
so target one that matches the version in minimumMSBuildVersion.
@@ -135,7 +135,7 @@
135135
<MicrosoftBuildPackageVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.29</MicrosoftBuildPackageVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.10.35-servicing-25404-02</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.10.37-servicing-25408-07</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -215,7 +215,7 @@
215215
<PropertyGroup>
216216
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
217217
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
218-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25378.1</MicrosoftDotNetXUnitExtensionsVersion>
218+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25407.1</MicrosoftDotNetXUnitExtensionsVersion>
219219
<MoqPackageVersion>4.18.4</MoqPackageVersion>
220220
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
221221
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.117",
3+
"dotnet": "8.0.119",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1"
1919
}
2020
}

0 commit comments

Comments
 (0)