From 293e45fd4916491aff3fa04486dfc5aebc2d0f68 Mon Sep 17 00:00:00 2001
From: icedream <icedream2k9@die-optimisten.net>
Date: Sun, 22 Mar 2015 00:10:21 +0100
Subject: [PATCH] Normalize Newtonsoft.Json version for all projects to latest
 stable.

---
 src/client/NPSharp.Client.csproj | 6 ++++--
 src/client/packages.config       | 2 +-
 src/npfile/App.config            | 2 +-
 src/npfile/npfile.csproj         | 3 ++-
 src/npfile/packages.config       | 2 +-
 src/npmotd/App.config            | 8 --------
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/client/NPSharp.Client.csproj b/src/client/NPSharp.Client.csproj
index 65443e6..504aa08 100644
--- a/src/client/NPSharp.Client.csproj
+++ b/src/client/NPSharp.Client.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <NuGetPackageImportStamp>b8f4ba3f</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup>
     <OutDir>$(SolutionDir)\bin\$(Configuration)\$(Platform)\</OutDir>
@@ -42,8 +43,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SolutionDir)\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.7.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net">
       <HintPath>$(SolutionDir)\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
diff --git a/src/client/packages.config b/src/client/packages.config
index 88820d3..35c4678 100644
--- a/src/client/packages.config
+++ b/src/client/packages.config
@@ -3,6 +3,6 @@
 <packages>
   <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
   <package id="log4net" version="2.0.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="7.0.1-beta1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/npfile/App.config b/src/npfile/App.config
index 728a6f5..6a19c5b 100644
--- a/src/npfile/App.config
+++ b/src/npfile/App.config
@@ -8,7 +8,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/npfile/npfile.csproj b/src/npfile/npfile.csproj
index 56d6575..fdf7b5a 100644
--- a/src/npfile/npfile.csproj
+++ b/src/npfile/npfile.csproj
@@ -43,7 +43,8 @@
       <HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/npfile/packages.config b/src/npfile/packages.config
index b5b0d66..f880425 100644
--- a/src/npfile/packages.config
+++ b/src/npfile/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.3" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
   <package id="uHttpSharp" version="0.1.5.4" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/npmotd/App.config b/src/npmotd/App.config
index 728a6f5..5c73fc5 100644
--- a/src/npmotd/App.config
+++ b/src/npmotd/App.config
@@ -4,12 +4,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>
\ No newline at end of file