Skip to content

Commit a7090a8

Browse files
gmarzgmarz
committed
Support both Json.NET versions 7 and 8
1 parent c1c48bd commit a7090a8

File tree

6 files changed

+100
-34
lines changed

6 files changed

+100
-34
lines changed

Diff for: ‎build/NEST.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>Strongly typed interface to Elasticsearch. Fluent and classic object initializer mappings of requests and responses. Uses and exposes Elasticsearch.Net</description>
1515
<dependencies>
1616
<dependency id="Elasticsearch.Net" version="2.0.0-alpha1"/>
17-
<dependency id="Newtonsoft.Json" version="[7,8)" />
17+
<dependency id="Newtonsoft.Json" version="[7,9)" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>
2020
</metadata>

Diff for: ‎paket.dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ nuget RazorMachine 2.6.1
1111
//tests
1212
nuget xunit
1313
nuget FluentAssertions
14-
nuget Bogus
14+
nuget Bogus prerelease
1515
nuget DiffPlex
1616

1717
// profiling / benchmarking

Diff for: ‎paket.lock

+57-25
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
NUGET
22
remote: https://www.nuget.org/api/v2
33
specs:
4-
Bogus (3.0.0.3)
5-
Newtonsoft.Json (>= 7.0 < 8.0) - framework: >= net40
4+
Bogus (3.0.5-beta-2)
5+
Newtonsoft.Json (>= 8.0.2) - framework: >= net40, dnx451, dnxcore50
6+
System.ComponentModel (>= 4.0.1-beta-23516) - framework: dnxcore50
7+
System.Dynamic.Runtime (>= 4.0.11-beta-23516) - framework: dnxcore50
8+
System.IO (>= 4.0.11-beta-23516) - framework: dnxcore50
9+
System.Reflection.Extensions (>= 4.0.1-beta-23516) - framework: dnxcore50
10+
System.Reflection.TypeExtensions (>= 4.0.1-beta-23409) - framework: dnxcore50
11+
System.Text.Encoding (>= 4.0.11-beta-23516) - framework: dnxcore50
12+
System.Text.RegularExpressions (>= 4.0.11-beta-23516) - framework: dnxcore50
613
CsQuery (1.3.4)
714
DiffPlex (1.2.1)
8-
FluentAssertions (4.0.0)
15+
FluentAssertions (4.2.1)
916
System.Collections (>= 4.0.10) - framework: dnxcore50
1017
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
1118
System.Globalization (>= 4.0.10) - framework: dnxcore50
@@ -25,15 +32,15 @@ NUGET
2532
Humanizer (1.37.7)
2633
JetBrains.Profiler.Kernel.Windows.Api (104.0.20151218.125646)
2734
Wave (4.0.0)
28-
Microsoft.CodeAnalysis.Analyzers (1.0.0)
29-
Microsoft.CodeAnalysis.Common (1.0.0)
30-
Microsoft.CodeAnalysis.Analyzers (1.0.0)
31-
System.Collections.Immutable (>= 1.1.36)
32-
System.Reflection.Metadata (>= 1.0.21)
33-
Microsoft.CodeAnalysis.CSharp (1.0.0)
34-
Microsoft.CodeAnalysis.Common (1.0.0)
35+
Microsoft.CodeAnalysis.Analyzers (1.1.0)
36+
Microsoft.CodeAnalysis.Common (1.1.1)
37+
Microsoft.CodeAnalysis.Analyzers (>= 1.1.0)
38+
System.Collections.Immutable (>= 1.1.37)
39+
System.Reflection.Metadata (>= 1.1.0)
40+
Microsoft.CodeAnalysis.CSharp (1.1.1)
41+
Microsoft.CodeAnalysis.Common (1.1.1)
3542
NDesk.Options (0.2.1)
36-
Newtonsoft.Json (7.0.1)
43+
Newtonsoft.Json (8.0.2)
3744
RazorMachine (2.6.1)
3845
Rx-Core (2.2.5)
3946
Rx-Interfaces (>= 2.2.5)
@@ -66,14 +73,38 @@ NUGET
6673
System.Runtime (>= 4.0.0) - framework: dnxcore50
6774
System.Runtime.Extensions (>= 4.0.0) - framework: dnxcore50
6875
System.Threading (>= 4.0.0) - framework: dnxcore50
76+
System.ComponentModel (4.0.1-beta-23516) - framework: dnxcore50
77+
System.Runtime (>= 4.0.0) - framework: dnxcore50
78+
System.Runtime (>= 4.0.20) - framework: dnxcore50
6979
System.Diagnostics.Contracts (4.0.0) - framework: dnxcore50
7080
System.Runtime (>= 4.0.0) - framework: dnxcore50
7181
System.Diagnostics.Debug (4.0.10) - framework: dnxcore50
7282
System.Runtime (>= 4.0.0) - framework: dnxcore50
83+
System.Dynamic.Runtime (4.0.11-beta-23516) - framework: dnxcore50
84+
System.Collections (>= 4.0.10) - framework: dnxcore50
85+
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
86+
System.Globalization (>= 4.0.10) - framework: dnxcore50
87+
System.Linq (>= 4.0.0) - framework: dnxcore50
88+
System.Linq.Expressions (>= 4.0.0) - framework: dnxcore50
89+
System.Linq.Expressions (>= 4.0.10) - framework: dnxcore50
90+
System.ObjectModel (>= 4.0.0) - framework: dnxcore50
91+
System.ObjectModel (>= 4.0.10) - framework: dnxcore50
92+
System.Reflection (>= 4.0.0) - framework: dnxcore50
93+
System.Reflection (>= 4.0.10) - framework: dnxcore50
94+
System.Reflection.Emit (>= 4.0.0) - framework: dnxcore50
95+
System.Reflection.Emit.ILGeneration (>= 4.0.0) - framework: dnxcore50
96+
System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
97+
System.Reflection.TypeExtensions (>= 4.0.0) - framework: dnxcore50
98+
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
99+
System.Runtime (>= 4.0.0) - framework: dnxcore50
100+
System.Runtime (>= 4.0.20) - framework: dnxcore50
101+
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
102+
System.Threading (>= 4.0.10) - framework: dnxcore50
73103
System.Globalization (4.0.10) - framework: dnxcore50
74104
System.Runtime (>= 4.0.0) - framework: dnxcore50
75-
System.IO (4.0.10) - framework: dnxcore50
105+
System.IO (4.0.11-beta-23516) - framework: dnxcore50
76106
System.Globalization (>= 4.0.0) - framework: dnxcore50
107+
System.Runtime (>= 4.0.0) - framework: dnxcore50
77108
System.Runtime (>= 4.0.20) - framework: dnxcore50
78109
System.Text.Encoding (>= 4.0.0) - framework: dnxcore50
79110
System.Text.Encoding (>= 4.0.10) - framework: dnxcore50
@@ -146,17 +177,17 @@ NUGET
146177
System.Reflection (>= 4.0.0) - framework: dnxcore50
147178
System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
148179
System.Runtime (>= 4.0.0) - framework: dnxcore50
149-
System.Reflection.Extensions (4.0.0) - framework: dnxcore50
180+
System.Reflection.Extensions (4.0.1-beta-23516) - framework: dnxcore50
150181
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
151182
System.Reflection (>= 4.0.0) - framework: dnxcore50
152183
System.Reflection (>= 4.0.10) - framework: dnxcore50
153184
System.Reflection.Primitives (>= 4.0.0) - framework: dnxcore50
154-
System.Reflection.TypeExtensions (>= 4.0.0) - framework: dnxcore50
185+
System.Reflection.TypeExtensions (>= 4.1.0-beta-23516) - framework: dnxcore50
155186
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
156187
System.Runtime (>= 4.0.0) - framework: dnxcore50
157188
System.Runtime (>= 4.0.20) - framework: dnxcore50
158189
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
159-
System.Reflection.Metadata (1.0.22)
190+
System.Reflection.Metadata (1.1.0)
160191
System.Collections (>= 4.0.0) - framework: dnxcore50
161192
System.Collections.Immutable (>= 1.1.37) - framework: dnxcore50, portable-net45+win80
162193
System.Diagnostics.Debug (>= 4.0.0) - framework: dnxcore50
@@ -174,7 +205,7 @@ NUGET
174205
System.Reflection.Primitives (4.0.0) - framework: dnxcore50
175206
System.Runtime (>= 4.0.0) - framework: dnxcore50
176207
System.Threading (>= 4.0.0) - framework: dnxcore50
177-
System.Reflection.TypeExtensions (4.0.0) - framework: dnxcore50
208+
System.Reflection.TypeExtensions (4.1.0-beta-23516) - framework: dnxcore50
178209
System.Diagnostics.Contracts (>= 4.0.0) - framework: dnxcore50
179210
System.Diagnostics.Debug (>= 4.0.10) - framework: dnxcore50
180211
System.Linq (>= 4.0.0) - framework: dnxcore50
@@ -216,15 +247,16 @@ NUGET
216247
System.Threading (>= 4.0.10) - framework: dnxcore50
217248
System.Threading.Tasks (>= 4.0.0) - framework: dnxcore50
218249
System.Threading.Tasks (>= 4.0.10) - framework: dnxcore50
219-
System.Text.Encoding (4.0.10) - framework: dnxcore50
250+
System.Text.Encoding (4.0.11-beta-23516) - framework: dnxcore50
220251
System.Runtime (>= 4.0.0) - framework: dnxcore50
221252
System.Text.Encoding.Extensions (4.0.10) - framework: dnxcore50
222253
System.Runtime (>= 4.0.0) - framework: dnxcore50
223254
System.Text.Encoding (>= 4.0.10) - framework: dnxcore50
224-
System.Text.RegularExpressions (4.0.10) - framework: dnxcore50
255+
System.Text.RegularExpressions (4.0.11-beta-23516) - framework: dnxcore50
225256
System.Collections (>= 4.0.10) - framework: dnxcore50
226257
System.Globalization (>= 4.0.10) - framework: dnxcore50
227258
System.Resources.ResourceManager (>= 4.0.0) - framework: dnxcore50
259+
System.Runtime (>= 4.0.0) - framework: dnxcore50
228260
System.Runtime (>= 4.0.20) - framework: dnxcore50
229261
System.Runtime.Extensions (>= 4.0.10) - framework: dnxcore50
230262
System.Threading (>= 4.0.10) - framework: dnxcore50
@@ -321,15 +353,15 @@ GROUP build
321353
NUGET
322354
remote: https://www.nuget.org/api/v2
323355
specs:
324-
FAKE (4.5.6)
356+
FAKE (4.14.5)
325357
FSharp.Data (2.2.5)
326358
Zlib.Portable (>= 1.10.0) - framework: portable-net40+sl50+wp80+win80
327359
gitlink (2.2.0)
328-
Node.js (4.0.0)
329-
NoGit (0.0.9)
330-
Node.js (>= 0.10.26.1)
331-
Npm (1.4.15.2)
332-
Node.js (>= 0.10.26.1)
333-
NoGit (>= 0.0.8)
360+
Node.js (5.3.0)
361+
NoGit (0.1.0)
362+
Node.js (>= 0.12.0)
363+
Npm (3.5.2)
364+
Node.js (>= 0.12.7)
365+
NoGit (>= 0.1.0)
334366
xunit.runner.console (2.1.0)
335367
Zlib.Portable (1.11.0) - framework: portable-net40+sl50+wp80+win80

