Skip to content

Commit 157b46f

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into internal-merge-8.0.4xx-2025-04-08-1208
2 parents c084c6b + 64a8d60 commit 157b46f

File tree

6 files changed

+31
-31
lines changed

6 files changed

+31
-31
lines changed

‎.github/workflows/pr-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PR Analysis
22
on:
33
pull_request:
4-
types: [opened, labeled, unlabeled]
4+
types: [opened, synchronize, labeled, unlabeled]
55
permissions:
66
contents: read
77
pull-requests: read

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<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" />
1414
<!-- End: Package sources from dotnet-aspnetcore -->
1515
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
16-
<add key="darc-pub-DotNet-msbuild-Trusted-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
16+
<add key="darc-pub-DotNet-msbuild-Trusted-e8f3d27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e8f3d272/nuget/v3/index.json" />
1717
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1818
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1919
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2020
<!-- Begin: Package sources from dotnet-runtime -->
2121
<add key="darc-int-dotnet-runtime-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-runtime -->
2323
<!-- Begin: Package sources from dotnet-templating -->
24-
<add key="darc-pub-dotnet-templating-a8f24d5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a8f24d55/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-731d469" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697/nuget/v3/index.json" />
2525
<!-- End: Package sources from dotnet-templating -->
2626
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2727
<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.409">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
6+
<Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25207.2">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25209.2">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
10+
<Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25207.2">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25209.2">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
14+
<Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</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.11.26">
58+
<Dependency Name="Microsoft.Build" Version="17.11.30">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
60+
<Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.26-servicing-25111-04">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.30-servicing-25210-03">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
64+
<Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.26-servicing-25111-04">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.30-servicing-25210-03">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
68+
<Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.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
@@ -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.25204.7</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25208.7</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -124,7 +124,7 @@
124124
</PropertyGroup>
125125
<PropertyGroup>
126126
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
127-
<MicrosoftBuildPackageVersion>17.11.26</MicrosoftBuildPackageVersion>
127+
<MicrosoftBuildPackageVersion>17.11.30</MicrosoftBuildPackageVersion>
128128
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
129129
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
130130
so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
133133
<MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
134134
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
135135
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
136-
<MicrosoftBuildLocalizationPackageVersion>17.11.26-servicing-25111-04</MicrosoftBuildLocalizationPackageVersion>
136+
<MicrosoftBuildLocalizationPackageVersion>17.11.30-servicing-25210-03</MicrosoftBuildLocalizationPackageVersion>
137137
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
138138
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
139139
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -147,7 +147,7 @@
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25207.2</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25209.2</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25204.7</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</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: 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)