Skip to content

Commit 9ae33f9

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into internal-merge-8.0.1xx-2025-04-08-1214
2 parents df66621 + 1d797c8 commit 9ae33f9

File tree

5 files changed

+30
-29
lines changed

5 files changed

+30
-29
lines changed

‎NuGet.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<add key="darc-int-dotnet-aspnetcore-8899cb3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8899cb30/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-aspnetcore -->
1414
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
15-
<add key="darc-pub-DotNet-msbuild-Trusted-b46a62a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b46a62a9/nuget/v3/index.json" />
15+
<add key="darc-pub-DotNet-msbuild-Trusted-6cb62fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6cb62fe4/nuget/v3/index.json" />
1616
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1717
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1818
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -21,6 +21,7 @@
2121
<!-- End: Package sources from dotnet-runtime -->
2222
<!-- Begin: Package sources from dotnet-templating -->
2323
<add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-eabf260" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-eabf2602/nuget/v3/index.json" />
2425
<!-- End: Package sources from dotnet-templating -->
2526
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2627
<add key="darc-int-dotnet-windowsdesktop-83fc500" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-83fc5002/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.116">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>2ce7363f41ab414c2754b4883a50743df3d2b388</Sha>
6+
<Sha>eabf2602965355d4aaa87d44ad45e4a7c0d54b14</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25206.3">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25208.4">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>2ce7363f41ab414c2754b4883a50743df3d2b388</Sha>
10+
<Sha>eabf2602965355d4aaa87d44ad45e4a7c0d54b14</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25206.3">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25208.4">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>2ce7363f41ab414c2754b4883a50743df3d2b388</Sha>
14+
<Sha>eabf2602965355d4aaa87d44ad45e4a7c0d54b14</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.24">
58+
<Dependency Name="Microsoft.Build" Version="17.8.25">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>b46a62a9a9861ce314f4119f968caafedd85741e</Sha>
60+
<Sha>6cb62fe41bb770d019e8c833524d5c02a876509a</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.24-preview-25207-02">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.25-servicing-25210-01">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>b46a62a9a9861ce314f4119f968caafedd85741e</Sha>
64+
<Sha>6cb62fe41bb770d019e8c833524d5c02a876509a</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.24-preview-25207-02">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.25-servicing-25210-01">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>b46a62a9a9861ce314f4119f968caafedd85741e</Sha>
68+
<Sha>6cb62fe41bb770d019e8c833524d5c02a876509a</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25204.7">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
496+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25204.7">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
501+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25204.7">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25208.7">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
505+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25204.7">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
509+
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25204.7</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25208.7</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.24</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.25</MicrosoftBuildPackageVersion>
125125
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
126126
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
127127
so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
130130
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
131131
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
132132
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
133-
<MicrosoftBuildLocalizationPackageVersion>17.8.24-preview-25207-02</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.25-servicing-25210-01</MicrosoftBuildLocalizationPackageVersion>
134134
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
135135
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
136136
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -143,7 +143,7 @@
143143
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
144144
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
145145
<!-- test dependencies -->
146-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25206.3</MicrosoftTemplateEngineMocksPackageVersion>
146+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25208.4</MicrosoftTemplateEngineMocksPackageVersion>
147147
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
148148
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
149149
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25204.7</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<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.114",
3+
"dotnet": "8.0.115",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7"
1919
}
2020
}

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works()
10811081
AssertRIDPublishOuput(publishCommand, testInstance, hosted: true);
10821082
}
10831083

1084-
[ConditionalFact()]
1084+
[Fact(Skip = "https://github.com/dotnet/sdk/issues/44179")]
10851085
public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works()
10861086
{
10871087
// Arrange

0 commit comments

Comments
 (0)