Diff for: ‎src/Performance/Profiling/Async/AnalyzeAsyncOperation.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public override async Task ProfileAsync(IElasticClient client, ColoredConsoleWri
2626
{
2727
var analyzeResponse = await client.AnalyzeAsync(a => a
2828
.Analyzer("standard")
29-
.Text(_sentenceGenerator.Sentance())
29+
.Text(_sentenceGenerator.Sentence())
3030
).ConfigureAwait(false);
3131

3232
if (!analyzeResponse.IsValid)

Diff for: ‎src/Performance/Profiling/Profiling.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@
198198
<Private>True</Private>
199199
<Paket>True</Paket>
200200
</Reference>
201+
<Reference Include="mscorlib">
202+
<Paket>True</Paket>
203+
</Reference>
201204
</ItemGroup>
202205
</When>
203206
</Choose>

Diff for: ‎src/Tests/Tests.csproj

+37-6
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,9 @@
555555
<Private>True</Private>
556556
<Paket>True</Paket>
557557
</Reference>
558+
<Reference Include="mscorlib">
559+
<Paket>True</Paket>
560+
</Reference>
558561
</ItemGroup>
559562
</When>
560563
</Choose>
@@ -570,6 +573,20 @@
570573
</When>
571574
</Choose>
572575
<Choose>
576+
<When Condition="$(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v4.5.1'">
577+
<ItemGroup>
578+
<Reference Include="FluentAssertions.Core">
579+
<HintPath>..\..\packages\FluentAssertions\lib\win81\FluentAssertions.Core.dll</HintPath>
580+
<Private>True</Private>
581+
<Paket>True</Paket>
582+
</Reference>
583+
<Reference Include="FluentAssertions">
584+
<HintPath>..\..\packages\FluentAssertions\lib\win81\FluentAssertions.dll</HintPath>
585+
<Private>True</Private>
586+
<Paket>True</Paket>
587+
</Reference>
588+
</ItemGroup>
589+
</When>
573590
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0')">
574591
<ItemGroup>
575592
<Reference Include="FluentAssertions.Core">
@@ -649,6 +666,20 @@
649666
</Reference>
650667
</ItemGroup>
651668
</When>
669+
<When Condition="$(TargetFrameworkIdentifier) == 'WindowsPhoneApp'">
670+
<ItemGroup>
671+
<Reference Include="FluentAssertions.Core">
672+
<HintPath>..\..\packages\FluentAssertions\lib\wpa81\FluentAssertions.Core.dll</HintPath>
673+
<Private>True</Private>
674+
<Paket>True</Paket>
675+
</Reference>
676+
<Reference Include="FluentAssertions">
677+
<HintPath>..\..\packages\FluentAssertions\lib\wpa81\FluentAssertions.dll</HintPath>
678+
<Private>True</Private>
679+
<Paket>True</Paket>
680+
</Reference>
681+
</ItemGroup>
682+
</When>
652683
<When Condition="$(TargetFrameworkIdentifier) == 'Xamarin.iOS'">
653684
<ItemGroup>
654685
<Reference Include="FluentAssertions.Core">
@@ -658,29 +689,29 @@
658689
</Reference>
659690
</ItemGroup>
660691
</When>
661-
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v4.5') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile259') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
692+
<When Condition="$(TargetFrameworkProfile) == 'Profile32'">
662693
<ItemGroup>
663694
<Reference Include="FluentAssertions.Core">
664-
<HintPath>..\..\packages\FluentAssertions\lib\portable-net40+sl5+win8+wp8+wpa81\FluentAssertions.Core.dll</HintPath>
695+
<HintPath>..\..\packages\FluentAssertions\lib\portable-win81+wpa81\FluentAssertions.Core.dll</HintPath>
665696
<Private>True</Private>
666697
<Paket>True</Paket>
667698
</Reference>
668699
<Reference Include="FluentAssertions">
669-
<HintPath>..\..\packages\FluentAssertions\lib\portable-net40+sl5+win8+wp8+wpa81\FluentAssertions.dll</HintPath>
700+
<HintPath>..\..\packages\FluentAssertions\lib\portable-win81+wpa81\FluentAssertions.dll</HintPath>
670701
<Private>True</Private>
671702
<Paket>True</Paket>
672703
</Reference>
673704
</ItemGroup>
674705
</When>
675-
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v4.5.1') Or ($(TargetFrameworkProfile) == 'Profile32')">
706+
<When Condition="($(TargetFrameworkIdentifier) == '.NETCore' And $(TargetFrameworkVersion) == 'v4.5') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile259') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
676707
<ItemGroup>
677708
<Reference Include="FluentAssertions.Core">
678-
<HintPath>..\..\packages\FluentAssertions\lib\portable-win81+wpa81\FluentAssertions.Core.dll</HintPath>
709+
<HintPath>..\..\packages\FluentAssertions\lib\portable-net40+sl5+win8+wp8+wpa81\FluentAssertions.Core.dll</HintPath>
679710
<Private>True</Private>
680711
<Paket>True</Paket>
681712
</Reference>
682713
<Reference Include="FluentAssertions">
683-
<HintPath>..\..\packages\FluentAssertions\lib\portable-win81+wpa81\FluentAssertions.dll</HintPath>
714+
<HintPath>..\..\packages\FluentAssertions\lib\portable-net40+sl5+win8+wp8+wpa81\FluentAssertions.dll</HintPath>
684715
<Private>True</Private>
685716
<Paket>True</Paket>
686717
</Reference>

0 commit comments

Comments
 (0)