diff --git a/Directory.Build.props b/Directory.Build.props
index 596c19e05572..2754f04d06c3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -106,7 +106,10 @@
     <NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
 
     <IncludeSymbols>true</IncludeSymbols>
+
     <DefaultNetFxTargetFramework>net462</DefaultNetFxTargetFramework>
+    <!-- Current xunit.runner.visualstudio supports net472+/net8.0+ only. So we can't use net462 -->
+    <DefaultNetFxTargetFramework Condition="'$(IsTestProject)'=='true'">net472</DefaultNetFxTargetFramework>
 
     <CrossgenOutput Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">false</CrossgenOutput>
   </PropertyGroup>
diff --git a/eng/Versions.props b/eng/Versions.props
index 73bfc03cca95..41996d0376da 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -321,7 +321,6 @@
     <XunitAssertVersion>$(XunitVersion)</XunitAssertVersion>
     <XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
-    <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
     <MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
     <MicrosoftOpenApiVersion>2.0.0-preview.18</MicrosoftOpenApiVersion>
     <MicrosoftOpenApiYamlReaderVersion>2.0.0-preview.18</MicrosoftOpenApiYamlReaderVersion>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
index 33be40a65c2f..09f28a39ffee 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json
@@ -116,7 +116,6 @@
           "exclude": [
             "BlazorWeb-CSharp/Components/Pages/Auth.*",
             "BlazorWeb-CSharp/Components/Pages/Counter.*",
-            "BlazorWeb-CSharp/Components/Pages/NotFound.*",
             "BlazorWeb-CSharp/Components/Pages/Weather.*",
             "BlazorWeb-CSharp/Components/Layout/NavMenu.*",
             "BlazorWeb-CSharp/wwwroot/lib/**",
diff --git a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
index 2d2e391f0412..a4420fbb65c7 100644
--- a/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
+++ b/src/ProjectTemplates/test/Templates.Tests/template-baselines.json
@@ -3211,6 +3211,7 @@
         "App.razor",
         "_Imports.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Properties/launchSettings.json",
         "wwwroot/icon-192.png",
@@ -3299,6 +3300,7 @@
         "_Imports.razor",
         "Pages/Authentication.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Layout/LoginDisplay.razor",
         "Layout/RedirectToLogin.razor",
@@ -3390,6 +3392,7 @@
         "_Imports.razor",
         "Pages/Authentication.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Layout/LoginDisplay.razor",
         "Layout/RedirectToLogin.razor",
@@ -3480,6 +3483,7 @@
         "_Imports.razor",
         "Pages/Authentication.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Layout/LoginDisplay.razor",
         "Layout/RedirectToLogin.razor",
@@ -3569,6 +3573,7 @@
         "App.razor",
         "_Imports.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "Properties/launchSettings.json",
         "wwwroot/icon-192.png",
@@ -3654,6 +3659,7 @@
         "App.razor",
         "_Imports.razor",
         "Pages/Home.razor",
+        "Pages/NotFound.razor",
         "Layout/MainLayout.razor",
         "wwwroot/icon-192.png",
         "wwwroot/index.html",