Update the hardcoded tfm to the current (#45720)

v-wuzhai · web-flow · commit 9de44e8f05fb · 2025-01-08T09:52:33.000+08:00
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/VanillaWasmTests.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/VanillaWasmTests.cs
@@ -11,7 +11,7 @@ public class VanillaWasmTests(ITestOutputHelper log) : BlazorWasmBaselineTests(l
         public void Build_Works()
         {
             var testAsset = "VanillaWasm";
-            var targetFramework = "net9.0";
+            var targetFramework = ToolsetInfo.CurrentTargetFramework;
             var testInstance = CreateAspNetSdkTestAsset(testAsset)
                 .WithProjectChanges((p, doc) =>
                 {
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectReference/Existing/Project1/Project1.csproj b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectReference/Existing/Project1/Project1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectReference/ExistingWithRename/Project1/Project1.csproj b/test/TestAssets/TestPackages/dotnet-new/test_templates/PostActions/AddProjectReference/ExistingWithRename/Project1/Project1.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/test/TestAssets/TestProjects/ProjectWithEsProjReference/App.csproj b/test/TestAssets/TestProjects/ProjectWithEsProjReference/App.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/TestAssets/TestProjects/VanillaWasm/VanillaWasm.csproj b/test/TestAssets/TestProjects/VanillaWasm/VanillaWasm.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 </Project>
diff --git a/test/TestAssets/TestProjects/WatchAspire/WatchAspire.ServiceDefaults/WatchAspire.ServiceDefaults.csproj b/test/TestAssets/TestProjects/WatchAspire/WatchAspire.ServiceDefaults/WatchAspire.ServiceDefaults.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsAspireSharedProject>true</IsAspireSharedProject>
   </PropertyGroup>
diff --git a/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/RazorApp.csproj b/test/TestAssets/TestProjects/WatchRazorWithDeps/RazorApp/RazorApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs
@@ -384,7 +384,7 @@ public async Task BlazorWasm_MSBuildWarning()
             await App.AssertWaitingForChanges();
         }
 
-        [Fact(Skip = "https://github.com/dotnet/sdk/issues/45299")]
+        [Fact]
         public async Task Razor_Component_ScopedCssAndStaticAssets()
         {
             var testAsset = TestAssets.CopyTestAsset("WatchRazorWithDeps")
@@ -619,7 +619,7 @@ public static void PrintDirectoryName([CallerFilePathAttribute] string filePath
             await App.AssertOutputLineStartsWith("> NewSubdir");
         }
 
-        [Fact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
+        [Fact]
         public async Task Aspire()
         {
             var tfm = ToolsetInfo.CurrentTargetFramework;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class VanillaWasmTests(ITestOutputHelper log) : BlazorWasmBaselineTests(l`
`11`	`11`	`public void Build_Works()`
`12`	`12`	`{`
`13`	`13`	`var testAsset = "VanillaWasm";`
`14`		`- var targetFramework = "net9.0";`
	`14`	`+ var targetFramework = ToolsetInfo.CurrentTargetFramework;`
`15`	`15`	`var testInstance = CreateAspNetSdkTestAsset(testAsset)`
`16`	`16`	`.WithProjectChanges((p, doc) =>`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ public async Task BlazorWasm_MSBuildWarning()`
`384`	`384`	`await App.AssertWaitingForChanges();`
`385`	`385`	`}`
`386`	`386`
`387`		`- [Fact(Skip = "https://github.com/dotnet/sdk/issues/45299")]`
	`387`	`+ [Fact]`
`388`	`388`	`public async Task Razor_Component_ScopedCssAndStaticAssets()`
`389`	`389`	`{`
`390`	`390`	`var testAsset = TestAssets.CopyTestAsset("WatchRazorWithDeps")`
`@@ -619,7 +619,7 @@ public static void PrintDirectoryName([CallerFilePathAttribute] string filePath`
`619`	`619`	`await App.AssertOutputLineStartsWith("> NewSubdir");`
`620`	`620`	`}`
`621`	`621`
`622`		`- [Fact(Skip = "https://github.com/dotnet/sdk/issues/42850")]`
	`622`	`+ [Fact]`
`623`	`623`	`public async Task Aspire()`
`624`	`624`	`{`
`625`	`625`	`var tfm = ToolsetInfo.CurrentTargetFramework;`