From 50373ac1adc1caa26511cd52c694e2a82920913d Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 27 Dec 2019 16:31:12 +1000
Subject: [PATCH] Move conditional PackageReferences to conditional .targets
 import

Fixes build system bug introduced by c31050feb
---
 .../BizHawk.Client.Common.csproj              | 31 +-----------------
 .../DotNetBuild.NuGet.targets                 | 32 +++++++++++++++++++
 .../BizHawk.Client.EmuHawk.csproj             | 17 +---------
 .../DotNetBuild.NuGet.targets                 | 18 +++++++++++
 .../BizHawk.Emulation.Common.csproj           | 10 +-----
 .../DotNetBuild.NuGet.targets                 | 11 +++++++
 .../BizHawk.Emulation.Cores.csproj            | 24 +-------------
 .../DotNetBuild.NuGet.targets                 | 25 +++++++++++++++
 .../BizHawk.Bizware.BizwareGL.GdiPlus.csproj  | 10 +-----
 .../DotNetBuild.NuGet.targets                 | 11 +++++++
 .../BizHawk.Bizware.BizwareGL.OpenTK.csproj   | 17 +---------
 .../DotNetBuild.NuGet.targets                 | 18 +++++++++++
 .../BizHawk.Bizware.BizwareGL.SlimDX.csproj   | 10 +-----
 .../DotNetBuild.NuGet.targets                 | 11 +++++++
 .../BizHawk.Bizware.BizwareGL.csproj          | 10 +-----
 .../DotNetBuild.NuGet.targets                 | 11 +++++++
 16 files changed, 145 insertions(+), 121 deletions(-)
 create mode 100644 BizHawk.Client.Common/DotNetBuild.NuGet.targets
 create mode 100644 BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets
 create mode 100644 BizHawk.Emulation.Common/DotNetBuild.NuGet.targets
 create mode 100644 BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets
 create mode 100644 Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets
 create mode 100644 Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets
 create mode 100644 Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets
 create mode 100644 Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets

diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index e05f5cce01..9b159e4d15 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -43,36 +43,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="Ionic.Zip" Version="1.9.1.8" />
-    <Reference
-      FusionName="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c"
-      Include="$(MachineNuGetPackageDir)/ionic.zip/1.9.1.8/lib/Ionic.Zip.dll"
-      Name="Ionic.Zip"
-      Private="true"
-      SpecificVersion="true" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <Reference
-      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
-      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
-      Name="Newtonsoft.Json"
-      Private="true"
-      SpecificVersion="true" />
-    <PackageReference Include="SharpCompress" Version="0.24.0" />
-    <Reference
-      FusionName="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96"
-      Include="$(MachineNuGetPackageDir)/sharpcompress/0.24.0/lib/net45/SharpCompress.dll"
-      Name="SharpCompress"
-      Private="true"
-      SpecificVersion="true" />
-    <PackageReference Include="SharpZipLib" Version="1.1.0" />
-    <Reference
-      FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
-      Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
-      Name="ICSharpCode.SharpZipLib"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../packages/Ionic.Zip.1.9.1.8/lib/Ionic.Zip.dll"
diff --git a/BizHawk.Client.Common/DotNetBuild.NuGet.targets b/BizHawk.Client.Common/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..a52f11769d
--- /dev/null
+++ b/BizHawk.Client.Common/DotNetBuild.NuGet.targets
@@ -0,0 +1,32 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Ionic.Zip" Version="1.9.1.8" />
+    <Reference
+      FusionName="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c"
+      Include="$(MachineNuGetPackageDir)/ionic.zip/1.9.1.8/lib/Ionic.Zip.dll"
+      Name="Ionic.Zip"
+      Private="true"
+      SpecificVersion="true" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <Reference
+      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
+      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
+      Name="Newtonsoft.Json"
+      Private="true"
+      SpecificVersion="true" />
+    <PackageReference Include="SharpCompress" Version="0.24.0" />
+    <Reference
+      FusionName="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96"
+      Include="$(MachineNuGetPackageDir)/sharpcompress/0.24.0/lib/net45/SharpCompress.dll"
+      Name="SharpCompress"
+      Private="true"
+      SpecificVersion="true" />
+    <PackageReference Include="SharpZipLib" Version="1.1.0" />
+    <Reference
+      FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
+      Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
+      Name="ICSharpCode.SharpZipLib"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 930838f4d1..49f8792bc1 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -69,22 +69,7 @@
     <!--<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>-->
     <CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <Reference
