From 49b341eb4d6da470c55bc69e5e29015c5d55a421 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Wed, 4 Jun 2025 22:27:23 +0200
Subject: [PATCH 1/3] Don't change Arcade's default of
 XUnitRunnerVisualStudioVersion

---
 eng/Versions.props | 1 -
 1 file changed, 1 deletion(-)

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>

From fe1bed9f517a58a744d507c813f3014bdff762a3 Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Wed, 4 Jun 2025 23:03:51 +0200
Subject: [PATCH 2/3] Use net472 for tests

---
 Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)

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>

From 9ffa0a5d80379e31ec8d625cb38190cab692540e Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 5 Jun 2025 10:20:55 +0200
Subject: [PATCH 3/3] Fix template tests: all empty templates have
 `NotFound.razor` page.

---
 .../content/BlazorWeb-CSharp/.template.config/template.json | 1 -
 .../test/Templates.Tests/template-baselines.json            | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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",