Repository: lucenenet Updated Branches: refs/heads/api-work 1b50f1dd9 -> 84abcb4d6
SWEEP: Fixed .NET 4.5.1 NuGet dependencies Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/035f680a Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/035f680a Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/035f680a Branch: refs/heads/api-work Commit: 035f680abe1e1976fd13666e02461e5843387367 Parents: 1b50f1d Author: Shad Storhaug <[email protected]> Authored: Mon Apr 10 16:06:05 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Mon Apr 10 16:06:05 2017 +0700 ---------------------------------------------------------------------- src/Lucene.Net.Expressions/project.json | 8 ++++---- .../Taxonomy/WriterCache/CharBlockArrayConverter.cs | 4 +++- src/Lucene.Net.Facet/project.json | 6 +++--- src/Lucene.Net/project.json | 10 ++++------ 4 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/035f680a/src/Lucene.Net.Expressions/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Expressions/project.json b/src/Lucene.Net.Expressions/project.json index 3a3ffac..a284a8f 100644 --- a/src/Lucene.Net.Expressions/project.json +++ b/src/Lucene.Net.Expressions/project.json @@ -2,9 +2,7 @@ "version": "4.8.0-alpha", "dependencies": { "antlr3.runtime.netcore": "3.6.0-rc2", - "Lucene.Net.Queries": "4.8.0-alpha", - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "1.0.0" + "Lucene.Net.Queries": "4.8.0-alpha" }, "buildOptions": { "debugType": "portable", @@ -33,7 +31,9 @@ "NETStandard.Library": "1.6.0", "System.Reflection.Emit": "4.0.1", "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0" + "System.Reflection.TypeExtensions": "4.1.0", + "Microsoft.Extensions.Configuration": "1.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "1.0.0" }, "buildOptions": { "define": [ "NETSTANDARD" ], http://git-wip-us.apache.org/repos/asf/lucenenet/blob/035f680a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArrayConverter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArrayConverter.cs b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArrayConverter.cs index e80eb3f..7830116 100644 --- a/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArrayConverter.cs +++ b/src/Lucene.Net.Facet/Taxonomy/WriterCache/CharBlockArrayConverter.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +#if !FEATURE_SERIALIZABLE +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Linq; @@ -76,3 +77,4 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache } } } +#endif http://git-wip-us.apache.org/repos/asf/lucenenet/blob/035f680a/src/Lucene.Net.Facet/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/project.json b/src/Lucene.Net.Facet/project.json index 5998ce0..41582b2 100644 --- a/src/Lucene.Net.Facet/project.json +++ b/src/Lucene.Net.Facet/project.json @@ -2,8 +2,7 @@ "version": "4.8.0-alpha", "dependencies": { "Lucene.Net.Join": "4.8.0-alpha", - "Lucene.Net.Queries": "4.8.0-alpha", - "Newtonsoft.Json": "9.0.1" + "Lucene.Net.Queries": "4.8.0-alpha" }, "buildOptions": { "debugType": "portable", @@ -33,7 +32,8 @@ }, "dependencies": { "NETStandard.Library": "1.6.0", - "System.Threading.Thread": "4.0.0" + "System.Threading.Thread": "4.0.0", + "Newtonsoft.Json": "9.0.1" } }, "net451": { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/035f680a/src/Lucene.Net/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/project.json b/src/Lucene.Net/project.json index 6162e2f..62a8a55 100644 --- a/src/Lucene.Net/project.json +++ b/src/Lucene.Net/project.json @@ -20,12 +20,6 @@ }, "tags": [ "lucene.net", "core", "text", "search", "information", "retrieval", "lucene", "apache", "analysis", "index", "query" ] }, - "dependencies": { - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-final", - "Newtonsoft.Json": "9.0.1" - }, "frameworks": { "netstandard1.5": { "imports": "dnxcore50", @@ -42,6 +36,10 @@ } }, "dependencies": { + "Microsoft.Extensions.Configuration": "1.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", + "Microsoft.Extensions.DependencyModel": "1.0.0-rc2-final", + "Newtonsoft.Json": "9.0.1", "NETStandard.Library": "1.6.0", "System.Collections.NonGeneric": "4.0.1", "System.Collections.Specialized": "4.0.1",
