Skip to content

Commit 17799b3

Browse files
jimevansjimevans
committed
Updating Json.NET version to 6.0.2
1 parent eaf22a4 commit 17799b3

13 files changed

+1838
-736
lines changed

Diff for: ‎dotnet/src/webdriver/WebDriver.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</Reference>
6767
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\..\..\third_party\dotnet\json-net-4.5r11\Net40\Newtonsoft.Json.dll</HintPath>
69+
<HintPath>..\..\..\third_party\dotnet\json-net-6.0r2\Net40\Newtonsoft.Json.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System" />
7272
<Reference Include="System.Core">

Diff for: ‎dotnet/src/webdriver/build.desc

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dotnet_library(name = "webdriver",
88
"System.Xml.dll"
99
],
1010
merge_refs = [
11-
"third_party/dotnet/json-net-4.5r11/net40/Newtonsoft.Json.dll",
11+
"third_party/dotnet/json-net-6.0r2/net40/Newtonsoft.Json.dll",
1212
"third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
1313
],
1414
resources = [
@@ -32,7 +32,7 @@ dotnet_library(name = "webdriver35",
3232
"System.Xml.dll"
3333
],
3434
merge_refs = [
35-
"third_party/dotnet/json-net-4.5r11/net35/Newtonsoft.Json.dll",
35+
"third_party/dotnet/json-net-6.0r2/net35/Newtonsoft.Json.dll",
3636
"third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
3737
],
3838
resources = [
@@ -56,7 +56,7 @@ dotnet_library(name = "strongnamed",
5656
"System.Xml.dll"
5757
],
5858
merge_refs = [
59-
"third_party/dotnet/json-net-4.5r11/net40/Newtonsoft.Json.dll",
59+
"third_party/dotnet/json-net-6.0r2/net40/Newtonsoft.Json.dll",
6060
"third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
6161
],
6262
resources = [
@@ -81,7 +81,7 @@ dotnet_library(name = "strongnamed35",
8181
"System.Xml.dll"
8282
],
8383
merge_refs = [
84-
"third_party/dotnet/json-net-4.5r11/net35/Newtonsoft.Json.dll",
84+
"third_party/dotnet/json-net-6.0r2/net35/Newtonsoft.Json.dll",
8585
"third_party/dotnet/dotnetzip-1.9/Ionic.Zip.dll"
8686
],
8787
resources = [

Diff for: ‎dotnet/test/phantomjs/WebDriver.PhantomJS.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ItemGroup>
3838
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3939
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>..\..\..\third_party\dotnet\json-net-4.5r11\Net40\Newtonsoft.Json.dll</HintPath>
40+
<HintPath>..\..\..\third_party\dotnet\json-net-6.0r2\Net40\Newtonsoft.Json.dll</HintPath>
4141
</Reference>
4242
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>

Diff for: ‎third_party/dotnet/json-net-4.5r11/Net35/Newtonsoft.Json.dll

-358 KB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-4.5r11/Net35/Newtonsoft.Json.pdb

-1.05 MB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-4.5r11/Net40/Newtonsoft.Json.dll

-383 KB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-4.5r11/Net40/Newtonsoft.Json.pdb

-1.01 MB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-6.0r2/Net35/Newtonsoft.Json.dll

416 KB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-6.0r2/Net35/Newtonsoft.Json.pdb

1.25 MB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-4.5r11/Net40/Newtonsoft.Json.xml renamed to ‎third_party/dotnet/json-net-6.0r2/Net35/Newtonsoft.Json.xml

+746-454
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎third_party/dotnet/json-net-6.0r2/Net40/Newtonsoft.Json.dll

471 KB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-6.0r2/Net40/Newtonsoft.Json.pdb

1.25 MB
Binary file not shown.

Diff for: ‎third_party/dotnet/json-net-4.5r11/Net35/Newtonsoft.Json.xml renamed to ‎third_party/dotnet/json-net-6.0r2/Net40/Newtonsoft.Json.xml

+1,086-276
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)