Skip to content

Commit 9298d53

Browse files
MpdreamzMpdreamz
authored
Moved to json.net 10.0.1 and mvoed system refs over to 4.3.0 as dicta… (#2715)
* Moved to json.net 10.0.1 and mvoed system refs over to 4.3.0 as dictated by json.net * post rebase touchups, DocGenerator changed in 2.x
1 parent 8dc4642 commit 9298d53

File tree

12 files changed

+1605
-100
lines changed

12 files changed

+1605
-100
lines changed

‎build/Elasticsearch.Net.nuspec‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<group targetFramework=".NETFramework4.6" />
2121
<group targetFramework=".NETStandard1.3">
2222
<dependency id="NETStandard.Library" version="[1.6.0, )" />
23-
<dependency id="System.Collections.Specialized" version="[4.0.1, )" />
24-
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
25-
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
26-
<dependency id="System.Dynamic.Runtime" version="[4.0.11, )" />
27-
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
28-
<dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
23+
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
24+
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
25+
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
26+
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
27+
<dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
28+
<dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )" />
2929
</group>
3030
</dependencies>
3131
</metadata>
@@ -44,4 +44,4 @@
4444
<file src="output\netstandard1.3\Elasticsearch.Net\Elasticsearch.Net.pdb" target="lib\netstandard1.3"/>
4545
<file src="output\netstandard1.3\Elasticsearch.Net\Elasticsearch.Net.pdb.srcsrv" target="lib\netstandard1.3"/>
4646
</files>
47-
</package>
47+
</package>

‎build/NEST.nuspec‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
<dependencies>
1919
<group targetFramework=".NETFramework4.5">
2020
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
21-
<dependency id="Newtonsoft.Json" version="[9,10)" />
21+
<dependency id="Newtonsoft.Json" version="[10,11)" />
2222
</group>
2323
<group targetFramework=".NETFramework4.6">
2424
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
25-
<dependency id="Newtonsoft.Json" version="[9,10)" />
25+
<dependency id="Newtonsoft.Json" version="[10,11)" />
2626
</group>
2727
<group targetFramework=".NETStandard1.3">
2828
<dependency id="NETStandard.Library" version="[1.6.0, )" />
29-
<dependency id="System.Collections.Specialized" version="[4.0.1, )" />
30-
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
29+
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
30+
<dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
3131
<dependency id="System.Linq.Queryable" version="[4.0.1, )" />
3232
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
33-
<dependency id="Newtonsoft.Json" version="[9,10)" />
33+
<dependency id="Newtonsoft.Json" version="[10,11)" />
3434
</group>
3535
</dependencies>
3636
</metadata>
@@ -49,4 +49,4 @@
4949
<file src="output\netstandard1.3\Nest\Nest.pdb" target="lib\netstandard1.3"/>
5050
<file src="output\netstandard1.3\Nest\Nest.pdb.srcsrv" target="lib\netstandard1.3"/>
5151
</files>
52-
</package>
52+
</package>

‎docs/client-concepts/high-level/analysis/writing-analyzers.asciidoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ var createIndexResponse = client.CreateIndex("my-index", c => c
102102
);
103103
----
104104
<1> Pre-defined list of English stopwords within Elasticsearch
105-
106105
<2> Use the `standard_english` analyzer configured
107106

108107
[source,javascript]
@@ -268,7 +267,6 @@ var createIndexResponse = client.CreateIndex("questions", c => c
268267
);
269268
----
270269
<1> Use an analyzer at index time that strips HTML tags
271-
272270
<2> Use an analyzer at search time that does not strip HTML tags
273271

274272
With this in place, the text of a question body will be analyzed with the `index_question` analyzer

‎docs/search/returned-fields.asciidoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ var searchResponse = client.Search<Project>(s => s
113113
);
114114
----
115115
<1> **Include** the following fields
116-
117116
<2> **Exclude** the following fields
118-
119117
<3> Fields can be included or excluded through patterns
120118

121119
With source filtering specified on the request, `.Documents` will

