From ebd36f08b6a55b3e22296f41f52a15127ba3878d Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 16 Apr 2023 10:48:26 +1000
Subject: [PATCH] Downgrade `System.Drawing.Common` to 6.0.0 and enable Unix
 impl.

fixes 65ffa3fc2
testroms run now, CBB checking GambatteSuite runs but I'm guessing it does too
---
 .../PcxFileTypePlugin.HawkQuantizer.csproj    |   2 +-
 .../PcxFileTypePlugin.HawkQuantizer.dll       | Bin 13312 -> 13312 bytes
 .../BizHawk.Bizware.BizwareGL.csproj          |   2 +-
 ...awk.Tests.Testroms.GB.GambatteSuite.csproj |   1 +
 .../BizHawk.Tests.Testroms.GB.csproj          |   1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj b/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj
index 6230731e26..a40b770861 100644
--- a/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj
+++ b/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj
@@ -8,6 +8,6 @@
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
 	</ItemGroup>
 </Project>
diff --git a/References/PcxFileTypePlugin.HawkQuantizer.dll b/References/PcxFileTypePlugin.HawkQuantizer.dll
index 5c7886ebbdf7710b0e9fd843a406cdfc25e0ad36..0163d96cafd2afdc9d888e9060e0f588b4465c1c 100644
GIT binary patch
delta 112
zcmZq3Xvmn*!IJm9<;}*P7gCIDn@gp`xdracR_gdJHqCc(iTQP#Opa@t@2I_CVcEOh
z_1)wX+5rN$rbX^otJQGc8E2TZMo#$aWDT8M1*l+hB~%ckI!w-U`>wTX-#W`oY2Cb4
H$D17hC0a6U

delta 112
zcmZq3Xvmn*!Sc>^&!mk#FQgdRH<wC>a|^uToxaz5%W;nhN$np5P51oXd`ImC3rky5
z_}s}Sv;zb@qB?J_f4tLsv(L}_cBuyOlQnd56`+E<VS+%_vU~VN<!8^X&<$bsda!w`
HjyF31o7FR$

diff --git a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index 8f4652c72f..cb0853fe00 100644
--- a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.4" />
-		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+		<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
 	</ItemGroup>
 	<ItemGroup>
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 50ab5f4729..d24c3c11f5 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
@@ -10,5 +10,6 @@
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" PrivateAssets="all" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj" />
 		<EmbeddedResource Include="res/**/*" />
+		<RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />
 	</ItemGroup>
 </Project>
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 d719927b99..ba6ac30f96 100644
--- a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
+++ b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
@@ -25,5 +25,6 @@
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
 		<EmbeddedResource Include="res/**/*" />
 		<Content Include="$(ProjectDir)../../Assets/gamedb/**/*" LinkBase="gamedb" CopyToOutputDirectory="PreserveNewest" />
+		<RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />
 	</ItemGroup>
 </Project>