diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj index a2ad7a3d3e9..663ff5ae358 100644 --- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -44,21 +44,24 @@ false - - ..\References\ICSharpCode.SharpZipLib.dll + + ../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll + True - - ..\References\Ionic.Zip.dll + + ../packages/Ionic.Zip.1.9.1.8/lib/Ionic.Zip.dll + True - - ..\References\Newtonsoft.Json.dll + + ../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll + True ..\output\dll\nlua\NLua.dll False - ..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll + ../packages/SharpCompress.0.24.0/lib/net45/SharpCompress.dll True diff --git a/BizHawk.Client.Common/packages.config b/BizHawk.Client.Common/packages.config index dcaa847713f..a65c590f5b7 100644 --- a/BizHawk.Client.Common/packages.config +++ b/BizHawk.Client.Common/packages.config @@ -1,4 +1,7 @@  + + + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 6d992e7fbca..9295779bcea 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -73,23 +73,25 @@ ..\References\GongShell.dll - - ..\References\ICSharpCode.SharpZipLib.dll + + ../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll + True - - ..\References\Newtonsoft.Json.dll + + ../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll + True False ..\output\dll\nlua\NLua.dll False - - False - ..\References\OpenTK.dll + + ../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll + True ..\References\x64\SlimDX.dll diff --git a/BizHawk.Client.EmuHawk/packages.config b/BizHawk.Client.EmuHawk/packages.config new file mode 100644 index 00000000000..4a4e14a3642 --- /dev/null +++ b/BizHawk.Client.EmuHawk/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj index 5a7a864107b..ce5963e87a9 100644 --- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj +++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj @@ -42,8 +42,9 @@ 8.0 - - ..\References\Newtonsoft.Json.dll + + ../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll + True diff --git a/BizHawk.Emulation.Common/packages.config b/BizHawk.Emulation.Common/packages.config new file mode 100644 index 00000000000..2b6424fa002 --- /dev/null +++ b/BizHawk.Emulation.Common/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj index 84730df4e9f..2b803b659b2 100644 --- a/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj +++ b/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj @@ -64,15 +64,17 @@ false - - ..\References\ELFSharp.dll + + ../packages/ELFSharp.0.1/lib/net40/ELFSharp.dll + True - - ..\References\Newtonsoft.Json.dll + + ../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll + True - - False - ..\References\OpenTK.dll + + ../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll + True ..\References\PeNet.dll diff --git a/BizHawk.Emulation.Cores/packages.config b/BizHawk.Emulation.Cores/packages.config new file mode 100644 index 00000000000..a36ca0f1680 --- /dev/null +++ b/BizHawk.Emulation.Cores/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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 161476cfc9a..971c651e756 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/BizHawk.Bizware.BizwareGL.GdiPlus.csproj @@ -39,9 +39,9 @@ MinimumRecommendedRules.ruleset - - False - ..\..\References\OpenTK.dll + + ../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll + True diff --git a/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/packages.config b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/packages.config new file mode 100644 index 00000000000..a705dc46a03 --- /dev/null +++ b/Bizware/BizHawk.Bizware.BizwareGL.GdiPlus/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file 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 d5de888cc03..cbeeb93cbc6 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/BizHawk.Bizware.BizwareGL.OpenTK.csproj @@ -43,13 +43,13 @@ false - - False - ..\..\References\OpenTK.dll + + ../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll + True - - False - ..\..\References\OpenTK.GLControl.dll + + ../../packages/OpenTK.GLControl.3.0.1/lib/net20/OpenTK.GLControl.dll + True diff --git a/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/packages.config b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/packages.config new file mode 100644 index 00000000000..b41861333f1 --- /dev/null +++ b/Bizware/BizHawk.Bizware.BizwareGL.OpenTK/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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 eea37225b7b..0b364eac317 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/BizHawk.Bizware.BizwareGL.SlimDX.csproj @@ -39,9 +39,9 @@ MinimumRecommendedRules.ruleset - - False - ..\..\References\OpenTK.dll + + ../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll + True ..\..\References\x64\SlimDX.dll diff --git a/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/packages.config b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/packages.config new file mode 100644 index 00000000000..a705dc46a03 --- /dev/null +++ b/Bizware/BizHawk.Bizware.BizwareGL.SlimDX/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj index 250b73a87c6..821a7d64b46 100644 --- a/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj +++ b/Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj @@ -43,9 +43,9 @@ false - - False - ..\..\References\OpenTK.dll + + ../../packages/OpenTK.3.0.1/lib/net20/OpenTK.dll + True diff --git a/Bizware/BizHawk.Bizware.BizwareGL/packages.config b/Bizware/BizHawk.Bizware.BizwareGL/packages.config new file mode 100644 index 00000000000..a705dc46a03 --- /dev/null +++ b/Bizware/BizHawk.Bizware.BizwareGL/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/References/ELFSharp.dll b/References/ELFSharp.dll deleted file mode 100644 index 0f9ee669ce0..00000000000 Binary files a/References/ELFSharp.dll and /dev/null differ diff --git a/References/ICSharpCode.SharpZipLib.dll b/References/ICSharpCode.SharpZipLib.dll deleted file mode 100644 index 71dce26f6fb..00000000000 Binary files a/References/ICSharpCode.SharpZipLib.dll and /dev/null differ diff --git a/References/Ionic.Zip.dll b/References/Ionic.Zip.dll deleted file mode 100644 index 95fa9288557..00000000000 Binary files a/References/Ionic.Zip.dll and /dev/null differ diff --git a/References/Newtonsoft.Json.dll b/References/Newtonsoft.Json.dll deleted file mode 100644 index a04a6ca3aa4..00000000000 Binary files a/References/Newtonsoft.Json.dll and /dev/null differ diff --git a/References/OpenTK.GLControl.dll b/References/OpenTK.GLControl.dll deleted file mode 100644 index 9d928cfb697..00000000000 Binary files a/References/OpenTK.GLControl.dll and /dev/null differ diff --git a/References/OpenTK.dll b/References/OpenTK.dll deleted file mode 100644 index 52feb21b25a..00000000000 Binary files a/References/OpenTK.dll and /dev/null differ diff --git a/References/OpenTK.dll.config b/References/OpenTK.dll.config deleted file mode 100644 index 5620e3d9e22..00000000000 --- a/References/OpenTK.dll.config +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -