From 198e0b5aa11aa68162468c0f9d513f39643d0ab7 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Sat, 16 Nov 2024 07:44:58 -0800
Subject: [PATCH] Apply xunit configuration to all tests for better test
 failure diagnostics

---
 test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj | 1 -
 test/dotnet-new.Tests/xunit.runner.json                  | 5 -----
 test/dotnet-watch.Tests/dotnet-watch.Tests.csproj        | 3 ---
 test/dotnet.Tests/dotnet.Tests.csproj                    | 4 ----
 test/dotnet.Tests/xunit.runner.json                      | 6 ------
 test/{dotnet-watch.Tests => }/xunit.runner.json          | 0
 6 files changed, 19 deletions(-)
 delete mode 100644 test/dotnet-new.Tests/xunit.runner.json
 delete mode 100644 test/dotnet.Tests/xunit.runner.json
 rename test/{dotnet-watch.Tests => }/xunit.runner.json (100%)

diff --git a/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
index ebbe79272df2..9fe5414c384d 100644
--- a/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
+++ b/test/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj
@@ -76,7 +76,6 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests
 
   <ItemGroup>
     <Content Include="TestTemplates\**\*" Exclude="TestTemplates\**\bin\**;TestTemplates\**\obj\**" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/dotnet-new.Tests/xunit.runner.json b/test/dotnet-new.Tests/xunit.runner.json
deleted file mode 100644
index 4dca131cc476..000000000000
--- a/test/dotnet-new.Tests/xunit.runner.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
-    "diagnosticMessages": true,
-    "longRunningTestSeconds": 120
-}
diff --git a/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj b/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj
index bf367142bbc3..774159200782 100644
--- a/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj
+++ b/test/dotnet-watch.Tests/dotnet-watch.Tests.csproj
@@ -9,9 +9,6 @@
     <Compile Include="..\..\src\Tasks\Microsoft.NET.Build.Tasks.UnitTests\Mocks\MockBuildEngine.cs" Link="Utilities\MockBuildEngine.cs" />
     <Compile Include="..\..\src\Tasks\Microsoft.NET.Build.Tasks.UnitTests\Mocks\MockTaskItem.cs" Link="Utilities\MockTaskItem.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\BuiltInTools\dotnet-watch\dotnet-watch.csproj" />
     <ProjectReference Include="$(RepoRoot)\src\BuiltInTools\DotNetWatchTasks\DotNetWatchTasks.csproj" />
diff --git a/test/dotnet.Tests/dotnet.Tests.csproj b/test/dotnet.Tests/dotnet.Tests.csproj
index 76d95d0b1c39..4bb8bfdc1df5 100644
--- a/test/dotnet.Tests/dotnet.Tests.csproj
+++ b/test/dotnet.Tests/dotnet.Tests.csproj
@@ -125,10 +125,6 @@
     <PackageReference Include="Microsoft.DotNet.Installer.Windows.Security.TestData" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
   <!-- Global usings -->
   <!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
   <ItemGroup>
diff --git a/test/dotnet.Tests/xunit.runner.json b/test/dotnet.Tests/xunit.runner.json
deleted file mode 100644
index d766d6750a82..000000000000
--- a/test/dotnet.Tests/xunit.runner.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
-    "diagnosticMessages": true,
-    "internalDiagnosticMessages": true,
-    "longRunningTestSeconds": 120
-}
diff --git a/test/dotnet-watch.Tests/xunit.runner.json b/test/xunit.runner.json
similarity index 100%
rename from test/dotnet-watch.Tests/xunit.runner.json
rename to test/xunit.runner.json