From 7b644f771e4659a648de279fe56f61d60241ab8a Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Fri, 26 Jul 2024 10:28:44 +1000
Subject: [PATCH] Use `System.Drawing.Primitives`

---
 Directory.Packages.props                                       | 1 +
 .../BizHawk.Bizware.Graphics.Controls.csproj                   | 1 +
 src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj   | 3 ++-
 src/BizHawk.Client.Common/BizHawk.Client.Common.csproj         | 1 +
 src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj | 1 +
 src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 72e8d41674..d9e3da72c2 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -32,6 +32,7 @@
 		<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
 		<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
 		<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
+		<PackageVersion Include="System.Drawing.Primitives" Version="4.3.0" />
 		<PackageVersion Include="System.Memory" Version="4.5.5" />
 		<PackageVersion Include="System.Net.Http" Version="4.3.4" />
 		<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
diff --git a/src/BizHawk.Bizware.Graphics.Controls/BizHawk.Bizware.Graphics.Controls.csproj b/src/BizHawk.Bizware.Graphics.Controls/BizHawk.Bizware.Graphics.Controls.csproj
index 18c85de729..a5062d6020 100644
--- a/src/BizHawk.Bizware.Graphics.Controls/BizHawk.Bizware.Graphics.Controls.csproj
+++ b/src/BizHawk.Bizware.Graphics.Controls/BizHawk.Bizware.Graphics.Controls.csproj
@@ -9,6 +9,7 @@
 		<UseWindowsForms>true</UseWindowsForms>
 	</PropertyGroup>
 	<ItemGroup>
+		<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj b/src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj
index ea44ea0e64..267244effb 100644
--- a/src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj
+++ b/src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj
@@ -10,7 +10,8 @@
 	<ItemGroup>
 		<PackageReference Include="Cyotek.Drawing.BitmapFont" />
 		<PackageReference Include="ImGui.NET" ExcludeAssets="native" />
-		<PackageReference Include="System.Drawing.Common" />
+		<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
+		<PackageReference Include="System.Drawing.Primitives" />
 		<PackageReference Include="Silk.NET.OpenGL" />
 		<PackageReference Include="Silk.NET.WGL.Extensions.NV" />
 		<PackageReference Include="ppy.SDL2-CS" ExcludeAssets="native;contentFiles" />
diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 68fecfc6ed..2cf384f1ed 100644
--- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -12,6 +12,7 @@
 		<PackageReference Include="Microsoft.Data.Sqlite.Core" />
 		<PackageReference Include="SharpCompress" />
 		<PackageReference Include="SQLitePCLRaw.provider.e_sqlite3" />
+		<PackageReference Include="System.Drawing.Common" PrivateAssets="all" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
 		<EmbeddedResource Include="Resources/**/*" />
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 4f0301b007..bc824455d2 100644
--- a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
+++ b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
@@ -21,6 +21,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Magick.NET-Q8-AnyCPU" />
+		<PackageReference Include="System.Drawing.Common" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
 		<EmbeddedResource Include="res/**/*" />
diff --git a/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj b/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
index bf3a2e331e..31744f1864 100644
--- a/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
+++ b/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
@@ -7,6 +7,7 @@
 		<UseWindowsForms>true</UseWindowsForms>
 	</PropertyGroup>
 	<ItemGroup>
+		<PackageReference Include="System.Drawing.Common" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
 	</ItemGroup>
 </Project>