Update the hardcoded tfm to the current (#45720)

dotnet · Jan 8, 2025 · 9de44e8 · 9de44e8
2 parents 39da6dd + faa291c
commit 9de44e8
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
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/...tnet-new/test_templates/PostActions/AddProjectReference/Existing/Project1/Project1.csproj b/...tnet-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/...est_templates/PostActions/AddProjectReference/ExistingWithRename/Project1/Project1.csproj b/...est_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/...s/TestProjects/WatchAspire/WatchAspire.ServiceDefaults/WatchAspire.ServiceDefaults.csproj b/...s/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;