lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [11/14] lucenenet git commit: Fixed several issues that were causing the .NET Core build to fail
Date Thu, 02 Feb 2017 12:42:42 GMT
Fixed several issues that were causing the .NET Core build to fail


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

Branch: refs/heads/api-work
Commit: bed1f16e5d81495acf1c8c0f2a36cb7789bdb3ed
Parents: 5d55616
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Thu Feb 2 15:56:14 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Thu Feb 2 18:30:35 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Core/Index/TaskMergeScheduler.cs |  6 ++--
 .../Support/SafeTextWriterWrapper.cs            |  9 ++++++
 src/Lucene.Net.Core/project.json                |  9 +++++-
 src/Lucene.Net.TestFramework/project.json       |  1 +
 .../project.json                                |  7 ++++-
 .../project.json                                |  7 ++++-
 .../project.json                                |  9 +++++-
 .../Lucene.Net.Tests.Codecs.csproj              |  4 ---
 src/Lucene.Net.Tests.Codecs/project.json        |  9 ++++--
 src/Lucene.Net.Tests.Expressions/project.json   | 11 +++++--
 src/Lucene.Net.Tests.Facet/project.json         |  7 ++++-
 src/Lucene.Net.Tests.Grouping/project.json      |  7 ++++-
 src/Lucene.Net.Tests.Highlighter/project.json   |  7 ++++-
 src/Lucene.Net.Tests.Join/project.json          | 13 ++++++--
 src/Lucene.Net.Tests.Memory/project.json        |  9 +++++-
 src/Lucene.Net.Tests.Misc/project.json          | 13 ++++++--
 src/Lucene.Net.Tests.Queries/project.json       |  9 +++++-
 src/Lucene.Net.Tests.QueryParser/project.json   |  6 ++--
 src/Lucene.Net.Tests.Sandbox/project.json       |  9 ++++--
 src/Lucene.Net.Tests.Spatial/project.json       | 31 ++++++++++++--------
 src/Lucene.Net.Tests.Suggest/project.json       |  7 +++++
 .../Index/TestTaskMergeSchedulerExternal.cs     |  6 ++--
 src/Lucene.Net.Tests/project.json               |  1 +
 23 files changed, 150 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs b/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
index 61cec12..804e7bb 100644
--- a/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
+++ b/src/Lucene.Net.Core/Index/TaskMergeScheduler.cs
@@ -159,7 +159,7 @@ namespace Lucene.Net.Index
         /// }
         /// </pre>
         /// </summary>
-        protected internal bool Verbose
+        protected bool Verbose
         {
             get { return _writer != null && _writer.infoStream.IsEnabled(COMPONENT_NAME);
}
         }
@@ -168,7 +168,7 @@ namespace Lucene.Net.Index
         /// Outputs the given message - this method assumes <seealso cref="#verbose()"/>
was
         /// called and returned true.
         /// </summary>
-        protected internal virtual void Message(string message)
+        protected virtual void Message(string message)
         {
             _writer.infoStream.Message(COMPONENT_NAME, message);
         }
@@ -357,7 +357,7 @@ namespace Lucene.Net.Index
         /// Called when an exception is hit in a background merge
         ///  thread
         /// </summary>
-        protected internal virtual void HandleMergeException(Exception exc)
+        protected virtual void HandleMergeException(Exception exc)
         {
             // suppressExceptions is normally only set during testing
             if (suppressExceptions)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Core/Support/SafeTextWriterWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Support/SafeTextWriterWrapper.cs b/src/Lucene.Net.Core/Support/SafeTextWriterWrapper.cs
index 0c5d7c3..507bb8a 100644
--- a/src/Lucene.Net.Core/Support/SafeTextWriterWrapper.cs
+++ b/src/Lucene.Net.Core/Support/SafeTextWriterWrapper.cs
@@ -1,5 +1,8 @@
 ´╗┐using System;
 using System.IO;
+#if FEATURE_MARSHAL_BY_REF
+using System.Runtime.Remoting;
+#endif
 using System.Text;
 using System.Threading.Tasks;
 
@@ -64,15 +67,19 @@ namespace Lucene.Net.Support
             }
         }
 
