You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/10/20 10:55:33 UTC
[06/10] lucenenet git commit: SWEEP: Changed all projects to target
.NET Standard 1.6 instead of .NET Standard 1.5 (incompatible with
Microsoft.Extensions.DependencyModel)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
index 32c8443..9f92912 100644
--- a/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Tests.Misc
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Misc.SweetSpotSimilarity))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
index 160358a..d98226f 100644
--- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
+++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
@@ -61,7 +61,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
index 3b10519..dfc6a00 100644
--- a/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Tests.Queries
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
index c2d480d..f5e8694 100644
--- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
+++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
@@ -63,7 +63,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
index c5f231c..6710fb9 100644
--- a/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.QueryParsers
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs b/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
index 54110d6..06b7924 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
using Lucene.Net.Analysis;
using Lucene.Net.Documents;
using Lucene.Net.Index;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj
index d7158ff..9ad958a 100644
--- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj
+++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj
@@ -64,7 +64,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
index 71693f1..00e3763 100644
--- a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Replicator
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Replicator.IReplicator))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
index 5a9c253..627a4ca 100644
--- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
+++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
@@ -63,7 +63,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
index 51dd558..4e45a0b 100644
--- a/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Sandbox
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
index 33dd825..4acd977 100644
--- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
+++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
@@ -69,7 +69,7 @@
</ItemGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
index 22655f0..1c92117 100644
--- a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Tests.Spatial
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Spatial.DisjointSpatialFilter))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
index b0036b2..8f6bd1d 100644
--- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
+++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
@@ -65,7 +65,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
index 30ee640..a0baff5 100644
--- a/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Tests.Suggest
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Suggest.IInputIterator))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
index 2eae0bd..a50f1f9 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
@@ -276,12 +276,12 @@ namespace Lucene.Net.Index
public override void Run()
{
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Latch.Wait();
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// }
// catch (ThreadInterruptedException e) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs
index fab5367..ade3e46 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs
@@ -264,12 +264,12 @@ namespace Lucene.Net.Index
Ctrl.WaitIfStalled();
if (CheckPoint.Get())
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
Assert.IsTrue(Sync.await());
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
catch (ThreadInterruptedException e)
{
@@ -327,7 +327,7 @@ namespace Lucene.Net.Index
{
Assert.IsTrue(Sync.await());
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
catch (ThreadInterruptedException e)
{
Console.WriteLine("[Updater] got interrupted - wait count: " + Sync.Waiter.CurrentCount);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index 8010e70..963dc7d 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -778,7 +778,7 @@ namespace Lucene.Net.Index
dir.Dispose();
}
-#if !NETSTANDARD1_5 //NOTE: Cannot set ThreadPriority in .NET Core.
+#if !NETSTANDARD1_6 //NOTE: Cannot set ThreadPriority in .NET Core.
// LUCENE-1036
[Test]
public virtual void TestMaxThreadPriority()
@@ -1311,7 +1311,7 @@ namespace Lucene.Net.Index
AllowInterrupt = true;
}
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
catch (ThreadInterruptedException re)
{
// NOTE: important to leave this verbosity/noise
@@ -1357,7 +1357,7 @@ namespace Lucene.Net.Index
{
w.Rollback();
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
// LUCENENET TODO: Is this the right decision here, or is IndexWriter
// supposed to swallow ThreadInterruptedException?
@@ -1433,7 +1433,7 @@ namespace Lucene.Net.Index
public virtual void TestThreadInterruptDeadlock()
{
#if DEBUG
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
fail("LUCENENET TODO: Uncaught exceptions on background thread causing test runner crash");
#endif
#endif
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs
index 389027a..692cb31 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs
@@ -201,12 +201,12 @@ namespace Lucene.Net.Index
public override void Run()
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
Latch.Wait();
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
catch (ThreadInterruptedException e)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index f4c1205..d9c3c1b 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -507,12 +507,12 @@ namespace Lucene.Net.Index
{
for (int i = 0; i < OuterInstance.NumThreads; i++)
{
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Threads[i].Join();
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// }
// catch (ThreadInterruptedException ie) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index fe5730d..65480f9 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -114,12 +114,12 @@ namespace Lucene.Net.Index
if (ioe.Message.StartsWith("fake disk full at", StringComparison.Ordinal) || ioe.Message.Equals("now failing on purpose", StringComparison.Ordinal))
{
DiskFull = true;
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Thread.Sleep(1);
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// }
// catch (ThreadInterruptedException ie) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestPostingsFormat.cs b/src/Lucene.Net.Tests/Index/TestPostingsFormat.cs
index 64a0f3c..00601ab 100644
--- a/src/Lucene.Net.Tests/Index/TestPostingsFormat.cs
+++ b/src/Lucene.Net.Tests/Index/TestPostingsFormat.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.Index
public override void TestRandom()
{
#if DEBUG
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
fail("LUCENENET TODO: Fatally crashes NUnit");
#endif
#endif
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
index 105f355..53d1888 100644
--- a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
@@ -233,12 +233,12 @@ namespace Lucene.Net.Index
}
}
}
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Thread.Sleep(1);
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// }
// catch (ThreadInterruptedException ie) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/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 589c39a..58efbe4 100644
--- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
+++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
@@ -69,7 +69,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
index a9edd4f..c4a4646 100644
--- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
@@ -276,7 +276,7 @@ namespace Lucene.Net.Search
nrtDeletesThread = new ControlledRealTimeReopenThread<IndexSearcher>(genWriter, nrtDeletes, maxReopenSec, minReopenSec);
nrtDeletesThread.Name = "NRTDeletes Reopen Thread";
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
nrtDeletesThread.Priority = (ThreadPriority)Math.Min((int)Thread.CurrentThread.Priority + 2, (int)ThreadPriority.Highest);
#endif
nrtDeletesThread.SetDaemon(true);
@@ -284,7 +284,7 @@ namespace Lucene.Net.Search
nrtNoDeletesThread = new ControlledRealTimeReopenThread<IndexSearcher>(genWriter, nrtNoDeletes, maxReopenSec, minReopenSec);
nrtNoDeletesThread.Name = "NRTNoDeletes Reopen Thread";
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
nrtNoDeletesThread.Priority = (ThreadPriority)Math.Min((int)Thread.CurrentThread.Priority + 2, (int)ThreadPriority.Highest);
#endif
nrtNoDeletesThread.SetDaemon(true);
@@ -492,12 +492,12 @@ namespace Lucene.Net.Search
public override void Run()
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
thread.WaitForGeneration(lastGen);
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
catch (ThreadInterruptedException ie)
{
@@ -527,7 +527,7 @@ namespace Lucene.Net.Search
public override void UpdateDocument(Term term, IEnumerable<IIndexableField> doc, Analyzer analyzer)
{
base.UpdateDocument(term, doc, analyzer);
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
@@ -536,7 +536,7 @@ namespace Lucene.Net.Search
signal.Reset(signal.CurrentCount == 0 ? 0 : signal.CurrentCount - 1);
latch.Wait();
}
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// }
// catch (ThreadInterruptedException) // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
index 14d6a55..9cfc312 100644
--- a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
@@ -353,7 +353,7 @@ namespace Lucene.Net.Search
public override IndexSearcher NewSearcher(IndexReader r)
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
@@ -362,7 +362,7 @@ namespace Lucene.Net.Search
awaitEnterWarm.Signal();
awaitClose.Wait();
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
#pragma warning disable 168
catch (ThreadInterruptedException e)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs b/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs
index c3ad145..5cc3304 100644
--- a/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs
@@ -411,7 +411,7 @@ namespace Lucene.Net.Search
//{
ThreadClass.Sleep(slowdown);
// }
-//#if NETSTANDARD1_5
+//#if NETSTANDARD1_6
// catch (Exception)
// {
// throw;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
index b7dcff3..af7a4a6 100644
--- a/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Analyzer))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs b/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs
index 37c37c1..8c4e445 100644
--- a/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs
+++ b/src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs
@@ -55,12 +55,12 @@ namespace Lucene.Net
public override void Run()
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
Thread.Sleep(10000);
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
#pragma warning disable 168
catch (ThreadInterruptedException e)
@@ -151,12 +151,12 @@ namespace Lucene.Net
{
while (true)
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
Thread.Sleep(1000);
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
#pragma warning disable 168
catch (ThreadInterruptedException e)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Util/TestSetOnce.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Util/TestSetOnce.cs b/src/Lucene.Net.Tests/Util/TestSetOnce.cs
index 5473e45..8cccb2a 100644
--- a/src/Lucene.Net.Tests/Util/TestSetOnce.cs
+++ b/src/Lucene.Net.Tests/Util/TestSetOnce.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Util
set.Set(new Integer(Convert.ToInt32(Name.Substring(2), CultureInfo.InvariantCulture)));
success = true;
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
catch (ThreadInterruptedException)
{
// ignore
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs
index 10cbfb7..f2defa3 100644
--- a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs
+++ b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs
@@ -136,7 +136,7 @@ namespace Lucene.Net.Util
int size = map.Count;
for (int i = 0; size > 0 && i < 10; i++)
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
@@ -155,7 +155,7 @@ namespace Lucene.Net.Util
Assert.IsTrue(size >= c, "previousSize(" + size + ")>=iteratorSize(" + c + ")");
Assert.IsTrue(c >= newSize, "iteratorSize(" + c + ")>=newSize(" + newSize + ")");
size = newSize;
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
#pragma warning disable 168
catch (ThreadInterruptedException ie)
@@ -251,7 +251,7 @@ namespace Lucene.Net.Util
int size = map.Count;
for (int i = 0; size > 0 && i < 10; i++)
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
@@ -270,7 +270,7 @@ namespace Lucene.Net.Util
Assert.IsTrue(size >= c, "previousSize(" + size + ")>=iteratorSize(" + c + ")");
Assert.IsTrue(c >= newSize, "iteratorSize(" + c + ")>=newSize(" + newSize + ")");
size = newSize;
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
#pragma warning disable 168
catch (ThreadInterruptedException ie)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs b/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
index 7044b9d..6549039 100644
--- a/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
@@ -307,12 +307,12 @@ namespace Lucene.Net.Index
{
while (flushingWriters.Count != 0)
{
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Monitor.Wait(this);
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException e)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterStallControl.cs b/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
index 84eacc9..a91cd0d 100644
--- a/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
@@ -80,7 +80,7 @@ namespace Lucene.Net.Index
if (stalled) // react on the first wakeup call!
{
// don't loop here, higher level logic will re-stall!
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
@@ -91,7 +91,7 @@ namespace Lucene.Net.Index
Monitor.Wait(this);
result = DecrWaiters();
Debug.Assert(result);
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException e)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs
index c69c6b0..9811ee3 100644
--- a/src/Lucene.Net/Index/IndexWriter.cs
+++ b/src/Lucene.Net/Index/IndexWriter.cs
@@ -1186,14 +1186,14 @@ namespace Lucene.Net.Index
if (waitForMerges)
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
// Give merge scheduler last chance to run, in case
// any pending merges are waiting:
mergeScheduler.Merge(this, MergeTrigger.CLOSING, false);
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
catch (ThreadInterruptedException)
{
@@ -1211,13 +1211,13 @@ namespace Lucene.Net.Index
{
for (; ; )
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
FinishMerges(waitForMerges && !interrupted);
break;
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
catch (ThreadInterruptedException)
{
@@ -1298,7 +1298,7 @@ namespace Lucene.Net.Index
// finally, restore interrupt status:
if (interrupted)
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
Thread.CurrentThread.Interrupt();
#endif
}
@@ -5373,12 +5373,12 @@ namespace Lucene.Net.Index
// fails to be called, we wait for at most 1 second
// and then return so caller can check if wait
// conditions are satisfied:
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Monitor.Wait(this, TimeSpan.FromMilliseconds(1000));
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException ie)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Index/MergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MergePolicy.cs b/src/Lucene.Net/Index/MergePolicy.cs
index 807687b..efcc91d 100644
--- a/src/Lucene.Net/Index/MergePolicy.cs
+++ b/src/Lucene.Net/Index/MergePolicy.cs
@@ -301,14 +301,14 @@ namespace Lucene.Net.Index
while (paused)
{
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
// In theory we could wait() indefinitely, but we
// do 1000 msec, defensively
Monitor.Wait(this, TimeSpan.FromMilliseconds(1000));
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException ie)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Index/TaskMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/TaskMergeScheduler.cs b/src/Lucene.Net/Index/TaskMergeScheduler.cs
index a446b3d..e875650 100644
--- a/src/Lucene.Net/Index/TaskMergeScheduler.cs
+++ b/src/Lucene.Net/Index/TaskMergeScheduler.cs
@@ -115,7 +115,7 @@ namespace Lucene.Net.Index
{
get
{
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
return 2;
#else
return (int)ThreadPriority.Normal;
@@ -367,7 +367,7 @@ namespace Lucene.Net.Index
return;
}
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
@@ -378,7 +378,7 @@ namespace Lucene.Net.Index
// so, we sleep here to avoid saturating CPU in such
// cases:
Thread.Sleep(250);
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException ie)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Lucene.Net.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 0ff784c..847cbc6 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -24,9 +24,9 @@
<Import Project="..\..\Version.proj" />
<PropertyGroup>
- <TargetFrameworks>netstandard2.0;netstandard1.5;net45</TargetFrameworks>
- <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
- <!--<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.0</NetStandardImplicitPackageVersion>-->
+ <TargetFrameworks>netstandard2.0;netstandard1.6;net45</TargetFrameworks>
+ <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+ <!--<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>-->
<AssemblyTitle>Lucene.Net</AssemblyTitle>
<Description>Lucene.Net is a full-text search engine library capable of advanced text analysis, indexing, and searching. It can be used to easily add search capabilities to applications. Lucene.Net is a C# port of the popular Java Lucene search engine framework from The Apache Software Foundation, targeted at .NET Framework and .NET Core users.</Description>
@@ -52,9 +52,9 @@
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
- <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.0.0-rc2-final" />
+ <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="System.Collections.NonGeneric" Version="4.0.1" />
<PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
@@ -73,7 +73,7 @@
<DebugType>portable</DebugType>
</PropertyGroup>
- <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs b/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs
index a238bd7..a28c59b 100644
--- a/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs
@@ -116,12 +116,12 @@ namespace Lucene.Net.Search
{
finish = true;
reopenCond.Set();
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Join();
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException ie)
// {
@@ -226,12 +226,12 @@ namespace Lucene.Net.Search
long sleepNS = nextReopenStartNS - Time.NanoTime();
if (sleepNS > 0)
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
try
{
#endif
reopenCond.WaitOne(TimeSpan.FromMilliseconds(sleepNS / Time.MILLISECONDS_PER_NANOSECOND));//Convert NS to Ticks
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
}
#pragma warning disable 168
catch (ThreadInterruptedException ie)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Search/IndexSearcher.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/IndexSearcher.cs b/src/Lucene.Net/Search/IndexSearcher.cs
index 66e73a2..0da6522 100644
--- a/src/Lucene.Net/Search/IndexSearcher.cs
+++ b/src/Lucene.Net/Search/IndexSearcher.cs
@@ -910,7 +910,7 @@ namespace Lucene.Net.Search
return true;
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
catch (ThreadInterruptedException e)
{
throw new ThreadInterruptedException(e.ToString(), e);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Search/TimeLimitingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Search/TimeLimitingCollector.cs b/src/Lucene.Net/Search/TimeLimitingCollector.cs
index 4044249..b72d2a3 100644
--- a/src/Lucene.Net/Search/TimeLimitingCollector.cs
+++ b/src/Lucene.Net/Search/TimeLimitingCollector.cs
@@ -328,12 +328,12 @@ namespace Lucene.Net.Search
{
// TODO: Use System.nanoTime() when Lucene moves to Java SE 5.
counter.AddAndGet(resolution);
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Thread.Sleep(TimeSpan.FromMilliseconds(Interlocked.Read(ref resolution)));
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException ie)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Store/Lock.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/Lock.cs b/src/Lucene.Net/Store/Lock.cs
index 05bfb73..17717c9 100644
--- a/src/Lucene.Net/Store/Lock.cs
+++ b/src/Lucene.Net/Store/Lock.cs
@@ -136,12 +136,12 @@ namespace Lucene.Net.Store
throw e;
}
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Thread.Sleep(TimeSpan.FromMilliseconds(LOCK_POLL_INTERVAL));
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException ie)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Store/RateLimiter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Store/RateLimiter.cs b/src/Lucene.Net/Store/RateLimiter.cs
index 5810774..e95d432 100644
--- a/src/Lucene.Net/Store/RateLimiter.cs
+++ b/src/Lucene.Net/Store/RateLimiter.cs
@@ -126,12 +126,12 @@ namespace Lucene.Net.Store
var pauseNS = targetNS - curNS;
if (pauseNS > 0)
{
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
// try
// {
//#endif
Thread.Sleep(TimeSpan.FromMilliseconds(pauseNS / 1000000));
-//#if !NETSTANDARD1_5 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
+//#if !NETSTANDARD1_6 // LUCENENET NOTE: Senseless to catch and rethrow the same exception type
// }
// catch (ThreadInterruptedException ie)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Support/AssemblyUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/AssemblyUtils.cs b/src/Lucene.Net/Support/AssemblyUtils.cs
index a0e3b14..4d91f9e 100644
--- a/src/Lucene.Net/Support/AssemblyUtils.cs
+++ b/src/Lucene.Net/Support/AssemblyUtils.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
using Microsoft.Extensions.DependencyModel;
#endif
@@ -26,7 +26,7 @@ namespace Lucene.Net.Support
// hoping would be loaded hasn't been loaded yet into the app domain,
// it is unavailable. So we go to the next level on each and check each referenced
// assembly.
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
var dependencyContext = DependencyContext.Default;
var assemblyNames = dependencyContext.RuntimeLibraries
.SelectMany(lib => lib.GetDefaultAssemblyNames(dependencyContext))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Support/IO/MemoryMappedFileByteBuffer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/IO/MemoryMappedFileByteBuffer.cs b/src/Lucene.Net/Support/IO/MemoryMappedFileByteBuffer.cs
index 5292db8..d458c19 100644
--- a/src/Lucene.Net/Support/IO/MemoryMappedFileByteBuffer.cs
+++ b/src/Lucene.Net/Support/IO/MemoryMappedFileByteBuffer.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.Support.IO
return accessor.ReadByte(Ix(CheckIndex(index)));
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
// Implementation provided by Vincent Van Den Berghe: http://git.net/ml/general/2017-02/msg31639.html
public override ByteBuffer Get(byte[] dst, int offset, int length)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs b/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs
index 254e767..7c78609 100644
--- a/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs
+++ b/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Support.IO
}
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
public override void Close()
{
Run(() => textWriter.Close());
@@ -119,7 +119,7 @@ namespace Lucene.Net.Support.IO
return Run(() => textWriter.GetHashCode());
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
public override object InitializeLifetimeService()
{
return Run(() => textWriter.InitializeLifetimeService());
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Support/SimpleStringInterner.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/SimpleStringInterner.cs b/src/Lucene.Net/Support/SimpleStringInterner.cs
index 8550b93..33c0f3e 100644
--- a/src/Lucene.Net/Support/SimpleStringInterner.cs
+++ b/src/Lucene.Net/Support/SimpleStringInterner.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Support
// insertion-order cache: add new entry at head
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
s = String.Intern(s);
#endif
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Support/StringExtensions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/StringExtensions.cs b/src/Lucene.Net/Support/StringExtensions.cs
index c4cc7da..0b7c435 100644
--- a/src/Lucene.Net/Support/StringExtensions.cs
+++ b/src/Lucene.Net/Support/StringExtensions.cs
@@ -170,7 +170,7 @@ namespace Lucene.Net.Support
/// LUCENENET specific.
/// </summary>
private static StringInterner interner =
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
new SimpleStringInterner(1024, 8);
#else
new StringInterner();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Support/StringInterner.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/StringInterner.cs b/src/Lucene.Net/Support/StringInterner.cs
index cd51261..2549395 100644
--- a/src/Lucene.Net/Support/StringInterner.cs
+++ b/src/Lucene.Net/Support/StringInterner.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Support
/// <summary>Returns a single object instance for each equal string. </summary>
public virtual System.String Intern(System.String s)
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
return String.Intern(s);
#else
throw new PlatformNotSupportedException("String.Intern not supported. Use SimpleStringInterner.");
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Support/Threading/ThreadClass.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/Threading/ThreadClass.cs b/src/Lucene.Net/Support/Threading/ThreadClass.cs
index 01b01e3..cdb3cb2 100644
--- a/src/Lucene.Net/Support/Threading/ThreadClass.cs
+++ b/src/Lucene.Net/Support/Threading/ThreadClass.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.Support.Threading
/// </summary>
public virtual void Interrupt()
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
_threadField.Interrupt();
#endif
}
@@ -133,7 +133,7 @@ namespace Lucene.Net.Support.Threading
_threadField.IsBackground = isDaemon;
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
/// <summary>
/// Gets or sets a value indicating the scheduling priority of a thread
/// </summary>
@@ -224,7 +224,7 @@ namespace Lucene.Net.Support.Threading
Monitor.PulseAll(_threadField);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
/// <summary>
/// Raises a ThreadAbortException in the thread on which it is invoked,
@@ -263,7 +263,7 @@ namespace Lucene.Net.Support.Threading
/// <returns>A String that represents the current object</returns>
public override System.String ToString()
{
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
return "Thread[" + Name + "," + Priority.ToString() + "]";
#else
return "Thread[" + Name + "]";
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net/Util/IOUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Util/IOUtils.cs b/src/Lucene.Net/Util/IOUtils.cs
index 125084f..115ea08 100644
--- a/src/Lucene.Net/Util/IOUtils.cs
+++ b/src/Lucene.Net/Util/IOUtils.cs
@@ -568,13 +568,13 @@ namespace Lucene.Net.Util
// {
// throw;
// }
- //#if !NETSTANDARD1_5
+ //#if !NETSTANDARD1_6
// try
// {
//#endif
// // Pause 5 msec
// Thread.Sleep(5);
- //#if !NETSTANDARD1_5
+ //#if !NETSTANDARD1_6
// }
// catch (ThreadInterruptedException ie)
// {
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
----------------------------------------------------------------------
diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
index bd92c52..979a016 100644
--- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
+++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
@@ -24,9 +24,9 @@
<Import Project="..\..\..\Version.proj" />
<PropertyGroup>
- <TargetFrameworks>netstandard1.5;net45</TargetFrameworks>
- <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
- <!--<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.0</NetStandardImplicitPackageVersion>-->
+ <TargetFrameworks>netstandard1.6;net45</TargetFrameworks>
+ <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+ <!--<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>-->
<AssemblyTitle>Lucene.Net.ICU</AssemblyTitle>
<Description>International Components for Unicode-based features including Thai analyzer support, an international postings highlighter, and BreakIterator support for the vector highlighter for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -74,12 +74,12 @@
<DebugType>portable</DebugType>
</PropertyGroup>-->
- <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PackageReference Include="System.Globalization" Version="4.3.0" />
<PackageReference Include="System.Net.Primitives" Version="4.3.0" />
</ItemGroup>
- <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
----------------------------------------------------------------------
diff --git a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
index 0b0e8d8..701d28f 100644
--- a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
+++ b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
@@ -3,9 +3,9 @@
<Import Project="..\..\..\Version.proj" />
<PropertyGroup>
- <TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
- <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
- <!--<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>-->
+ <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+ <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+ <!--<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>-->
<AssemblyTitle>Lucene.Net.Replicator.AspNetCore</AssemblyTitle>
<Description>AspNetCore integration of Lucene.Net.Replicator for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -39,7 +39,7 @@
<DebugType>portable</DebugType>
</PropertyGroup>-->
- <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+ <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj
----------------------------------------------------------------------
diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj
index c858730..4d54a53 100644
--- a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj
+++ b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj
@@ -81,7 +81,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
- <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_5</DefineConstants>
+ <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants>
<DebugType>portable</DebugType>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
index 479f52c..19b1b32 100644
--- a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
+++ b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
@@ -86,7 +86,7 @@ namespace Lucene.Net.Support
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Support.BreakIterator))]
public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)