-      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
-      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
-      Name="Newtonsoft.Json"
-      Private="true"
-      SpecificVersion="true" />
-    <PackageReference Include="SharpZipLib" Version="1.1.0" />
-    <Reference
-      FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
-      Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
-      Name="ICSharpCode.SharpZipLib"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
diff --git a/BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets b/BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..986eba31a6
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/DotNetBuild.NuGet.targets
@@ -0,0 +1,18 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <Reference
+      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
+      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
+      Name="Newtonsoft.Json"
+      Private="true"
+      SpecificVersion="true" />
+    <PackageReference Include="SharpZipLib" Version="1.1.0" />
+    <Reference
+      FusionName="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
+      Include="$(MachineNuGetPackageDir)/sharpziplib/1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
+      Name="ICSharpCode.SharpZipLib"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index 448a7a5365..04e94d7f37 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -41,15 +41,7 @@
     <TargetFrameworkProfile />
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <Reference
-      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
-      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
-      Name="Newtonsoft.Json"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
diff --git a/BizHawk.Emulation.Common/DotNetBuild.NuGet.targets b/BizHawk.Emulation.Common/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..d669ed3d82
--- /dev/null
+++ b/BizHawk.Emulation.Common/DotNetBuild.NuGet.targets
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <Reference
+      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
+      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
+      Name="Newtonsoft.Json"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>
diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index c775ebc5c3..5620eb2008 100644
--- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -63,29 +63,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="ELFSharp" Version="0.1.0" />
-    <Reference
-      FusionName="ELFSharp, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null"
-      Include="$(MachineNuGetPackageDir)/elfsharp/0.1.0/lib/net40/ELFSharp.dll"
-      Name="ELFSharp"
-      Private="true"
-      SpecificVersion="true" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <Reference
-      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
-      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
-      Name="Newtonsoft.Json"
-      Private="true"
-      SpecificVersion="true" />
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <Reference
-      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
-      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
-      Name="OpenTK"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../packages/ELFSharp.0.1/lib/net40/ELFSharp.dll"
diff --git a/BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets b/BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..cea817be8f
--- /dev/null
+++ b/BizHawk.Emulation.Cores/DotNetBuild.NuGet.targets
@@ -0,0 +1,25 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="ELFSharp" Version="0.1.0" />
+    <Reference
+      FusionName="ELFSharp, Version=0.1.0.0, Culture=neutral, PublicKeyToken=null"
+      Include="$(MachineNuGetPackageDir)/elfsharp/0.1.0/lib/net40/ELFSharp.dll"
+      Name="ELFSharp"
+      Private="true"
+      SpecificVersion="true" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <Reference
+      FusionName="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
+      Include="$(MachineNuGetPackageDir)/newtonsoft.json/12.0.3/lib/net45/Newtonsoft.Json.dll"
+      Name="Newtonsoft.Json"
+      Private="true"
+      SpecificVersion="true" />
+    <PackageReference Include="OpenTK" Version="3.0.1" />
+    <Reference
+      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
+      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
+      Name="OpenTK"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj
index 9eb53ace03..0c4d8f2d64 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj
@@ -38,15 +38,7 @@
     <!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
     <CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <Reference
-      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
-      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
-      Name="OpenTK"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..030ce546dd
--- /dev/null
+++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/DotNetBuild.NuGet.targets
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="OpenTK" Version="3.0.1" />
+    <Reference
+      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
+      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
+      Name="OpenTK"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj
index 3871e870be..0c656684c6 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj
@@ -42,22 +42,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <Reference
-      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
-      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
-      Name="OpenTK"
-      Private="true"
-      SpecificVersion="true" />
-    <PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
-    <Reference
-      FusionName="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
-      Include="$(MachineNuGetPackageDir)/opentk.glcontrol/3.0.1/lib/net20/OpenTK.GLControl.dll"
-      Name="OpenTK"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..bba4a12ac8
--- /dev/null
+++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/DotNetBuild.NuGet.targets
@@ -0,0 +1,18 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="OpenTK" Version="3.0.1" />
+    <Reference
+      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
+      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
+      Name="OpenTK"
+      Private="true"
+      SpecificVersion="true" />
+    <PackageReference Include="OpenTK.GLControl" Version="3.0.1" />
+    <Reference
+      FusionName="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
+      Include="$(MachineNuGetPackageDir)/opentk.glcontrol/3.0.1/lib/net20/OpenTK.GLControl.dll"
+      Name="OpenTK"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
index a22710063a..3cada20183 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj
@@ -38,15 +38,7 @@
     <!--<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>-->
     <CodeAnalysisRuleSet Condition=" '$(OS)' == 'Windows_NT' ">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <Reference
-      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
-      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
-      Name="OpenTK"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..030ce546dd
--- /dev/null
+++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/DotNetBuild.NuGet.targets
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="OpenTK" Version="3.0.1" />
+    <Reference
+      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
+      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
+      Name="OpenTK"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index 9a12372fba..d4e4490c0d 100644
--- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -42,15 +42,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <PackageReference Include="OpenTK" Version="3.0.1" />
-    <Reference
-      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
-      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
-      Name="OpenTK"
-      Private="true"
-      SpecificVersion="true" />
-  </ItemGroup>
+  <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <Reference
       HintPath="../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll"
diff --git a/Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets b/Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets
new file mode 100644
index 0000000000..030ce546dd
--- /dev/null
+++ b/Bizware/BizHawk.Bizware.BizwareGL/DotNetBuild.NuGet.targets
@@ -0,0 +1,11 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="OpenTK" Version="3.0.1" />
+    <Reference
+      FusionName="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
+      Include="$(MachineNuGetPackageDir)/opentk/3.0.1/lib/net20/OpenTK.dll"
+      Name="OpenTK"
+      Private="true"
+      SpecificVersion="true" />
+  </ItemGroup>
+</Project>