+#if FEATURE_CLOSEABLE
         public override void Close()
         {
             Run(() => textWriter.Close());
         }
+#endif
 
+#if FEATURE_MARSHAL_BY_REF
         public override ObjRef CreateObjRef(Type requestedType)
         {
             return Run(() => textWriter.CreateObjRef(requestedType));
         }
+#endif
 
         public override bool Equals(object obj)
         {
@@ -94,10 +101,12 @@ namespace Lucene.Net.Support
             return Run(() => textWriter.GetHashCode());
         }
 
+#if FEATURE_LIFETIME_SERVICE
         public override object InitializeLifetimeService()
         {
             return Run(() => textWriter.InitializeLifetimeService());
         }
+#endif
 
         public override string ToString()
         {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Core/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/project.json b/src/Lucene.Net.Core/project.json
index c0879ac..ddbdf76 100644
--- a/src/Lucene.Net.Core/project.json
+++ b/src/Lucene.Net.Core/project.json
@@ -168,7 +168,14 @@
         "System.Xml.Linq": "4.0.0.0"
       },
       "buildOptions": {
-        "define": [ "FEATURE_CLONEABLE", "FEATURE_SERIALIZABLE", "FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM"
],
+        "define": [
+          "FEATURE_CLONEABLE",
+          "FEATURE_SERIALIZABLE",
+          "FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM",
+          "FEATURE_MARSHAL_BY_REF",
+          "FEATURE_CLOSEABLE",
+          "FEATURE_LIFETIME_SERVICE"
+        ],
         "compile": {
           "exclude": [
             "Analysis/Standard/*",

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.TestFramework/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/project.json b/src/Lucene.Net.TestFramework/project.json
index 48ed0c2..d793f61 100644
--- a/src/Lucene.Net.TestFramework/project.json
+++ b/src/Lucene.Net.TestFramework/project.json
@@ -19,6 +19,7 @@
         "compile": {
           "excludeFiles": [
             "Support/SystemProperties.cs",
+            "Util/ApiScanTestBase.cs",
             "Util/AbstractBeforeAfterRule.cs",
             "Util/CloseableDirectory.cs",
             "Util/FailureMarker.cs",

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Analysis.Common/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/project.json b/src/Lucene.Net.Tests.Analysis.Common/project.json
index 46a3833..812bc65 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/project.json
+++ b/src/Lucene.Net.Tests.Analysis.Common/project.json
@@ -107,7 +107,12 @@
   "frameworks": {
     "netcoreapp1.0": {
       "buildOptions": {
-        "define": [ "NETSTANDARD" ]
+        "define": [ "NETSTANDARD" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       },
       "dependencies": {
         "Microsoft.NETCore.App": {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Analysis.Stempel/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/project.json b/src/Lucene.Net.Tests.Analysis.Stempel/project.json
index 018ecfd..7c6e2f9 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/project.json
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/project.json
@@ -25,7 +25,12 @@
         }
       },
       "buildOptions": {
-        "define": [ "NETSTANDARD" ]
+        "define": [ "NETSTANDARD" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Classification/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/project.json b/src/Lucene.Net.Tests.Classification/project.json
index a0e7c84..a8656f7 100644
--- a/src/Lucene.Net.Tests.Classification/project.json
+++ b/src/Lucene.Net.Tests.Classification/project.json
@@ -13,11 +13,18 @@
   "frameworks": {
     "netcoreapp1.0": {
       "imports": "dnxcore50",
-      "dependencies": { 
+      "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
         }
+      },
+      "buildOptions": {
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
index 7e4c447..4000a00 100644
--- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
+++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
@@ -81,10 +81,6 @@
       <Project>{b2c0d749-ce34-4f62-a15e-00cb2ff5ddb3}</Project>
       <Name>Lucene.Net.TestFramework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Lucene.Net.Tests\Lucene.Net.Tests.csproj">
-      <Project>{de63db10-975f-460d-af85-572c17a91284}</Project>
-      <Name>Lucene.Net.Tests</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Codecs/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/project.json b/src/Lucene.Net.Tests.Codecs/project.json
index 94d03ed..80ad56d 100644
--- a/src/Lucene.Net.Tests.Codecs/project.json
+++ b/src/Lucene.Net.Tests.Codecs/project.json
@@ -5,7 +5,7 @@
     "NUnit": "3.5.0",
     "Lucene.Net.Analysis.Common": "4.8.0-alpha",
     "Lucene.Net.Codecs": "4.8.0-alpha",
-    "Lucene.Net.Tests": "4.8.0-alpha"
+    "Lucene.Net.TestFramework": "4.8.0-alpha"
   },
 
   "testRunner": "nunit",
@@ -13,7 +13,12 @@
   "frameworks": {
     "netcoreapp1.0": {
       "buildOptions": {
-        "define": [ "NETSTANDARD" ]
+        "define": [ "NETSTANDARD" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       },
       "imports": "dnxcore50",
       "dependencies": {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Expressions/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/project.json b/src/Lucene.Net.Tests.Expressions/project.json
index 6b7d68d..ec5baa5 100644
--- a/src/Lucene.Net.Tests.Expressions/project.json
+++ b/src/Lucene.Net.Tests.Expressions/project.json
@@ -9,15 +9,22 @@
   },
 
   "testRunner": "nunit",
-
+  
   "frameworks": {
     "netcoreapp1.0": {
       "imports": "dnxcore50",
-      "dependencies": { 
+      "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
         }
+      },
+      "buildOptions": {
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Facet/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/project.json b/src/Lucene.Net.Tests.Facet/project.json
index 04b3527..2bed4d6 100644
--- a/src/Lucene.Net.Tests.Facet/project.json
+++ b/src/Lucene.Net.Tests.Facet/project.json
@@ -20,7 +20,12 @@
         }
       },
       "buildOptions": {
-        "define": [ "NETSTANDARD" ]
+        "define": [ "NETSTANDARD" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Grouping/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/project.json b/src/Lucene.Net.Tests.Grouping/project.json
index 724369e..2cd0351 100644
--- a/src/Lucene.Net.Tests.Grouping/project.json
+++ b/src/Lucene.Net.Tests.Grouping/project.json
@@ -20,7 +20,12 @@
         }
       },
       "buildOptions": {
-        "define": [ "NETSTANDARD" ]
+        "define": [ "NETSTANDARD" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Highlighter/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/project.json b/src/Lucene.Net.Tests.Highlighter/project.json
index 84a0104..99bfb94 100644
--- a/src/Lucene.Net.Tests.Highlighter/project.json
+++ b/src/Lucene.Net.Tests.Highlighter/project.json
@@ -19,7 +19,12 @@
   "frameworks": {
     "netcoreapp1.0": {
       "buildOptions": {
-        "define": [ "NETSTANDARD", "FEATURE_EMBEDDED_RESOURCE" ]
+        "define": [ "NETSTANDARD", "FEATURE_EMBEDDED_RESOURCE" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       },
       "dependencies": {
         "Microsoft.NETCore.App": {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Join/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/project.json b/src/Lucene.Net.Tests.Join/project.json
index 9777ef4..c6d7a79 100644
--- a/src/Lucene.Net.Tests.Join/project.json
+++ b/src/Lucene.Net.Tests.Join/project.json
@@ -6,19 +6,26 @@
     "Lucene.Net.Grouping": "4.8.0-alpha",
     "Lucene.Net.Join": "4.8.0-alpha",
     "Lucene.Net.TestFramework": "4.8.0-alpha",
-    "NUnit": "3.5.0",
+    "NUnit": "3.5.0"
   },
 
   "testRunner": "nunit",
-
+  
   "frameworks": {
     "netcoreapp1.0": {
       "imports": "dnxcore50",
-      "dependencies": { 
+      "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
         }
+      },
+      "buildOptions": {
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Memory/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/project.json b/src/Lucene.Net.Tests.Memory/project.json
index bd96749..5f0fb11 100644
--- a/src/Lucene.Net.Tests.Memory/project.json
+++ b/src/Lucene.Net.Tests.Memory/project.json
@@ -22,11 +22,18 @@
   "frameworks": {
     "netcoreapp1.0": {
       "imports": "dnxcore50",
-      "dependencies": { 
+      "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
         }
+      },
+      "buildOptions": {
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Misc/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/project.json b/src/Lucene.Net.Tests.Misc/project.json
index a82c280..a2f7fd2 100644
--- a/src/Lucene.Net.Tests.Misc/project.json
+++ b/src/Lucene.Net.Tests.Misc/project.json
@@ -8,19 +8,26 @@
   },
 
   "testRunner": "nunit",
-
+  
   "frameworks": {
     "netcoreapp1.0": {
       "imports": "dnxcore50",
-      "dependencies": { 
+      "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
         }
+      },
+      "buildOptions": {
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },
-  
+
   "runtimes": {
     "win7-x86": {},
     "win7-x64": {}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Queries/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/project.json b/src/Lucene.Net.Tests.Queries/project.json
index c78ec4f..abafeaf 100644
--- a/src/Lucene.Net.Tests.Queries/project.json
+++ b/src/Lucene.Net.Tests.Queries/project.json
@@ -12,11 +12,18 @@
   "frameworks": {
     "netcoreapp1.0": {
       "imports": "dnxcore50",
-      "dependencies": { 
+      "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
           "version": "1.0.1"
         }
+      },
+      "buildOptions": {
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.QueryParser/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/project.json b/src/Lucene.Net.Tests.QueryParser/project.json
index b83132e..b2ff80a 100644
--- a/src/Lucene.Net.Tests.QueryParser/project.json
+++ b/src/Lucene.Net.Tests.QueryParser/project.json
@@ -9,7 +9,6 @@
   },
 
   "testRunner": "nunit",
-
   "frameworks": {
     "netcoreapp1.0": {
       "imports": "dnxcore50",
@@ -22,13 +21,14 @@
       "buildOptions": {
         "compile": {
           "excludeFiles": [
-            "Xml/TestQueryTemplateManager.cs"
+            "Xml/TestQueryTemplateManager.cs",
+            "TestApiConsistency.cs"
           ]
         }
       }
     }
   },
-  
+
   "runtimes": {
     "win7-x86": {},
     "win7-x64": {}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Sandbox/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/project.json b/src/Lucene.Net.Tests.Sandbox/project.json
index 186abd5..2da3ee8 100644
--- a/src/Lucene.Net.Tests.Sandbox/project.json
+++ b/src/Lucene.Net.Tests.Sandbox/project.json
@@ -9,7 +9,7 @@
   },
   "buildOptions": {
     "embed": {
-      "includeFiles": [ 
+      "includeFiles": [
         "Queries/fuzzyTestData.txt"
       ]
     }
@@ -26,7 +26,12 @@
       },
       "imports": "dnxcore50",
       "buildOptions": {
-        "define": [ "FEATURE_EMBEDDED_RESOURCE" ]
+        "define": [ "FEATURE_EMBEDDED_RESOURCE" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Spatial/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/project.json b/src/Lucene.Net.Tests.Spatial/project.json
index 127bda3..6d99bf7 100644
--- a/src/Lucene.Net.Tests.Spatial/project.json
+++ b/src/Lucene.Net.Tests.Spatial/project.json
@@ -11,18 +11,18 @@
   "buildOptions": {
     "embed": {
       "includeFiles": [
-          "Test-Files/cities-Intersects-BBox.txt",
-          "Test-Files/Data/countries-bbox.txt",
-          "Test-Files/Data/countries-poly.txt",
-          "Test-Files/Data/geonames-IE.txt",
-          "Test-Files/Data/LUCENE-4464.txt",
-          "Test-Files/Data/simple-bbox.txt",
-          "Test-Files/Data/states-bbox.txt",
-          "Test-Files/Data/states-poly.txt",
-          "Test-Files/Data/world-cities-points.txt",
-          "Test-Files/simple-Queries-BBox.txt",
-          "Test-Files/states-Intersects-BBox.txt",
-          "Test-Files/states-IsWithin-BBox.txt"
+        "Test-Files/cities-Intersects-BBox.txt",
+        "Test-Files/Data/countries-bbox.txt",
+        "Test-Files/Data/countries-poly.txt",
+        "Test-Files/Data/geonames-IE.txt",
+        "Test-Files/Data/LUCENE-4464.txt",
+        "Test-Files/Data/simple-bbox.txt",
+        "Test-Files/Data/states-bbox.txt",
+        "Test-Files/Data/states-poly.txt",
+        "Test-Files/Data/world-cities-points.txt",
+        "Test-Files/simple-Queries-BBox.txt",
+        "Test-Files/states-Intersects-BBox.txt",
+        "Test-Files/states-IsWithin-BBox.txt"
       ]
     }
   },
@@ -30,7 +30,12 @@
     "netcoreapp1.0": {
       "imports": [ "dnxcore50", "portable-net403+sl5+win8+wp8+wpa81" ],
       "buildOptions": {
-        "define": [ "NETSTANDARD" ]
+        "define": [ "NETSTANDARD" ],
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       },
       "dependencies": {
         "Microsoft.NETCore.App": {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests.Suggest/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/project.json b/src/Lucene.Net.Tests.Suggest/project.json
index 24fba67..188fbd0 100644
--- a/src/Lucene.Net.Tests.Suggest/project.json
+++ b/src/Lucene.Net.Tests.Suggest/project.json
@@ -28,6 +28,13 @@
           "type": "platform",
           "version": "1.0.1"
         }
+      },
+      "buildOptions": {
+        "compile": {
+          "excludeFiles": [
+            "TestApiConsistency.cs"
+          ]
+        }
       }
     }
   },

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests/core/Index/TestTaskMergeSchedulerExternal.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTaskMergeSchedulerExternal.cs b/src/Lucene.Net.Tests/core/Index/TestTaskMergeSchedulerExternal.cs
index 960520b..f0ad954 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTaskMergeSchedulerExternal.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTaskMergeSchedulerExternal.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Tests
                 this.OuterInstance = outerInstance;
             }
 
-            protected internal override void HandleMergeException(Exception t)
+            protected override void HandleMergeException(Exception t)
             {
                 OuterInstance.ExcCalled = true;
             }
@@ -109,7 +109,7 @@ namespace Lucene.Net.Tests
             public override void Merge(IndexWriter writer, MergeTrigger trigger, bool newMergesFound)
             {
                 MergePolicy.OneMerge merge = null;
-                while ((merge = writer.NextMerge) != null)
+                while ((merge = writer.GetNextMerge()) != null)
                 {
                     if (VERBOSE)
                     {
@@ -119,7 +119,7 @@ namespace Lucene.Net.Tests
                 }
             }
 
-            public override void Dispose()
+            protected override void Dispose(bool disposing)
             {
             }
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bed1f16e/src/Lucene.Net.Tests/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json
index 72e021d..171c985 100644
--- a/src/Lucene.Net.Tests/project.json
+++ b/src/Lucene.Net.Tests/project.json
@@ -16,6 +16,7 @@
         "core/Util/Junitcompat"
       ],
       "excludeFiles": [
+        "core/TestApiConsistency.cs",
         "core/TestMergeSchedulerExternal.cs",
         "core/TestWorstCaseTestBehavior.cs",
         "core/Index/TestBackwardsCompatibility.cs",


Mime
View raw message