Use one version of JSON library, not two.

Remove the need to download two different versions of the JSON library.

Also, fix a discrepancy between JSON version in packages.config and csproj in OData.

18 files changed, 21 insertions, 21 deletions

diff --git a/src/Microsoft.AspNet.Mvc.Facebook/Microsoft.AspNet.Mvc.Facebook.csproj b/src/Microsoft.AspNet.Mvc.Facebook/Microsoft.AspNet.Mvc.Facebook.csproj
index 2d55574c..c9d99831 100644
--- a/src/Microsoft.AspNet.Mvc.Facebook/Microsoft.AspNet.Mvc.Facebook.csproj
+++ b/src/Microsoft.AspNet.Mvc.Facebook/Microsoft.AspNet.Mvc.Facebook.csproj
@@ -43,8 +43,8 @@
       <Private>True</Private>
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/src/Microsoft.AspNet.Mvc.Facebook/packages.config b/src/Microsoft.AspNet.Mvc.Facebook/packages.config
index 114e4bd5..c2189d31 100644
--- a/src/Microsoft.AspNet.Mvc.Facebook/packages.config
+++ b/src/Microsoft.AspNet.Mvc.Facebook/packages.config
@@ -11,5 +11,5 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/Microsoft.Web.Http.Data.Helpers/Microsoft.Web.Http.Data.Helpers.csproj b/src/Microsoft.Web.Http.Data.Helpers/Microsoft.Web.Http.Data.Helpers.csproj
index 5d8ec4e2..d255abdc 100644
--- a/src/Microsoft.Web.Http.Data.Helpers/Microsoft.Web.Http.Data.Helpers.csproj
+++ b/src/Microsoft.Web.Http.Data.Helpers/Microsoft.Web.Http.Data.Helpers.csproj
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/src/Microsoft.Web.Http.Data.Helpers/packages.config b/src/Microsoft.Web.Http.Data.Helpers/packages.config
index 5ae3860c..b09772da 100644
--- a/src/Microsoft.Web.Http.Data.Helpers/packages.config
+++ b/src/Microsoft.Web.Http.Data.Helpers/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.6" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/Microsoft.Web.Http.Data/Microsoft.Web.Http.Data.csproj b/src/Microsoft.Web.Http.Data/Microsoft.Web.Http.Data.csproj
index 66c32ac6..545c4760 100644
--- a/src/Microsoft.Web.Http.Data/Microsoft.Web.Http.Data.csproj
+++ b/src/Microsoft.Web.Http.Data/Microsoft.Web.Http.Data.csproj
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/src/Microsoft.Web.Http.Data/packages.config b/src/Microsoft.Web.Http.Data/packages.config
index 5ae3860c..b09772da 100644
--- a/src/Microsoft.Web.Http.Data/packages.config
+++ b/src/Microsoft.Web.Http.Data/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.6" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/System.Net.Http.Formatting.NetCore/System.Net.Http.Formatting.NetCore.csproj b/src/System.Net.Http.Formatting.NetCore/System.Net.Http.Formatting.NetCore.csproj
index 84512eb9..ff96f336 100644
--- a/src/System.Net.Http.Formatting.NetCore/System.Net.Http.Formatting.NetCore.csproj
+++ b/src/System.Net.Http.Formatting.NetCore/System.Net.Http.Formatting.NetCore.csproj
@@ -241,8 +241,8 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\winrt45\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj b/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
index 8b80341f..ca8c2c20 100644
--- a/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
+++ b/src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/src/System.Net.Http.Formatting/packages.config b/src/System.Net.Http.Formatting/packages.config
index e799f5ba..7551e42e 100644
--- a/src/System.Net.Http.Formatting/packages.config
+++ b/src/System.Net.Http.Formatting/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40-Client" />
-  <package id="Newtonsoft.Json" version="4.5.6" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/System.Web.Http.OData/packages.config b/src/System.Web.Http.OData/packages.config
index 23d9aa3a..635c9c66 100644
--- a/src/System.Web.Http.OData/packages.config
+++ b/src/System.Web.Http.OData/packages.config
@@ -6,6 +6,6 @@
   <package id="Microsoft.Data.OData" version="5.1.0-rc2" />
   <package id="Microsoft.Data.OData.Contrib" version="5.1.0.51016-rc2" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" />
-  <package id="Newtonsoft.Json" version="4.5.6" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
   <package id="System.Spatial" version="5.1.0-rc2" />
 </packages>
\ No newline at end of file
diff --git a/src/System.Web.Http.SignalR/System.Web.Http.SignalR.csproj b/src/System.Web.Http.SignalR/System.Web.Http.SignalR.csproj
index 96d6b2f8..e346280a 100644
--- a/src/System.Web.Http.SignalR/System.Web.Http.SignalR.csproj
+++ b/src/System.Web.Http.SignalR/System.Web.Http.SignalR.csproj
@@ -39,8 +39,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SignalR">
       <HintPath>..\..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
diff --git a/src/System.Web.Http.SignalR/packages.config b/src/System.Web.Http.SignalR/packages.config
index b54b67d9..b6a96e08 100644
--- a/src/System.Web.Http.SignalR/packages.config
+++ b/src/System.Web.Http.SignalR/packages.config
@@ -3,7 +3,7 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
   <package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net40" />
   <package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/System.Web.Http.Tracing/System.Web.Http.Tracing.csproj b/src/System.Web.Http.Tracing/System.Web.Http.Tracing.csproj
index 382525d3..cf411ac4 100644
--- a/src/System.Web.Http.Tracing/System.Web.Http.Tracing.csproj
+++ b/src/System.Web.Http.Tracing/System.Web.Http.Tracing.csproj
@@ -45,8 +45,8 @@
     <CodeAnalysisRuleSet>..\Strict.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.7\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/System.Web.Http.Tracing/packages.config b/src/System.Web.Http.Tracing/packages.config
index 91fe83b7..6c475015 100644
--- a/src/System.Web.Http.Tracing/packages.config
+++ b/src/System.Web.Http.Tracing/packages.config
@@ -3,5 +3,5 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/System.Web.Http/System.Web.Http.csproj b/src/System.Web.Http/System.Web.Http.csproj
index dcb1fb88..4d96aae7 100644
--- a/src/System.Web.Http/System.Web.Http.csproj
+++ b/src/System.Web.Http/System.Web.Http.csproj
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
diff --git a/src/System.Web.Http/packages.config b/src/System.Web.Http/packages.config
index 766f4da7..0e2b1682 100644
--- a/src/System.Web.Http/packages.config
+++ b/src/System.Web.Http/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40-Client" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
-  <package id="Newtonsoft.Json" version="4.5.6" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/WebApiHelpPage/WebApiHelpPage.csproj b/src/WebApiHelpPage/WebApiHelpPage.csproj
index d5a5500c..2e7f9668 100644
--- a/src/WebApiHelpPage/WebApiHelpPage.csproj
+++ b/src/WebApiHelpPage/WebApiHelpPage.csproj
@@ -52,7 +52,7 @@
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/WebApiHelpPage/packages.config b/src/WebApiHelpPage/packages.config
index 530f8909..a1ac6133 100644
--- a/src/WebApiHelpPage/packages.config
+++ b/src/WebApiHelpPage/packages.config
@@ -8,5 +8,5 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
 </packages>
\ No newline at end of file