Skip to content

Commit 578d2d2

Browse files
committed
Fix #3115 bump json.net to version 11 (#3127)
* bump json.net to version 11 * also bump DocGenerator Conflicts: src/CodeGeneration/DocGenerator/DocGenerator.csproj
1 parent 9740913 commit 578d2d2

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

build/NEST.JsonNetSerializer.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<group targetFramework=".NETStandard1.3">
2828
<dependency id="NETStandard.Library" version="[1.6.0, )" />
2929
<dependency id="NEST" version="[$version$, $nextMajorVersion$)" />
30-
<dependency id="Newtonsoft.Json" version="[$jsonDotNetCurrentVersion$, $jsonDotNetNextVersion$)" />
30+
<dependency id="Newtonsoft.Json" version="$jsonDotNetCurrentVersion$" />
3131
</group>
3232
</dependencies>
3333
</metadata>

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<VersionSuffix>alpha</VersionSuffix>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
10+
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
1111
<PackageReference Include="RazorMachine" Version="2.6.1" />
1212
<!-- TODO the following packages prevent us to jump to netcoreapp1.0 -->
1313
<PackageReference Include="CsQuery" Version="1.3.4" />

src/CodeGeneration/DocGenerator/DocGenerator.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<!-- TODO could be netcoreapp1.0 but we have 3 compiler issues,
@@ -22,7 +22,7 @@
2222
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
2323
<PackageReference Include="NuDoq" Version="1.2.5" />
2424
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
25-
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
25+
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
2626
</ItemGroup>
2727
<Import Project="..\..\outputpath.props" />
28-
</Project>
28+
</Project>

src/Nest/Nest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj" />
11-
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
11+
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
1212
</ItemGroup>
1313
<ItemGroup Condition="'$(TargetFramework)'!='netstandard1.3'">
1414
<Reference Include="System.ServiceModel" />

src/Serializers/Nest.JsonNetSerializer/Nest.JsonNetSerializer.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\..\Nest\Nest.csproj" />
16-
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
16+
</ItemGroup>
17+
<ItemGroup>
18+
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
1719
</ItemGroup>
1820
<Import Project="..\..\outputpath.props" />
1921
</Project>

0 commit comments

Comments
 (0)