Updating Json.NET version to 6.0.2

amuraco · Apr 8, 2014 · 17799b3 · 17799b3
1 parent eaf22a4
commit 17799b3
Show file tree

Hide file tree

Showing 13 changed files with 1,838 additions and 736 deletions.
diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/WebDriver.csproj
@@ -66,7 +66,7 @@
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\json-net-4.5r11\Net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\json-net-6.0r2\Net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/dotnet/src/webdriver/build.desc b/dotnet/src/webdriver/build.desc
@@ -8,7 +8,7 @@ dotnet_library(name = "webdriver",
     "System.Xml.dll"
   ],
   merge_refs = [
-    "third_party/dotnet/json-net-4.5r11/net40/Newtonsoft.Json.dll",
+    "third_party/dotnet/json-net-6.0r2/net40/Newtonsoft.Json.dll",
     "third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
   ],
   resources = [
@@ -32,7 +32,7 @@ dotnet_library(name = "webdriver35",
     "System.Xml.dll"
   ],
   merge_refs = [
-    "third_party/dotnet/json-net-4.5r11/net35/Newtonsoft.Json.dll",
+    "third_party/dotnet/json-net-6.0r2/net35/Newtonsoft.Json.dll",
     "third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
   ],
   resources = [
@@ -56,7 +56,7 @@ dotnet_library(name = "strongnamed",
     "System.Xml.dll"
   ],
   merge_refs = [
-    "third_party/dotnet/json-net-4.5r11/net40/Newtonsoft.Json.dll",
+    "third_party/dotnet/json-net-6.0r2/net40/Newtonsoft.Json.dll",
     "third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
   ],
   resources = [
@@ -81,7 +81,7 @@ dotnet_library(name = "strongnamed35",
     "System.Xml.dll"
   ],
   merge_refs = [
-    "third_party/dotnet/json-net-4.5r11/net35/Newtonsoft.Json.dll",
+    "third_party/dotnet/json-net-6.0r2/net35/Newtonsoft.Json.dll",
     "third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
   ],
   resources = [

diff --git a/dotnet/test/phantomjs/WebDriver.PhantomJS.Tests.csproj b/dotnet/test/phantomjs/WebDriver.PhantomJS.Tests.csproj
@@ -37,7 +37,7 @@
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\third_party\dotnet\json-net-4.5r11\Net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\third_party\dotnet\json-net-6.0r2\Net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/third_party/dotnet/json-net-4.5r11/Net35/Newtonsoft.Json.dll b/third_party/dotnet/json-net-4.5r11/Net35/Newtonsoft.Json.dll
diff --git a/third_party/dotnet/json-net-4.5r11/Net35/Newtonsoft.Json.pdb b/third_party/dotnet/json-net-4.5r11/Net35/Newtonsoft.Json.pdb
diff --git a/third_party/dotnet/json-net-4.5r11/Net40/Newtonsoft.Json.dll b/third_party/dotnet/json-net-4.5r11/Net40/Newtonsoft.Json.dll
diff --git a/third_party/dotnet/json-net-4.5r11/Net40/Newtonsoft.Json.pdb b/third_party/dotnet/json-net-4.5r11/Net40/Newtonsoft.Json.pdb
diff --git a/third_party/dotnet/json-net-6.0r2/Net35/Newtonsoft.Json.dll b/third_party/dotnet/json-net-6.0r2/Net35/Newtonsoft.Json.dll
diff --git a/third_party/dotnet/json-net-6.0r2/Net35/Newtonsoft.Json.pdb b/third_party/dotnet/json-net-6.0r2/Net35/Newtonsoft.Json.pdb
diff --git a/...json-net-4.5r11/Net40/Newtonsoft.Json.xml → .../json-net-6.0r2/Net35/Newtonsoft.Json.xml b/...json-net-4.5r11/Net40/Newtonsoft.Json.xml → .../json-net-6.0r2/Net35/Newtonsoft.Json.xml
diff --git a/third_party/dotnet/json-net-6.0r2/Net40/Newtonsoft.Json.dll b/third_party/dotnet/json-net-6.0r2/Net40/Newtonsoft.Json.dll
diff --git a/third_party/dotnet/json-net-6.0r2/Net40/Newtonsoft.Json.pdb b/third_party/dotnet/json-net-6.0r2/Net40/Newtonsoft.Json.pdb
diff --git a/...json-net-4.5r11/Net35/Newtonsoft.Json.xml → .../json-net-6.0r2/Net40/Newtonsoft.Json.xml b/...json-net-4.5r11/Net35/Newtonsoft.Json.xml → .../json-net-6.0r2/Net40/Newtonsoft.Json.xml