diff --git a/Directory.Build.props b/Directory.Build.props index 557a6be1c73d..3a20a15a9c05 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,11 +12,13 @@ true false net8.0 + + true $(SdkTargetFramework) - + - net7.0 + net8.0 $(SdkTargetFramework) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 123bd07493ff..0066356a4f84 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -32,5 +32,10 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20b425fd3b60..50830e755431 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,42 @@ 9dfddc30a1e9101f7e44dcda57d95902073e444c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 - - https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 - - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/emsdk - abfa03c97f4175d4d209435cd0e71f558e36c3fd + 7da45c33d57a762de5756f2c090e84327dae143f @@ -197,25 +193,25 @@ https://github.com/microsoft/vstest bb99e3ea07aaecd62d5c59568524133317d081b4 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c https://github.com/dotnet/windowsdesktop @@ -390,19 +386,19 @@ - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c @@ -423,9 +419,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + a6c64c3c26417f579022e20cbcee992b4814ed2c https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 353ca09c09e7..89b6ead7ceb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23464.19 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23464.19 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -48,18 +48,17 @@ - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +87,9 @@ - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 @@ -208,13 +207,13 @@ - 8.0.0-rc.1.23411.2 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) + 9.0.0-alpha.1.23457.3 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/global.json b/global.json index d99e702173fd..2b357820bd71 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "9.0.100-alpha.1.23421.9", "runtimes": { "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" + "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" ], "aspnetcore": [ "$(MicrosoftAspNetCoreAppRefPackageVersion)" diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj index 6573f0ebf60d..d0f7c67ac83a 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 enable Open diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj index a8775a32bd72..7aa04c5b1397 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 net8.0 Exe enable diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj index 60dfe5a399f3..0d193778b6e5 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 Open enable diff --git a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj index 5d6ceb1ac3b1..688d6e00decd 100644 --- a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +++ b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 Open enable diff --git a/src/Assets/WasmOverride/Directory.Build.props b/src/Assets/WasmOverride/Directory.Build.props new file mode 100644 index 000000000000..058246e40862 --- /dev/null +++ b/src/Assets/WasmOverride/Directory.Build.props @@ -0,0 +1 @@ + diff --git a/src/Assets/WasmOverride/Directory.Build.targets b/src/Assets/WasmOverride/Directory.Build.targets new file mode 100644 index 000000000000..40fe60d0bdbd --- /dev/null +++ b/src/Assets/WasmOverride/Directory.Build.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/WasmOverride/WasmOverridePacks.targets b/src/Assets/WasmOverride/WasmOverridePacks.targets new file mode 100644 index 000000000000..a5bfb06a3375 --- /dev/null +++ b/src/Assets/WasmOverride/WasmOverridePacks.targets @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_targetingPackReferenceExclusion Include="$(TargetName)" /> + <_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" /> + <_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" /> + + + + <_targetingPackReferenceWithExclusion Include="@(Reference)"> + %(_targetingPackReferenceExclusion.Identity) + + + + + + + + + diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj index 9f3aa8eff7a5..1aef7c5aa918 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj +++ b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 Open enable diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj b/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj index abc87d57ecc5..58f870a72151 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj +++ b/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 net8.0 Exe enable diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj b/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj index f48404dfb2b0..cdb417f2ed9d 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 enable Open diff --git a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs index f97c5c7ec050..5c64420d60c8 100644 --- a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs +++ b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Framework; +using NuGet.Versioning; namespace Microsoft.DotNet.Build.Tasks { @@ -56,9 +57,24 @@ public static string ExecuteInternal( propertyGroup.Element(ns + "NETCoreSdkVersion").Value = newSDKVersion; - var originalBundledNETCoreAppPackageVersion = - propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value; - propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value = microsoftNETCoreAppRefPackageVersion; + + var originalBundledNETCoreAppPackageVersion = propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value; + var parsedOriginalBundledPackageVersion = SemanticVersion.Parse(originalBundledNETCoreAppPackageVersion); + var parsedMicrosoftNETCoreAppRefPackageVersion = + SemanticVersion.Parse(microsoftNETCoreAppRefPackageVersion); + + // In the case where we have a new major version, it'll come in first through the dotnet/runtime flow of the + // SDK's own package references. The Stage0 SDK's bundled version props file will still be on the older major version + // (and the older TFM that goes along with that). If we just replaced the bundled version with the new major version, + // apps that target the 'older' TFM would fail to build. So we need to keep the bundled version from the existing + // bundledversions.props in this one specific case. + + var newBundledPackageVersion = + parsedOriginalBundledPackageVersion.Major == parsedMicrosoftNETCoreAppRefPackageVersion.Major + ? microsoftNETCoreAppRefPackageVersion + : originalBundledNETCoreAppPackageVersion; + + propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value = newBundledPackageVersion; void CheckAndReplaceElement(XElement element) { @@ -69,7 +85,7 @@ void CheckAndReplaceElement(XElement element) element.ToString(), element.Value, originalBundledNETCoreAppPackageVersion)); } - element.Value = microsoftNETCoreAppRefPackageVersion; + element.Value = newBundledPackageVersion; } void CheckAndReplaceAttribute(XAttribute attribute) @@ -82,7 +98,7 @@ void CheckAndReplaceAttribute(XAttribute attribute) originalBundledNETCoreAppPackageVersion)); } - attribute.Value = microsoftNETCoreAppRefPackageVersion; + attribute.Value = newBundledPackageVersion; } if (!isSDKServicing) diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj b/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj index 62bae35a9326..4a3b8b0ed9a3 100644 --- a/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj +++ b/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 enable net8.0;net472 Open diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 3a4e5841b010..273d42047bfe 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -64,7 +64,6 @@ - @@ -92,6 +91,10 @@ + + + + @@ -102,17 +105,17 @@ - + - + x86/hostfxr.dll PreserveNewest - + x64/hostfxr.dll PreserveNewest - + arm64/hostfxr.dll PreserveNewest diff --git a/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj index 50f97c79f7de..b5a3bfd041eb 100644 --- a/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj @@ -17,7 +17,6 @@ - @@ -26,15 +25,18 @@ + + + - + - + x86/hostfxr.dll PreserveNewest - + x64/hostfxr.dll PreserveNewest diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj index f482f27163fe..9fbe6990e2ff 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj @@ -22,7 +22,6 @@ - diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj index 09ee2a7255f8..c6e5b535ebba 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj @@ -20,9 +20,12 @@ + + + + - diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index 18c60cc15bde..01ce0e70fa82 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -52,8 +52,10 @@ - - + + + + diff --git a/src/Tests/HelixTasks/HelixTasks.csproj b/src/Tests/HelixTasks/HelixTasks.csproj index 1d539eb4199e..3156bf81dad3 100644 --- a/src/Tests/HelixTasks/HelixTasks.csproj +++ b/src/Tests/HelixTasks/HelixTasks.csproj @@ -1,7 +1,7 @@  - net6.0;net472 - net6.0 + net8.0;net472 + net8.0 true Microsoft.DotNet.SDK.Build.Helix diff --git a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index 32d81ee49653..e10f99519e9c 100644 --- a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -30,7 +30,7 @@ nativeWrapper - + @@ -38,9 +38,6 @@ - - - diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index e943643335ac..6a78ee147610 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -755,10 +755,8 @@ public void NativeAotStaticLib_only_runs_when_switch_is_enabled(string targetFra [Theory] [InlineData("Static")] [InlineData("Shared")] - public void NativeAotLib_errors_out_when_eventpipe_is_enabled(string libType) + public void NativeAotLib_warns_when_eventpipe_is_enabled(string libType) { - // Revisit once the issue is fixed - // https://github.com/dotnet/runtime/issues/89346 var projectName = "AotStaticLibraryPublishWithEventPipe"; var rid = EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework); @@ -771,10 +769,13 @@ public void NativeAotLib_errors_out_when_eventpipe_is_enabled(string libType) var testAsset = _testAssetsManager.CreateTestProject(testProject); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + // Revisit once the issue is fixed + // https://github.com/dotnet/runtime/issues/89346 publishCommand .Execute() - .Should().Fail() - .And.HaveStdOutContaining("EventSource is not supported"); + .Should().Pass(); + // Comment in the following code when https://github.com/dotnet/sdk/issues/34839 gets fixed + // .And.HaveStdOutContaining("EventSource is not supported or recommended when compiling to a native library"); } [RequiresMSBuildVersionTheory("17.0.0.32901")] diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs index 4ea32a9f347c..b66eb8f8bc6b 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs @@ -36,7 +36,7 @@ public void It_publishes_and_runs_self_contained_web_app() var publishCommand = new PublishCommand(testAsset); - publishCommand.Execute() + publishCommand.Execute("-p:SelfContained=True") .Should() .Pass(); diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs index 32104c34eb9b..2bb52f6193ea 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs @@ -44,7 +44,7 @@ public void It_publishes_and_runs_self_contained_wpf_app() var publishCommand = new PublishCommand(Log, testDir.Path); - publishCommand.Execute($"/p:RuntimeIdentifier={rid}") + publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true") .Should() .Pass(); diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json index 880b88263875..3155d5c64201 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json @@ -101,9 +101,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", @@ -217,9 +214,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json index eb73b57a8fa7..7adab319a55e 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json @@ -104,25 +104,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "BlazorWasmHosted60.Client", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "BlazorWasmHosted60.Client", @@ -1491,44 +1472,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\Client\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "BlazorWasmHosted60.Client", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\Client\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "BlazorWasmHosted60.Client", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\Client\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "BlazorWasmHosted60.Client", diff --git a/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs b/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs index c64725eb59ae..6cdc76a1db1e 100644 --- a/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs +++ b/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs @@ -44,6 +44,10 @@ public TestAsset CreateAspNetSdkTestAsset( targetFrameworks.Value = targetFrameworks.Value.Replace("$(AspNetTestTfm)", overrideTfm ?? DefaultTfm); } }); + + foreach (string assetPath in Directory.EnumerateFiles(Path.Combine(_testAssetsManager.TestAssetsRoot, "WasmOverride"))) + File.Copy(assetPath, Path.Combine(projectDirectory.Path, Path.GetFileName(assetPath))); + return projectDirectory; } diff --git a/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj b/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj index aa0505d0761a..61a7215350c6 100644 --- a/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj +++ b/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj @@ -32,7 +32,6 @@ - diff --git a/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index 2de4810afdaa..19e71d799f6a 100644 --- a/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index de300f22e68f..645f01c9faa4 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -14,7 +14,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index de300f22e68f..645f01c9faa4 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -14,7 +14,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index 43863371c11c..6ae36b31c376 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -14,7 +14,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index dbfe3c1db2b7..c94749ef3499 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -10,7 +10,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index dbfe3c1db2b7..c94749ef3499 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -10,7 +10,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 78e5e556da33..5a6f4cdfc0d2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -10,7 +10,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj b/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj index 16e6e8a904b3..006f89978e91 100644 --- a/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj +++ b/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Tests/xunit-runner/XUnitRunner.targets b/src/Tests/xunit-runner/XUnitRunner.targets index 516d03aac63d..d608714527ba 100644 --- a/src/Tests/xunit-runner/XUnitRunner.targets +++ b/src/Tests/xunit-runner/XUnitRunner.targets @@ -9,7 +9,7 @@ -nocolor - net6.0 + net8.0 net472 $(ArtifactsDir)\bin\HelixTasks\$(Configuration)\$(TaskTargetFramework)\HelixTasks.dll