diff --git a/Directory.Build.props b/Directory.Build.props index 6195cd336df4..01df765884d4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ true false - net7.0 + net8.0 $(SdkTargetFramework) $(MSBuildThisFileDirectory)..\ - <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net7.0 + <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net8.0 <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472 <_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll - <_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net7.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll + <_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net8.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index 7e3dee3c110c..437a3c4aafc0 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -22,10 +22,10 @@ Copyright (c) .NET Foundation. All rights reserved. $(MSBuildThisFileDirectory)..\ - <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net7.0 + <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net8.0 <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472 <_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll - <_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net7.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll + <_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net8.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll diff --git a/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.targets b/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.targets index 3d2f6f391b22..1528ef7ea436 100644 --- a/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.targets +++ b/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.targets @@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(MSBuildThisFileDirectory)..\ $(RazorSdkDirectoryRoot)tasks\ - <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net7.0 + <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net8.0 <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472 $(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll <_RazorSdkToolAssembly>$(RazorSdkDirectoryRoot)tools\rzc.dll diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets index 8fcf94540080..95ba0706d4c4 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.targets @@ -14,7 +14,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV')) - $(MSBuildThisFileDirectory)\tools\net7.0\Microsoft.NET.Build.Extensions.Tasks.dll + $(MSBuildThisFileDirectory)\tools\net8.0\Microsoft.NET.Build.Extensions.Tasks.dll $(MSBuildThisFileDirectory)\tools\net472\Microsoft.NET.Build.Extensions.Tasks.dll diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 6bb5e58f3aff..899ef846b2b8 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -225,7 +225,7 @@ Copyright (c) .NET Foundation. All rights reserved. Condition=" '$(DisableImplicitFrameworkDefines)' != 'true' and '$(TargetPlatformIdentifier)' != '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) " > <_SupportedPlatformCompatibleVersions Include="@(SdkSupportedTargetPlatformVersion)" Condition=" %(Identity) != '' and $([MSBuild]::VersionLessThanOrEquals(%(Identity), $(TargetPlatformVersion))) " /> - <_ImplicitDefineConstant Include="@(_SupportedPlatformCompatibleVersions->'$(TargetPlatformIdentifier.ToUpper())%(Identity)_OR_GREATER'->Replace('.', '_'))" /> + <_ImplicitDefineConstant Include="@(_SupportedPlatformCompatibleVersions->Distinct()->'$(TargetPlatformIdentifier.ToUpper())%(Identity)_OR_GREATER'->Replace('.', '_'))" /> diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets index 63804b179a99..31b6c4cb5c8a 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets @@ -15,7 +15,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(MSBuildThisFileDirectory)..\tools\ - net7.0 + net8.0 net472 $(MicrosoftNETBuildTasksDirectoryRoot)$(MicrosoftNETBuildTasksTFM)\ $(MicrosoftNETBuildTasksDirectory)Microsoft.NET.Build.Tasks.dll diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index 679c7047c76c..d45edd463e2c 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -193,7 +193,7 @@ public void It_fails_if_windows_target_platform_version_is_invalid() .HaveStdOutContaining("NETSDK1140"); } - [WindowsOnlyTheory] + [WindowsOnlyTheory(Skip="https://github.com/dotnet/sdk/pull/29009")] [InlineData(true)] [InlineData(false)] public void It_succeeds_if_windows_target_platform_version_does_not_have_trailing_zeros(bool setInTargetframework) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs index 3ba7af9fa07a..ca2cf2a869d3 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs @@ -370,9 +370,9 @@ public void It_includes_internals_visible_to() [RequiresMSBuildVersionTheory("17.0.0.32901")] [InlineData(true, true, "net5.0")] - [InlineData(true, true, ToolsetInfo.CurrentTargetFramework)] - [InlineData(true, false, ToolsetInfo.CurrentTargetFramework)] - [InlineData(false, false, ToolsetInfo.CurrentTargetFramework)] + [InlineData(true, true, ToolsetInfo.NextTargetFramework)] + [InlineData(true, false, ToolsetInfo.NextTargetFramework)] + [InlineData(false, false, ToolsetInfo.NextTargetFramework)] public void TestPreviewFeatures(bool enablePreviewFeatures, bool generateRequiresPreviewFeaturesAttribute, string targetFramework) { var testAsset = _testAssetsManager @@ -419,7 +419,7 @@ public void TestPreviewFeatures(bool enablePreviewFeatures, bool generateRequire if (enablePreviewFeatures && generateRequiresPreviewFeaturesAttribute) { - if (targetFramework == ToolsetInfo.CurrentTargetFramework) + if (targetFramework == ToolsetInfo.NextTargetFramework) { Assert.Equal("Preview", langVersion); Assert.True(contains); diff --git a/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs b/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs index 940b231fa79e..d7f2521b4dad 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs @@ -342,7 +342,7 @@ public void ExeProjectCanReferenceTestProject(string testTemplateName) var testConsoleProject = new TestProject("ConsoleApp") { IsExe = true, - TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + TargetFrameworks = ToolsetInfo.NextTargetFramework, RuntimeIdentifier = EnvironmentInfo.GetCompatibleRid() }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishTestUtils.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishTestUtils.cs index 56af8cf04d9f..1539c70cdc9e 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishTestUtils.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishTestUtils.cs @@ -9,14 +9,15 @@ namespace Microsoft.NET.Publish.Tests { internal static class PublishTestUtils { -#if NET7_0 +#if NET8_0 public static IEnumerable SupportedTfms { get; } = new List { new object[] { "netcoreapp3.1" }, new object[] { "net5.0" }, new object[] { "net6.0" }, - new object[] { ToolsetInfo.CurrentTargetFramework } + new object[] { ToolsetInfo.CurrentTargetFramework }, + new object[] { ToolsetInfo.NextTargetFramework } }; // This list should contain all supported TFMs after net5.0 @@ -24,14 +25,16 @@ internal static class PublishTestUtils { new object[] { "net5.0" }, new object[] { "net6.0" }, - new object[] { ToolsetInfo.CurrentTargetFramework } + new object[] { ToolsetInfo.CurrentTargetFramework }, + new object[] { ToolsetInfo.NextTargetFramework } }; // This list should contain all supported TFMs after net6.0 public static IEnumerable Net6Plus { get; } = new List { new object[] { "net6.0" }, - new object[] { ToolsetInfo.CurrentTargetFramework } + new object[] { ToolsetInfo.CurrentTargetFramework }, + new object[] { ToolsetInfo.NextTargetFramework } }; #else #error If building for a newer TFM, please update the values above diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs index 4d64b0cbc96b..20c6a61b81e4 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs @@ -2195,12 +2195,12 @@ public void Pack_MultipleTargetFrameworks_WithScopedCssAndJsModules_IncludesAsse var parse = XDocument.Parse($@" - {ToolsetInfo.CurrentTargetFramework};net6.0;net5.0 + net8.0;{ToolsetInfo.CurrentTargetFramework};net6.0;net5.0 enable - + @@ -2272,12 +2272,12 @@ public void Pack_Incremental_MultipleTargetFrameworks_WithScopedCssAndJsModules_ var parse = XDocument.Parse($@" - {ToolsetInfo.CurrentTargetFramework};net6.0;net5.0 + net8.0;{ToolsetInfo.CurrentTargetFramework};net6.0;net5.0 enable - + @@ -2351,12 +2351,12 @@ public void Pack_MultipleTargetFrameworks_WithScopedCssAndJsModules_DoesNotInclu var parse = XDocument.Parse($@" - {ToolsetInfo.CurrentTargetFramework};net6.0;net5.0 + net8.0;{ToolsetInfo.CurrentTargetFramework};net6.0;net5.0 enable - + diff --git a/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs b/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs index 0c7869d92489..3f3c4a0d8363 100644 --- a/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/WorkloadPackGroupTests.cs @@ -46,7 +46,7 @@ public void TestGetManifests() } } - [Fact] + [Fact(Skip="https://github.com/dotnet/sdk/issues/28759")] public void GetPackDefinitionLocations() { var definitionLocations = GetWorkloadPackDefinitionLocations(GetManifests()); diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt index 5e29de938dfe..3d337fc19054 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt @@ -10,9 +10,11 @@ gitignore globaljson grpc mstest +mstest-playwright mvc nugetconfig nunit +NUnit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt index a294bc619c0c..b9d2896ea39f 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt @@ -10,9 +10,11 @@ gitignore globaljson grpc mstest +mstest-playwright mvc nugetconfig nunit +NUnit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt index 4927c3cb9381..83a667f748b1 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt @@ -10,9 +10,11 @@ gitignore globaljson grpc mstest +mstest-playwright mvc nugetconfig nunit +NUnit-playwright nunit-test page proto 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 ef49a5116426..1857d16e5fb8 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 @@ -23,12 +23,14 @@ dotnet gitignore file gitignore Co Dotnet local tool manifest file tool-manifest Config EditorConfig file editorconfig Config global.json file globaljson Config +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET 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 ef49a5116426..1857d16e5fb8 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 @@ -23,12 +23,14 @@ dotnet gitignore file gitignore Co Dotnet local tool manifest file tool-manifest Config EditorConfig file editorconfig Config global.json file globaljson Config +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET 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 fb56cd3a297c..3e585f1a52d7 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 @@ -23,12 +23,14 @@ dotnet gitignore file gitignore C Dotnet local tool manifest file tool-manifest Config EditorConfig file editorconfig Config global.json file globaljson Config +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET 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 71ac27f5f57c..fee62a21a57f 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 @@ -19,12 +19,14 @@ dotnet gitignore file gitignore Co Dotnet local tool manifest file tool-manifest Config EditorConfig file editorconfig Config global.json file globaljson Config +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET 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 71ac27f5f57c..fee62a21a57f 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 @@ -19,12 +19,14 @@ dotnet gitignore file gitignore Co Dotnet local tool manifest file tool-manifest Config EditorConfig file editorconfig Config global.json file globaljson Config +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET 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 41749eacffbc..5538c213896e 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 @@ -19,12 +19,14 @@ dotnet gitignore file gitignore C Dotnet local tool manifest file tool-manifest Config EditorConfig file editorconfig Config global.json file globaljson Config +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright MSTest Test Project mstest [C#],F#,VB Test/MSTest MVC ViewImports viewimports [C#] Web/ASP.NET MVC ViewStart viewstart [C#] Web/ASP.NET NuGet Config nugetconfig Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets index beab531cc3f0..24a4350b5126 100644 --- a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets +++ b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets @@ -19,7 +19,7 @@ Copyright (C) Microsoft Corporation. All rights reserved. true - <_PublishTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">net7.0 + <_PublishTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">net8.0 <_PublishTaskFramework Condition=" '$(_PublishTaskFramework)' == ''">net472 <_PublishTasksDir Condition=" '$(_PublishTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\tools\$(_PublishTaskFramework)\ <_PublishTaskAssemblyFullPath Condition=" '$(_PublishTaskAssemblyFullPath)'=='' ">$(_PublishTasksDir)Microsoft.NET.Sdk.Publish.Tasks.dll