From 8c9bd4105792648cae6992c08e32d1978de3e01b Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Tue, 1 Mar 2016 21:44:51 +0000
Subject: [PATCH] upgraded Json.Net and Nancy packages

---
 RequestPlex.Api/RequestPlex.Api.csproj   |  5 +++--
 RequestPlex.Api/app.config               | 11 +++++++++++
 RequestPlex.Api/packages.config          |  2 +-
 RequestPlex.Core/RequestPlex.Core.csproj |  1 +
 RequestPlex.Core/app.config              | 11 +++++++++++
 RequestPlex.UI/RequestPlex.UI.csproj     |  7 ++++---
 RequestPlex.UI/app.config                |  8 ++++++++
 RequestPlex.UI/packages.config           |  2 +-
 8 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 RequestPlex.Api/app.config
 create mode 100644 RequestPlex.Core/app.config

diff --git a/RequestPlex.Api/RequestPlex.Api.csproj b/RequestPlex.Api/RequestPlex.Api.csproj
index 1b81b40ee..bc26a3015 100644
--- a/RequestPlex.Api/RequestPlex.Api.csproj
+++ b/RequestPlex.Api/RequestPlex.Api.csproj
@@ -38,8 +38,8 @@
       <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
@@ -70,6 +70,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/RequestPlex.Api/app.config b/RequestPlex.Api/app.config
new file mode 100644
index 000000000..ac2586ac9
--- /dev/null
+++ b/RequestPlex.Api/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/RequestPlex.Api/packages.config b/RequestPlex.Api/packages.config
index 50b670221..62b36e32c 100644
--- a/RequestPlex.Api/packages.config
+++ b/RequestPlex.Api/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Dapper" version="1.42" targetFramework="net452" />
   <package id="Nancy" version="1.4.3" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
   <package id="RestSharp" version="105.2.3" targetFramework="net452" />
   <package id="TMDbLib" version="0.9.0.0-alpha" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/RequestPlex.Core/RequestPlex.Core.csproj b/RequestPlex.Core/RequestPlex.Core.csproj
index 62122a746..958a2fed9 100644
--- a/RequestPlex.Core/RequestPlex.Core.csproj
+++ b/RequestPlex.Core/RequestPlex.Core.csproj
@@ -74,6 +74,7 @@
     <Compile Include="UserMapper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/RequestPlex.Core/app.config b/RequestPlex.Core/app.config
new file mode 100644
index 000000000..ac2586ac9
--- /dev/null
+++ b/RequestPlex.Core/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/RequestPlex.UI/RequestPlex.UI.csproj b/RequestPlex.UI/RequestPlex.UI.csproj
index 48a5d21a8..f2920dd7c 100644
--- a/RequestPlex.UI/RequestPlex.UI.csproj
+++ b/RequestPlex.UI/RequestPlex.UI.csproj
@@ -38,7 +38,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -70,8 +70,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Assemblies\Mono.Data.Sqlite.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy">
-      <HintPath>..\packages\Nancy.1.4.1\lib\net40\Nancy.dll</HintPath>
+    <Reference Include="Nancy, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Nancy.Authentication.Basic, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
diff --git a/RequestPlex.UI/app.config b/RequestPlex.UI/app.config
index 825a85f28..ba2fe0922 100644
--- a/RequestPlex.UI/app.config
+++ b/RequestPlex.UI/app.config
@@ -28,4 +28,12 @@
       </providers>
     </roleManager>
   </system.web>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/RequestPlex.UI/packages.config b/RequestPlex.UI/packages.config
index 7b054d963..149d4de12 100644
--- a/RequestPlex.UI/packages.config
+++ b/RequestPlex.UI/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net452" />
-  <package id="Nancy" version="1.4.1" requireReinstallation="true" />
+  <package id="Nancy" version="1.4.3" targetFramework="net452" />
   <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net452" />
   <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net452" />
   <package id="Nancy.Hosting.Self" version="1.4.1" requireReinstallation="true" />