‎paket.lock‎

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ NUGET
2525
FluentAssertions (4.19)
2626
NETStandard.Library (>= 1.6) - framework: >= netstandard13
2727
System.Reflection.TypeExtensions (>= 4.1) - framework: >= netstandard13
28-
JetBrains.Profiler.Kernel.Windows.Api (108.0.20170209.151431-eap01)
29-
Wave (8.0.0-eap01)
28+
JetBrains.Profiler.Kernel.Windows.Api (108.0.20170407.123535)
29+
Wave (8.0)
3030
Microsoft.CodeAnalysis.Analyzers (1.1) - framework: >= net45, >= netstandard11, portable-net45+win8
3131
Microsoft.CodeAnalysis.Common (1.3.2)
3232
Microsoft.CodeAnalysis.Analyzers (>= 1.1) - framework: >= net45, >= netstandard11, portable-net45+win8
@@ -79,7 +79,7 @@ NUGET
7979
Microsoft.CodeAnalysis.Common (1.3.2)
8080
Microsoft.Composition (>= 1.0.27)
8181
Microsoft.Composition (1.0.30)
82-
Microsoft.CSharp (4.3) - framework: >= netstandard10
82+
Microsoft.CSharp (4.3) - framework: netstandard10, >= netstandard13
8383
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13
8484
System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13
8585
System.Dynamic.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13
@@ -147,29 +147,13 @@ NUGET
147147
System.Threading.Timer (>= 4.3) - framework: >= net451, >= netstandard12
148148
System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard10
149149
System.Xml.XDocument (>= 4.3) - framework: >= netstandard10
150-
Newtonsoft.Json (9.0.1)
151-
Microsoft.CSharp (>= 4.0.1) - framework: >= netstandard10
152-
System.Collections (>= 4.0.11) - framework: >= netstandard10
153-
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10
154-
System.Dynamic.Runtime (>= 4.0.11) - framework: >= netstandard10
155-
System.Globalization (>= 4.0.11) - framework: >= netstandard10
156-
System.IO (>= 4.1) - framework: >= netstandard10
157-
System.Linq (>= 4.1) - framework: >= netstandard10
158-
System.Linq.Expressions (>= 4.1) - framework: >= netstandard10
159-
System.ObjectModel (>= 4.0.12) - framework: >= netstandard10
160-
System.Reflection (>= 4.1) - framework: >= netstandard10
161-
System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard10
162-
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10
163-
System.Runtime (>= 4.1) - framework: >= netstandard10
164-
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10
165-
System.Runtime.Serialization.Primitives (>= 4.1.1) - framework: >= netstandard10
166-
System.Text.Encoding (>= 4.0.11) - framework: >= netstandard10
167-
System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard10
168-
System.Text.RegularExpressions (>= 4.1) - framework: >= netstandard10
169-
System.Threading (>= 4.0.11) - framework: >= netstandard10
170-
System.Threading.Tasks (>= 4.0.11) - framework: >= netstandard10
171-
System.Xml.ReaderWriter (>= 4.0.11) - framework: >= netstandard10
172-
System.Xml.XDocument (>= 4.0.11) - framework: >= netstandard10
150+
Newtonsoft.Json (10.0.2)
151+
Microsoft.CSharp (>= 4.3) - framework: netstandard10, >= netstandard13
152+
NETStandard.Library (>= 1.6.1) - framework: netstandard10, >= netstandard13
153+
System.ComponentModel.TypeConverter (>= 4.3) - framework: netstandard10, >= netstandard13
154+
System.Runtime.Serialization.Formatters (>= 4.3) - framework: >= netstandard13
155+
System.Runtime.Serialization.Primitives (>= 4.3) - framework: netstandard10, >= netstandard13
156+
System.Xml.XmlDocument (>= 4.3) - framework: >= netstandard13
173157
NuDoq (1.2.5)
174158
RazorMachine (2.6.1)
175159
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: net46, >= net46, >= netstandard13, netstandard14
@@ -255,7 +239,7 @@ NUGET
255239
System.Runtime (>= 4.3) - framework: >= netstandard13
256240
System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13
257241
System.Threading (>= 4.3) - framework: >= netstandard13
258-
System.ComponentModel (4.3) - framework: >= netstandard13
242+
System.ComponentModel (4.3) - framework: netstandard10, >= netstandard13
259243
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13
260244
System.ComponentModel.Annotations (4.3) - framework: >= netstandard13
261245
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard14
@@ -269,6 +253,26 @@ NUGET
269253
System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard14
270254
System.Text.RegularExpressions (>= 4.3) - framework: dnxcore50, >= netstandard14
271255
System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard14
256+
System.ComponentModel.Primitives (4.3) - framework: netstandard10, >= netstandard15
257+
System.ComponentModel (>= 4.3) - framework: >= netstandard10
258+
System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard10
259+
System.Runtime (>= 4.3) - framework: >= netstandard10
260+
System.ComponentModel.TypeConverter (4.3) - framework: netstandard10, >= netstandard13
261+
System.Collections (>= 4.3) - framework: netstandard10, >= netstandard15
262+
System.Collections.NonGeneric (>= 4.3) - framework: >= net462, >= netstandard15
263+
System.Collections.Specialized (>= 4.3) - framework: >= netstandard15
264+
System.ComponentModel (>= 4.3) - framework: netstandard10, >= netstandard15
265+
System.ComponentModel.Primitives (>= 4.3) - framework: net45, >= net462, netstandard10, >= netstandard15, winv4.5, wpv8.0, wpav8.1
266+
System.Globalization (>= 4.3) - framework: netstandard10, >= netstandard15
267+
System.Linq (>= 4.3) - framework: >= netstandard15
268+
System.Reflection (>= 4.3) - framework: netstandard10, >= netstandard15
269+
System.Reflection.Extensions (>= 4.3) - framework: netstandard10, >= netstandard15
270+
System.Reflection.Primitives (>= 4.3) - framework: netstandard10, >= netstandard15
271+
System.Reflection.TypeExtensions (>= 4.3) - framework: >= netstandard15
272+
System.Resources.ResourceManager (>= 4.3) - framework: netstandard10, >= netstandard15
273+
System.Runtime (>= 4.3) - framework: netstandard10, >= netstandard15
274+
System.Runtime.Extensions (>= 4.3) - framework: netstandard10, >= netstandard15
275+
System.Threading (>= 4.3) - framework: netstandard10, >= netstandard15
272276
System.Console (4.3) - framework: >= net46, >= netstandard13
273277
Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13
274278
Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13
@@ -308,7 +312,7 @@ NUGET
308312
Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
309313
Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
310314
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
311-
System.Dynamic.Runtime (4.3) - framework: >= net46, >= netstandard10
315+
System.Dynamic.Runtime (4.3) - framework: >= net46, netstandard10, >= netstandard13
312316
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13
313317
System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13
314318
System.Linq (>= 4.3) - framework: dnxcore50, >= netstandard13
@@ -345,7 +349,7 @@ NUGET
345349
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
346350
System.Text.Encoding (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
347351
System.Threading.Tasks (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard15
348-
System.IO.Compression (4.3) - framework: >= net45, >= netstandard11
352+
System.IO.Compression (4.3) - framework: >= netstandard11
349353
Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13
350354
runtime.native.System (>= 4.3) - framework: >= netstandard13
351355
runtime.native.System.IO.Compression (>= 4.3) - framework: dnxcore50, >= netstandard13
@@ -458,7 +462,7 @@ NUGET
458462
System.Reactive.Windows.Threading (>= 3.1.1) - framework: >= net45, winv4.5.1, wpav8.1
459463
System.Reactive.WindowsRuntime (>= 3.1.1) - framework: winv4.5.1, wpav8.1
460464
System.Reactive.Core (3.1.1) - framework: >= net45, >= netstandard10, winv4.5.1, wpav8.1
461-
System.Reactive.Interfaces (>= 3.1.1) - framework: >= net45, >= netstandard10
465+
System.Reactive.Interfaces (>= 3.1.1) - framework: >= net45, >= netstandard10, netcore10
462466
System.Reactive.Interfaces (3.1.1) - framework: >= net45, >= netstandard10
463467
System.Reactive.Linq (3.1.1)
464468
System.Reactive.Core (>= 3.1.1) - framework: >= net45, >= netstandard10
@@ -538,12 +542,12 @@ NUGET
538542
Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13
539543
System.Runtime (>= 4.3) - framework: >= netstandard13
540544
System.Runtime.InteropServices (4.3) - framework: net46, >= net46, >= netstandard11, netstandard13, netstandard14
541-
Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
542-
Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
543-
System.Reflection (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
544-
System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
545-
System.Runtime (>= 4.3) - framework: net462, >= net463, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
546-
System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15
545+
Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
546+
Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
547+
System.Reflection (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
548+
System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
549+
System.Runtime (>= 4.3) - framework: net462, >= net463, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
550+
System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15, netcore11
547551
System.Runtime.InteropServices.RuntimeInformation (4.3) - framework: >= netstandard11
548552
runtime.native.System (>= 4.3) - framework: >= netstandard11
549553
System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard11
@@ -559,7 +563,13 @@ NUGET
559563
System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13
560564
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13
561565
System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13
562-
System.Runtime.Serialization.Primitives (4.3) - framework: >= netstandard10
566+
System.Runtime.Serialization.Formatters (4.3) - framework: >= netstandard13
567+
System.Collections (>= 4.3) - framework: >= netstandard14
568+
System.Reflection (>= 4.3) - framework: >= netstandard14
569+
System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard14
570+
System.Runtime (>= 4.3) - framework: >= netstandard13
571+
System.Runtime.Serialization.Primitives (>= 4.3) - framework: >= net46, >= netstandard13
572+
System.Runtime.Serialization.Primitives (4.3) - framework: netstandard10, >= netstandard13
563573
System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13
564574
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13
565575
System.Security.Cryptography.Algorithms (4.3) - framework: net46, >= net46, >= netstandard13, netstandard14
@@ -690,7 +700,7 @@ NUGET
690700
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard16
691701
System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard16
692702
System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16
693-
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16
703+
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16, netcore11
694704
System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16
695705
System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16
696706
System.Threading (4.3) - framework: net46, >= net46, >= netstandard10, netstandard13, netstandard14
@@ -779,7 +789,7 @@ NUGET
779789
System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard13
780790
System.Xml.XDocument (>= 4.3) - framework: >= netstandard13
781791
System.Xml.XPath (>= 4.3) - framework: >= net46, >= netstandard13
782-
Wave (7.0)
792+
Wave (8.0)
783793
xunit (2.2.0-beta5-build3474)
784794
xunit.assert (2.2.0-beta5-build3474)
785795
xunit.core (2.2.0-beta5-build3474)
@@ -1235,12 +1245,12 @@ NUGET
12351245
Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13
12361246
System.Runtime (>= 4.3) - framework: >= netstandard13
12371247
System.Runtime.InteropServices (4.3) - framework: net45, net46, >= net46, >= netstandard13, netstandard14
1238-
Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
1239-
Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
1240-
System.Reflection (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
1241-
System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
1242-
System.Runtime (>= 4.3) - framework: net462, >= net463, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15, netcore11
1243-
System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15, netcore11
1248+
Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
1249+
Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
1250+
System.Reflection (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
1251+
System.Reflection.Primitives (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
1252+
System.Runtime (>= 4.3) - framework: net462, >= net463, dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
1253+
System.Runtime.Handles (>= 4.3) - framework: dnxcore50, netstandard13, >= netstandard15
12441254
System.Runtime.InteropServices.RuntimeInformation (4.3) - framework: net45, >= net46, >= netstandard13
12451255
runtime.native.System (>= 4.3) - framework: >= netstandard11
12461256
System.Reflection (>= 4.3) - framework: dnxcore50, >= netstandard11
@@ -1372,7 +1382,7 @@ NUGET
13721382
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard16
13731383
System.Globalization (>= 4.3) - framework: dnxcore50, >= netstandard16
13741384
System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard16
1375-
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16, netcore11
1385+
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, netstandard13, >= netstandard16
13761386
System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard16
13771387
System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard16
13781388
System.Threading (4.3) - framework: net45, net46, >= net46, >= netstandard13, netstandard14

0 commit comments

Comments
 (0)