From 13dbe45b43b694b17ca96f6dd60c5f55d1c2ec91 Mon Sep 17 00:00:00 2001
From: KillzXGaming <millernathan35@gmail.com>
Date: Sun, 3 May 2020 17:35:06 -0400
Subject: [PATCH] Cleanup some packages

---
 File_Format_Library/app.config                | 6 +++++-
 Switch_Toolbox_Library/Toolbox_Library.csproj | 5 +----
 Switch_Toolbox_Library/packages.config        | 1 -
 Toolbox/App.config                            | 8 ++++++++
 Toolbox/Toolbox.csproj                        | 3 ---
 Toolbox/packages.config                       | 1 -
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/File_Format_Library/app.config b/File_Format_Library/app.config
index 7717060e..a49f8eb5 100644
--- a/File_Format_Library/app.config
+++ b/File_Format_Library/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -14,6 +14,10 @@
         <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/Switch_Toolbox_Library/Toolbox_Library.csproj b/Switch_Toolbox_Library/Toolbox_Library.csproj
index 91152c36..02386c15 100644
--- a/Switch_Toolbox_Library/Toolbox_Library.csproj
+++ b/Switch_Toolbox_Library/Toolbox_Library.csproj
@@ -51,9 +51,6 @@
       <HintPath>..\Toolbox\Lib\CSCore.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="CsvHelper">
-      <HintPath>..\Toolbox\Lib\CsvHelper.dll</HintPath>
-    </Reference>
     <Reference Include="Cyotek.Windows.Forms.ImageBox">
       <HintPath>..\Toolbox\Lib\Cyotek.Windows.Forms.ImageBox.dll</HintPath>
     </Reference>
@@ -232,7 +229,7 @@
     <Compile Include="Compression\Formats\lz4.cs" />
     <Compile Include="Compression\Formats\LZ4F.cs" />
     <Compile Include="Compression\Formats\LZMA.cs" />
-	<Compile Include="Compression\Formats\LZ77.cs" />
+    <Compile Include="Compression\Formats\LZ77.cs" />
     <Compile Include="Compression\Formats\MtaCustomCmp.cs" />
     <Compile Include="Compression\Formats\ZlibGZ.cs" />
     <Compile Include="Compression\Formats\Zstb.cs" />
diff --git a/Switch_Toolbox_Library/packages.config b/Switch_Toolbox_Library/packages.config
index 5c39036b..49922cbc 100644
--- a/Switch_Toolbox_Library/packages.config
+++ b/Switch_Toolbox_Library/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AssimpNet" version="4.1.0" targetFramework="net462" />
-  <package id="CsvHelper" version="8.0.0-beta01" targetFramework="net462" />
   <package id="DirectXTexNet" version="1.0.0-rc3" targetFramework="net462" />
   <package id="IonKiwi.lz4.net" version="1.0.11" targetFramework="net462" />
   <package id="K4os.Compression.LZ4" version="1.1.1" targetFramework="net462" />
diff --git a/Toolbox/App.config b/Toolbox/App.config
index efae7876..b2601efa 100644
--- a/Toolbox/App.config
+++ b/Toolbox/App.config
@@ -7,6 +7,14 @@
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
     <startup> 
diff --git a/Toolbox/Toolbox.csproj b/Toolbox/Toolbox.csproj
index ce2a525a..c3ed9c73 100644
--- a/Toolbox/Toolbox.csproj
+++ b/Toolbox/Toolbox.csproj
@@ -50,9 +50,6 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AssimpNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=0d51b391f59f42a6, processorArchitecture=MSIL">
-      <HintPath>..\packages\AssimpNet.4.1.0\lib\net40\AssimpNet.dll</HintPath>
-    </Reference>
     <Reference Include="DirectXTexNet, Version=1.0.0.3, Culture=neutral, PublicKeyToken=67e4f5ed452a4f5d, processorArchitecture=MSIL">
       <HintPath>..\packages\DirectXTexNet.1.0.0-rc3\lib\net40\DirectXTexNet.dll</HintPath>
     </Reference>
diff --git a/Toolbox/packages.config b/Toolbox/packages.config
index 7f0433fe..3240efdf 100644
--- a/Toolbox/packages.config
+++ b/Toolbox/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AssimpNet" version="5.0.0-beta1" targetFramework="net462" />
   <package id="DirectXTexNet" version="1.0.0-rc3" targetFramework="net462" />
 </packages>
\ No newline at end of file