Repository: lucenenet Updated Branches: refs/heads/api-work fd57cc349 -> ed73dce40
Lucene.Net.project.json + Lucene.Net.Tests.json: separated entire compile/embed section into each framework. dotnet.exe does not combine options when specifying both a shared buildOptions and framework specific buildOptions sections. Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/deaf4229 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/deaf4229 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/deaf4229 Branch: refs/heads/api-work Commit: deaf4229defdef5edb7539ea12ed4297f3c4cce5 Parents: fd57cc3 Author: Shad Storhaug <[email protected]> Authored: Sat Apr 15 19:21:12 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sat Apr 15 20:40:41 2017 +0700 ---------------------------------------------------------------------- src/Lucene.Net.Tests/project.json | 150 +++++++++++++++++++++------------ src/Lucene.Net/project.json | 20 +++-- 2 files changed, 108 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deaf4229/src/Lucene.Net.Tests/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json index 1573265..a33df9f 100644 --- a/src/Lucene.Net.Tests/project.json +++ b/src/Lucene.Net.Tests/project.json @@ -9,77 +9,73 @@ "Lucene.Net.TestFramework": "4.8.0", "NUnit": "3.5.0" }, - "buildOptions": { - "debugType": "portable", - "compile": { - "includeFiles": [ - "../CommonAssemblyInfo.cs" - ] - }, - "embed": { - "includeFiles": [ - "Index/bogus24.upgraded.to.36.zip", - "Index/index.30.cfs.zip", - "Index/index.30.nocfs.zip", - "Index/index.31.cfs.zip", - "Index/index.31.nocfs.zip", - "Index/index.31.optimized.cfs.zip", - "Index/index.31.optimized.nocfs.zip", - "Index/index.32.cfs.zip", - "Index/index.32.nocfs.zip", - "Index/index.34.cfs.zip", - "Index/index.34.nocfs.zip", - "Index/index.36.surrogates.zip", - "Index/index.40.cfs.zip", - "Index/index.40.nocfs.zip", - "Index/index.40.optimized.cfs.zip", - "Index/index.40.optimized.nocfs.zip", - "Index/index.41.cfs.zip", - "Index/index.41.nocfs.zip", - "Index/index.42.cfs.zip", - "Index/index.42.nocfs.zip", - "Index/index.45.cfs.zip", - "Index/index.45.nocfs.zip", - "Index/index.461.cfs.zip", - "Index/index.461.nocfs.zip", - "Index/moreterms.40.zip", - "Index/unsupported.19.cfs.zip", - "Index/unsupported.19.nocfs.zip", - "Index/unsupported.20.cfs.zip", - "Index/unsupported.20.nocfs.zip", - "Index/unsupported.21.cfs.zip", - "Index/unsupported.21.nocfs.zip", - "Index/unsupported.22.cfs.zip", - "Index/unsupported.22.nocfs.zip", - "Index/unsupported.23.cfs.zip", - "Index/unsupported.23.nocfs.zip", - "Index/unsupported.24.cfs.zip", - "Index/unsupported.24.nocfs.zip", - "Index/unsupported.29.cfs.zip", - "Index/unsupported.29.nocfs.zip", - "Support/ReadFully.txt" - ] - } - }, "testRunner": "nunit", "frameworks": { "netcoreapp1.0": { "buildOptions": { + "debugType": "portable", "define": [ "NETSTANDARD", "FEATURE_TASKMERGESCHEDULER" ], "compile": { + "includeFiles": [ + "../CommonAssemblyInfo.cs" + ], "exclude": [ "Util/JunitCompat" ], "excludeFiles": [ - "Support/TestApiConsistency.cs", "TestMergeSchedulerExternal.cs", "Index/TestConcurrentMergeScheduler.cs", + "Support/TestApiConsistency.cs", "Support/TestCase.cs", "Support/TestExceptionSerialization.cs", "Support/TestSerialization.cs", "Util/TestMaxFailuresRule.cs" ] + }, + "embed": { + "includeFiles": [ + "Index/bogus24.upgraded.to.36.zip", + "Index/index.30.cfs.zip", + "Index/index.30.nocfs.zip", + "Index/index.31.cfs.zip", + "Index/index.31.nocfs.zip", + "Index/index.31.optimized.cfs.zip", + "Index/index.31.optimized.nocfs.zip", + "Index/index.32.cfs.zip", + "Index/index.32.nocfs.zip", + "Index/index.34.cfs.zip", + "Index/index.34.nocfs.zip", + "Index/index.36.surrogates.zip", + "Index/index.40.cfs.zip", + "Index/index.40.nocfs.zip", + "Index/index.40.optimized.cfs.zip", + "Index/index.40.optimized.nocfs.zip", + "Index/index.41.cfs.zip", + "Index/index.41.nocfs.zip", + "Index/index.42.cfs.zip", + "Index/index.42.nocfs.zip", + "Index/index.45.cfs.zip", + "Index/index.45.nocfs.zip", + "Index/index.461.cfs.zip", + "Index/index.461.nocfs.zip", + "Index/moreterms.40.zip", + "Index/unsupported.19.cfs.zip", + "Index/unsupported.19.nocfs.zip", + "Index/unsupported.20.cfs.zip", + "Index/unsupported.20.nocfs.zip", + "Index/unsupported.21.cfs.zip", + "Index/unsupported.21.nocfs.zip", + "Index/unsupported.22.cfs.zip", + "Index/unsupported.22.nocfs.zip", + "Index/unsupported.23.cfs.zip", + "Index/unsupported.23.nocfs.zip", + "Index/unsupported.24.cfs.zip", + "Index/unsupported.24.nocfs.zip", + "Index/unsupported.29.cfs.zip", + "Index/unsupported.29.nocfs.zip", + "Support/ReadFully.txt" + ] } }, "dependencies": { @@ -92,12 +88,60 @@ }, "net451": { "buildOptions": { + "debugType": "portable", "define": [ "FEATURE_SERIALIZABLE" ], "compile": { + "includeFiles": [ + "../CommonAssemblyInfo.cs" + ], "exclude": [ "Util/JunitCompat" ], "excludeFiles": [ "Util/TestMaxFailuresRule.cs" ] + }, + "embed": { + "includeFiles": [ + "Index/bogus24.upgraded.to.36.zip", + "Index/index.30.cfs.zip", + "Index/index.30.nocfs.zip", + "Index/index.31.cfs.zip", + "Index/index.31.nocfs.zip", + "Index/index.31.optimized.cfs.zip", + "Index/index.31.optimized.nocfs.zip", + "Index/index.32.cfs.zip", + "Index/index.32.nocfs.zip", + "Index/index.34.cfs.zip", + "Index/index.34.nocfs.zip", + "Index/index.36.surrogates.zip", + "Index/index.40.cfs.zip", + "Index/index.40.nocfs.zip", + "Index/index.40.optimized.cfs.zip", + "Index/index.40.optimized.nocfs.zip", + "Index/index.41.cfs.zip", + "Index/index.41.nocfs.zip", + "Index/index.42.cfs.zip", + "Index/index.42.nocfs.zip", + "Index/index.45.cfs.zip", + "Index/index.45.nocfs.zip", + "Index/index.461.cfs.zip", + "Index/index.461.nocfs.zip", + "Index/moreterms.40.zip", + "Index/unsupported.19.cfs.zip", + "Index/unsupported.19.nocfs.zip", + "Index/unsupported.20.cfs.zip", + "Index/unsupported.20.nocfs.zip", + "Index/unsupported.21.cfs.zip", + "Index/unsupported.21.nocfs.zip", + "Index/unsupported.22.cfs.zip", + "Index/unsupported.22.nocfs.zip", + "Index/unsupported.23.cfs.zip", + "Index/unsupported.23.nocfs.zip", + "Index/unsupported.24.cfs.zip", + "Index/unsupported.24.nocfs.zip", + "Index/unsupported.29.cfs.zip", + "Index/unsupported.29.nocfs.zip", + "Support/ReadFully.txt" + ] } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/deaf4229/src/Lucene.Net/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/project.json b/src/Lucene.Net/project.json index 0c6cd89..d2be50a 100644 --- a/src/Lucene.Net/project.json +++ b/src/Lucene.Net/project.json @@ -1,13 +1,5 @@ { "version": "4.8.0", - "buildOptions": { - "debugType": "portable", - "compile": { - "includeFiles": [ - "../CommonAssemblyInfo.cs" - ] - } - }, "packOptions": { "summary": "<Added from AssemblyDescriptionAttribute by the build script - do not remove this>", "licenseUrl": "https://github.com/apache/lucenenet/blob/master/LICENSE.txt";, @@ -24,8 +16,12 @@ "netstandard1.5": { "imports": "dnxcore50", "buildOptions": { + "debugType": "portable", "define": [ "FEATURE_TASKMERGESCHEDULER", "NETSTANDARD" ], "compile": { + "includeFiles": [ + "../CommonAssemblyInfo.cs" + ], "excludeFiles": [ "Index/ConcurrentMergeScheduler.cs", "Support/Deflater.cs", @@ -57,11 +53,17 @@ "System.Xml.Linq": "4.0.0.0" }, "buildOptions": { + "debugType": "portable", "define": [ "FEATURE_CLONEABLE", "FEATURE_SERIALIZABLE", "FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM" - ] + ], + "compile": { + "includeFiles": [ + "../CommonAssemblyInfo.cs" + ] + } } } }
