Skip to content

Commit e829e93

Browse files
committed
Merge pull request #1465 from elastic/fix/update-jsonnet
Upgrade to Json.NET 7.0.1
2 parents 8879ad1 + f98e3db commit e829e93

File tree

39 files changed

+3350
-9471
lines changed

39 files changed

+3350
-9471
lines changed

build/Elasticsearch.Net.JsonNET.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>This package is only useful if you use the low level client ONLY and do not use NEST but would like to use JSON.NET as your serializer</description>
1515
<dependencies>
1616
<dependency id="Elasticsearch.Net" version="1.6.0"/>
17-
<dependency id="Newtonsoft.Json" version="6.0.1"/>
17+
<dependency id="Newtonsoft.Json" version="[6,8)"/>
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>
2020
</metadata>

build/NEST.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
1515
<dependencies>
1616
<dependency id="Elasticsearch.Net" version="1.6.0"/>
17-
<dependency id="Newtonsoft.Json" version="6.0.1" />
17+
<dependency id="Newtonsoft.Json" version="[6,8)" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>
2020
</metadata>

packages/Newtonsoft.Json/Newtonsoft.Json.nuspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Newtonsoft.Json</id>
5-
<version>6.0.1</version>
5+
<version>7.0.1</version>
66
<title>Json.NET</title>
77
<authors>James Newton-King</authors>
88
<owners>James Newton-King</owners>
99
<licenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md</licenseUrl>
10-
<projectUrl>http://james.newtonking.com/json</projectUrl>
10+
<projectUrl>http://www.newtonsoft.com/json</projectUrl>
11+
<iconUrl>http://www.newtonsoft.com/content/images/nugeticon.png</iconUrl>
1112
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1213
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
1314
<language>en-US</language>

packages/Newtonsoft.Json/_rels/.rels

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?xml version="1.0" encoding="utf-8"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Type="http://schemas.microsoft.com/packaging/2010/07/manifest" Target="/Newtonsoft.Json.nuspec" Id="R23565222d26a441c" /><Relationship Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="/package/services/metadata/core-properties/99eff53638824ff6b33a057ea7e66469.psmdcp" Id="Ra36dedf0c7704e3d" /></Relationships>
1+
<?xml version="1.0" encoding="utf-8"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Type="http://schemas.microsoft.com/packaging/2010/07/manifest" Target="/Newtonsoft.Json.nuspec" Id="R8dca86d23f7e4090" /><Relationship Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="/package/services/metadata/core-properties/49e907fc018c4c7ab632e6d4ad4766f8.psmdcp" Id="Ra94cb890213f42d5" /></Relationships>
Binary file not shown.

packages/Newtonsoft.Json/lib/net20/Newtonsoft.Json.xml

Lines changed: 528 additions & 143 deletions
Large diffs are not rendered by default.
Binary file not shown.

packages/Newtonsoft.Json/lib/net35/Newtonsoft.Json.xml

Lines changed: 528 additions & 143 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

packages/Newtonsoft.Json/lib/net40/Newtonsoft.Json.xml

Lines changed: 532 additions & 115 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)