From 6df491c9d930d5375883ebd6269e0703e0cfcb83 Mon Sep 17 00:00:00 2001
From: James Groom <OSSYoshiRulz+GitHub@gmail.com>
Date: Fri, 8 Mar 2024 10:33:53 +0000
Subject: [PATCH] Dedup test project files and also mute style warnings in
 GambatteSuite

---
 .../BizHawk.Tests.Testroms.GB.GambatteSuite.csproj   |  5 ++---
 .../BizHawk.Tests.Testroms.GB.csproj                 |  7 +------
 src/BizHawk.Tests/BizHawk.Tests.csproj               |  7 +------
 src/MainSlnTest.props                                | 12 ++++++++++++
 4 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 src/MainSlnTest.props

diff --git a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj
index aab779a299..c24e77cac7 100644
--- a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj
+++ b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj
@@ -2,12 +2,11 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
-	<Import Project="../MainSlnCommon.props" />
+	<Import Project="../MainSlnTest.props" />
 	<PropertyGroup>
-		<OutputPath>$(ProjectDir)../../test_output</OutputPath>
+		<NoWarn>$(NoWarn);CA1310;CA1416</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj" />
 		<EmbeddedResource Include="res/**/*" />
 		<RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />
diff --git a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
index 37aaa0d70f..7bd9c40154 100644
--- a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
+++ b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
@@ -2,10 +2,9 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
-	<Import Project="../MainSlnCommon.props" />
+	<Import Project="../MainSlnTest.props" />
 	<PropertyGroup>
 		<NoWarn>$(NoWarn);CA1310;CA1416</NoWarn>
-		<OutputPath>$(ProjectDir)../../test_output</OutputPath>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(BIZHAWKTEST_RUN_KNOWN_FAILURES)' == '' ">
 		<DefineConstants>$(DefineConstants);SKIP_KNOWN_FAILURES</DefineConstants>
@@ -18,10 +17,6 @@
 	</PropertyGroup>
 	<!-- BIZHAWKTEST_SAVE_IMAGES=none => no extra defines -->
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
-		<PackageReference Include="MSTest.TestAdapter" />
-		<PackageReference Include="MSTest.TestFramework" />
-		<PackageReference Include="JunitXml.TestLogger" />
 		<PackageReference Include="Magick.NET-Q8-AnyCPU" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj
index b8de05e6f0..13edbe5214 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests/BizHawk.Tests.csproj
@@ -5,16 +5,11 @@
 	<PropertyGroup Condition=" '$(APPVEYOR)' != '' ">
 		<TargetFramework>netcoreapp3.1</TargetFramework>
 	</PropertyGroup>
-	<Import Project="../MainSlnCommon.props" />
+	<Import Project="../MainSlnTest.props" />
 	<PropertyGroup>
 		<DefineConstants Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
-		<OutputPath>$(ProjectDir)../../test_output</OutputPath>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
-		<PackageReference Include="MSTest.TestAdapter" PrivateAssets="all" />
-		<PackageReference Include="MSTest.TestFramework" PrivateAssets="all" />
-		<PackageReference Include="JunitXml.TestLogger" PrivateAssets="all" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
 		<Reference Include="NLua, Version=1.4.1.0, Culture=neutral, PublicKeyToken=null, processorArchitecture=MSIL" SpecificVersion="false" HintPath="$(ProjectDir)../../References/NLua.dll" Private="true" />
 		<None Include="$(ProjectDir)../../Assets/dll/lua54.dll" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/MainSlnTest.props b/src/MainSlnTest.props
new file mode 100644
index 0000000000..365583e3b4
--- /dev/null
+++ b/src/MainSlnTest.props
@@ -0,0 +1,12 @@
+<Project>
+	<Import Project="MainSlnCommon.props" />
+	<PropertyGroup>
+		<OutputPath>$(ProjectDir)../../test_output</OutputPath>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
+		<PackageReference Include="MSTest.TestAdapter" PrivateAssets="all" />
+		<PackageReference Include="MSTest.TestFramework" PrivateAssets="all" />
+		<PackageReference Include="JunitXml.TestLogger" PrivateAssets="all" />
+	</ItemGroup>
+</Project>
\ No newline at end of file