Skip to content

Commit 815c8ef

Browse files
MpdreamzMpdreamz
authored
Feature/json net 10 master (elastic#2713)
* Moved to Json.NET 10.0.1 and moved System refs over to 4.3.0 (as dictated by Json.NET) * Made sure the nuspec files list 4.3.0 or up for system refs, also moved test project system refs over to 4.3.0
1 parent e06e932 commit 815c8ef

File tree

11 files changed

+1617
-78
lines changed

11 files changed

+1617
-78
lines changed

Diff for: ‎build/Elasticsearch.Net.nuspec

+7-7
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>
@@ -45,4 +45,4 @@
4545
<file src="output\netstandard1.3\Elasticsearch.Net\Elasticsearch.Net.pdb.srcsrv" target="lib\netstandard1.3"/>
4646
<file src="output\netstandard1.3\Elasticsearch.Net\Elasticsearch.Net.xml" target="lib\netstandard1.3"/>
4747
</files>
48-
</package>
48+
</package>

Diff for: ‎build/NEST.nuspec

+6-6
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>
@@ -50,4 +50,4 @@
5050
<file src="output\netstandard1.3\Nest\Nest.pdb.srcsrv" target="lib\netstandard1.3"/>
5151
<file src="output\netstandard1.3\Nest\Nest.xml" target="lib\netstandard1.3"/>
5252
</files>
53-
</package>
53+
</package>

Diff for: ‎docs/search/returned-fields.asciidoc

-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ var searchResponse = client.Search<Project>(s => s
111111
);
112112
----
113113
<1> **Include** the following fields
114-
115114
<2> **Exclude** the following fields
116-
117115
<3> Fields can be included or excluded through patterns
118116

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

Diff for: ‎paket.lock

+37-27
Original file line numberDiff line numberDiff line change
@@ -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
@@ -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

0 commit comments

Comments
 (0)