lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [02/15] lucenenet git commit: Lucene.Net.Tests: Removed FEATURE_TASKMERGESCHEDULER from .NET 4.5.1 and fixed list of excluded files so it only applies to .NET Core
Date Sat, 08 Apr 2017 21:37:52 GMT
Lucene.Net.Tests: Removed FEATURE_TASKMERGESCHEDULER from .NET 4.5.1 and fixed list of excluded
files so it only applies to .NET Core


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/85bc618a
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/85bc618a
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/85bc618a

Branch: refs/heads/api-work
Commit: 85bc618a5156cfa9c2b5c03e4709a6dbe4d6cfde
Parents: a9028b7
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Sun Apr 9 00:38:16 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Sun Apr 9 00:38:16 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Tests/Lucene.Net.Tests.csproj |  2 +-
 src/Lucene.Net.Tests/project.json            | 57 ++++++++++++-----------
 2 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/85bc618a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
index 3f8d167..6bb76fe 100644
--- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
+++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <RootNamespace>Lucene.Net.Tests</RootNamespace>
-    <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE;FEATURE_TASKMERGESCHEDULER</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/85bc618a/src/Lucene.Net.Tests/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json
index c703c54..36f2866 100644
--- a/src/Lucene.Net.Tests/project.json
+++ b/src/Lucene.Net.Tests/project.json
@@ -9,35 +9,10 @@
     "NUnit": "3.5.0"
   },
   "buildOptions": {
-    "define": [ "FEATURE_TASKMERGESCHEDULER" ],
     "compile": {
       "exclude": [
         "Util/JunitCompat"
       ],
-      "excludeFiles": [
-        "Support/TestApiConsistency.cs",
-        "TestMergeSchedulerExternal.cs",
-        "TestWorstCaseTestBehavior.cs",
-        "Index/TestConcurrentMergeScheduler.cs",
-        "Support/BigObject.cs",
-        "Support/CollisionTester.cs",
-        "Support/SmallObject.cs",
-        "Support/TestCase.cs",
-        "Support/TestCloseableThreadLocal.cs",
-        "Support/TestEquatableList.cs",
-        "Support/TestExceptionSerialization.cs",
-        "Support/TestIDisposable.cs",
-        "Support/TestLRUCache.cs",
-        "Support/TestOldPatches.cs",
-        "Support/TestOSClass.cs",
-        "Support/TestSerialization.cs",
-        "Support/TestSupportClass.cs",
-        "Support/TestThreadClass.cs",
-        "Support/TestWeakDictionary.cs",
-        "Support/TestWeakDictionaryBehavior.cs",
-        "Support/TestWeakDictionaryPerformance.cs",
-        "Util/TestMaxFailuresRule.cs"
-      ],
       "includeFiles": [
         "../CommonAssemblyInfo.cs"
       ]
@@ -92,7 +67,31 @@
   "frameworks": {
     "netcoreapp1.0": {
       "buildOptions": {
-        "define": [ "NETSTANDARD" ]
+        "define": [ "NETSTANDARD", "FEATURE_TASKMERGESCHEDULER" ],
+        "excludeFiles": [
+          "Support/TestApiConsistency.cs",
+          "TestMergeSchedulerExternal.cs",
+          "TestWorstCaseTestBehavior.cs",
+          "Index/TestConcurrentMergeScheduler.cs",
+          "Support/BigObject.cs",
+          "Support/CollisionTester.cs",
+          "Support/SmallObject.cs",
+          "Support/TestCase.cs",
+          "Support/TestCloseableThreadLocal.cs",
+          "Support/TestEquatableList.cs",
+          "Support/TestExceptionSerialization.cs",
+          "Support/TestIDisposable.cs",
+          "Support/TestLRUCache.cs",
+          "Support/TestOldPatches.cs",
+          "Support/TestOSClass.cs",
+          "Support/TestSerialization.cs",
+          "Support/TestSupportClass.cs",
+          "Support/TestThreadClass.cs",
+          "Support/TestWeakDictionary.cs",
+          "Support/TestWeakDictionaryBehavior.cs",
+          "Support/TestWeakDictionaryPerformance.cs",
+          "Util/TestMaxFailuresRule.cs"
+        ]
       },
       "dependencies": {
         "Microsoft.NETCore.App": {
@@ -102,7 +101,11 @@
       },
       "imports": "dnxcore50"
     },
-    "net451": {}
+    "net451": {
+      "buildOptions": {
+        "define": [ "FEATURE_SERIALIZABLE" ]
+      }
+    }
   },
 
   "runtimes": {


Mime
View raw message