Skip to content

Commit

Permalink
Feature/json net 10 master (#2713)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@Mpdreamz
Mpdreamz committed Apr 11, 2017
1 parent e06e932 commit 815c8ef
Show file tree
Hide file tree
Showing 11 changed files with 1,617 additions and 78 deletions.
14 changes: 7 additions & 7 deletions build/Elasticsearch.Net.nuspec
View file
Expand Up @@ -20,12 +20,12 @@
<group targetFramework=".NETFramework4.6" />
<group targetFramework=".NETStandard1.3">
<dependency id="NETStandard.Library" version="[1.6.0, )" />
<dependency id="System.Collections.Specialized" version="[4.0.1, )" />
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
<dependency id="System.Dynamic.Runtime" version="[4.0.11, )" />
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
<dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
<dependency id="System.Dynamic.Runtime" version="[4.3.0, )" />
<dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
<dependency id="System.ComponentModel.TypeConverter" version="[4.3.0, )" />
</group>
</dependencies>
</metadata>
Expand All @@ -45,4 +45,4 @@
<file src="output\netstandard1.3\Elasticsearch.Net\Elasticsearch.Net.pdb.srcsrv" target="lib\netstandard1.3"/>
<file src="output\netstandard1.3\Elasticsearch.Net\Elasticsearch.Net.xml" target="lib\netstandard1.3"/>
</files>
</package>
</package>
12 changes: 6 additions & 6 deletions build/NEST.nuspec
View file
Expand Up @@ -18,19 +18,19 @@
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
<dependency id="Newtonsoft.Json" version="[9,10)" />
<dependency id="Newtonsoft.Json" version="[10,11)" />
</group>
<group targetFramework=".NETFramework4.6">
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
<dependency id="Newtonsoft.Json" version="[9,10)" />
<dependency id="Newtonsoft.Json" version="[10,11)" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="NETStandard.Library" version="[1.6.0, )" />
<dependency id="System.Collections.Specialized" version="[4.0.1, )" />
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
<dependency id="System.Collections.Specialized" version="[4.3.0, )" />
<dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
<dependency id="System.Linq.Queryable" version="[4.0.1, )" />
<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
<dependency id="Newtonsoft.Json" version="[9,10)" />
<dependency id="Newtonsoft.Json" version="[10,11)" />
</group>
</dependencies>
</metadata>
Expand All @@ -50,4 +50,4 @@
<file src="output\netstandard1.3\Nest\Nest.pdb.srcsrv" target="lib\netstandard1.3"/>
<file src="output\netstandard1.3\Nest\Nest.xml" target="lib\netstandard1.3"/>
</files>
</package>
</package>
2 changes: 0 additions & 2 deletions docs/search/returned-fields.asciidoc
View file
Expand Up @@ -111,9 +111,7 @@ var searchResponse = client.Search<Project>(s => s
);
----
<1> **Include** the following fields

<2> **Exclude** the following fields

<3> Fields can be included or excluded through patterns

With source filtering specified on the request, `.Documents` will
Expand Down
64 changes: 37 additions & 27 deletions paket.lock
View file
Expand Up @@ -79,7 +79,7 @@ NUGET
Microsoft.CodeAnalysis.Common (1.3.2)
Microsoft.Composition (>= 1.0.27)
Microsoft.Composition (1.0.30)
Microsoft.CSharp (4.3) - framework: >= netstandard10
Microsoft.CSharp (4.3) - framework: netstandard10, >= netstandard13
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13
System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13
System.Dynamic.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13
Expand Down Expand Up @@ -147,29 +147,13 @@ NUGET
System.Threading.Timer (>= 4.3) - framework: >= net451, >= netstandard12
System.Xml.ReaderWriter (>= 4.3) - framework: >= netstandard10
System.Xml.XDocument (>= 4.3) - framework: >= netstandard10
Newtonsoft.Json (9.0.1)
Microsoft.CSharp (>= 4.0.1) - framework: >= netstandard10
System.Collections (>= 4.0.11) - framework: >= netstandard10
System.Diagnostics.Debug (>= 4.0.11) - framework: >= netstandard10
System.Dynamic.Runtime (>= 4.0.11) - framework: >= netstandard10
System.Globalization (>= 4.0.11) - framework: >= netstandard10
System.IO (>= 4.1) - framework: >= netstandard10
System.Linq (>= 4.1) - framework: >= netstandard10
System.Linq.Expressions (>= 4.1) - framework: >= netstandard10
System.ObjectModel (>= 4.0.12) - framework: >= netstandard10
System.Reflection (>= 4.1) - framework: >= netstandard10
System.Reflection.Extensions (>= 4.0.1) - framework: >= netstandard10
System.Resources.ResourceManager (>= 4.0.1) - framework: >= netstandard10
System.Runtime (>= 4.1) - framework: >= netstandard10
System.Runtime.Extensions (>= 4.1) - framework: >= netstandard10
System.Runtime.Serialization.Primitives (>= 4.1.1) - framework: >= netstandard10
System.Text.Encoding (>= 4.0.11) - framework: >= netstandard10
System.Text.Encoding.Extensions (>= 4.0.11) - framework: >= netstandard10
System.Text.RegularExpressions (>= 4.1) - framework: >= netstandard10
System.Threading (>= 4.0.11) - framework: >= netstandard10
System.Threading.Tasks (>= 4.0.11) - framework: >= netstandard10
System.Xml.ReaderWriter (>= 4.0.11) - framework: >= netstandard10
System.Xml.XDocument (>= 4.0.11) - framework: >= netstandard10
Newtonsoft.Json (10.0.2)
Microsoft.CSharp (>= 4.3) - framework: netstandard10, >= netstandard13
NETStandard.Library (>= 1.6.1) - framework: netstandard10, >= netstandard13
System.ComponentModel.TypeConverter (>= 4.3) - framework: netstandard10, >= netstandard13
System.Runtime.Serialization.Formatters (>= 4.3) - framework: >= netstandard13
System.Runtime.Serialization.Primitives (>= 4.3) - framework: netstandard10, >= netstandard13
System.Xml.XmlDocument (>= 4.3) - framework: >= netstandard13
NuDoq (1.2.5)
RazorMachine (2.6.1)
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3) - framework: net46, >= net46, >= netstandard13, netstandard14
Expand Down Expand Up @@ -255,7 +239,7 @@ NUGET
System.Runtime (>= 4.3) - framework: >= netstandard13
System.Runtime.Extensions (>= 4.3) - framework: >= netstandard13
System.Threading (>= 4.3) - framework: >= netstandard13
System.ComponentModel (4.3) - framework: >= netstandard13
System.ComponentModel (4.3) - framework: netstandard10, >= netstandard13
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13
System.ComponentModel.Annotations (4.3) - framework: >= netstandard13
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard14
Expand All @@ -269,6 +253,26 @@ NUGET
System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard14
System.Text.RegularExpressions (>= 4.3) - framework: dnxcore50, >= netstandard14
System.Threading (>= 4.3) - framework: dnxcore50, >= netstandard14
System.ComponentModel.Primitives (4.3) - framework: netstandard10, >= netstandard15
System.ComponentModel (>= 4.3) - framework: >= netstandard10
System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard10
System.Runtime (>= 4.3) - framework: >= netstandard10
System.ComponentModel.TypeConverter (4.3) - framework: netstandard10, >= netstandard13
System.Collections (>= 4.3) - framework: netstandard10, >= netstandard15
System.Collections.NonGeneric (>= 4.3) - framework: >= net462, >= netstandard15
System.Collections.Specialized (>= 4.3) - framework: >= netstandard15
System.ComponentModel (>= 4.3) - framework: netstandard10, >= netstandard15
System.ComponentModel.Primitives (>= 4.3) - framework: net45, >= net462, netstandard10, >= netstandard15, winv4.5, wpv8.0, wpav8.1
System.Globalization (>= 4.3) - framework: netstandard10, >= netstandard15
System.Linq (>= 4.3) - framework: >= netstandard15
System.Reflection (>= 4.3) - framework: netstandard10, >= netstandard15
System.Reflection.Extensions (>= 4.3) - framework: netstandard10, >= netstandard15
System.Reflection.Primitives (>= 4.3) - framework: netstandard10, >= netstandard15
System.Reflection.TypeExtensions (>= 4.3) - framework: >= netstandard15
System.Resources.ResourceManager (>= 4.3) - framework: netstandard10, >= netstandard15
System.Runtime (>= 4.3) - framework: netstandard10, >= netstandard15
System.Runtime.Extensions (>= 4.3) - framework: netstandard10, >= netstandard15
System.Threading (>= 4.3) - framework: netstandard10, >= netstandard15
System.Console (4.3) - framework: >= net46, >= netstandard13
Microsoft.NETCore.Platforms (>= 1.1) - framework: >= netstandard13
Microsoft.NETCore.Targets (>= 1.1) - framework: >= netstandard13
Expand Down Expand Up @@ -308,7 +312,7 @@ NUGET
Microsoft.NETCore.Platforms (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
Microsoft.NETCore.Targets (>= 1.1) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, netstandard12, netstandard13, >= netstandard15
System.Dynamic.Runtime (4.3) - framework: >= net46, >= netstandard10
System.Dynamic.Runtime (4.3) - framework: >= net46, netstandard10, >= netstandard13
System.Collections (>= 4.3) - framework: dnxcore50, >= netstandard13
System.Diagnostics.Debug (>= 4.3) - framework: dnxcore50, >= netstandard13
System.Linq (>= 4.3) - framework: dnxcore50, >= netstandard13
Expand Down Expand Up @@ -559,7 +563,13 @@ NUGET
System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard11, >= netstandard13
System.Runtime.Extensions (>= 4.3) - framework: dnxcore50, >= netstandard13
System.Runtime.Serialization.Primitives (4.3) - framework: >= netstandard10
System.Runtime.Serialization.Formatters (4.3) - framework: >= netstandard13
System.Collections (>= 4.3) - framework: >= netstandard14
System.Reflection (>= 4.3) - framework: >= netstandard14
System.Resources.ResourceManager (>= 4.3) - framework: >= netstandard14
System.Runtime (>= 4.3) - framework: >= netstandard13
System.Runtime.Serialization.Primitives (>= 4.3) - framework: >= net46, >= netstandard13
System.Runtime.Serialization.Primitives (4.3) - framework: netstandard10, >= netstandard13
System.Resources.ResourceManager (>= 4.3) - framework: dnxcore50, >= netstandard13
System.Runtime (>= 4.3) - framework: dnxcore50, netstandard10, >= netstandard13
System.Security.Cryptography.Algorithms (4.3) - framework: net46, >= net46, >= netstandard13, netstandard14
Expand Down

0 comments on commit 815c8ef

Please sign in to comment.