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:28 UTC

[01/10] lucenenet git commit: lucene-cli: Added basic install instructions to the documentation.

Repository: lucenenet
Updated Branches:
  refs/heads/master d5ea2010a -> 7f0a04103


lucene-cli: Added basic install instructions to the documentation.


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

Branch: refs/heads/master
Commit: be7fb88340f9387ba61d5461460dc986d5277838
Parents: d5ea201
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Oct 19 14:11:55 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Oct 19 19:39:23 2017 +0700

----------------------------------------------------------------------
 src/dotnet/tools/lucene-cli/docs/index.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/be7fb883/src/dotnet/tools/lucene-cli/docs/index.md
----------------------------------------------------------------------
diff --git a/src/dotnet/tools/lucene-cli/docs/index.md b/src/dotnet/tools/lucene-cli/docs/index.md
index 933336f..05e08fa 100644
--- a/src/dotnet/tools/lucene-cli/docs/index.md
+++ b/src/dotnet/tools/lucene-cli/docs/index.md
@@ -2,9 +2,13 @@
 
 The Lucene.Net command line interface (CLI) is a new cross-platform toolchain with utilities for maintaining Lucene.Net and demos for learning basic Lucene.Net functionality.
 
+## Prerequisites
+
+- [.NET Core 2.0 Runtime](https://www.microsoft.com/net/download/core#/runtime)
+
 ## Installation
 
-LUCENENET TODO
+Download the binaries from the [Apache Lucene.Net Distribution](http://www.apache.org/dyn/closer.cgi). Unzip the `lucene-cli.zip` file to a local directory and add that directory to the PATH environment variable of the local system.
 
 ## CLI Commands
 


[04/10] lucenenet git commit: API: Lucene.Net.QueryParser.Flexible: Added an overload of type StringBuilder for all ICharSequence-based methods and constructors (closes LUCENENET-592).

Posted by ni...@apache.org.
API: Lucene.Net.QueryParser.Flexible: Added an overload of type StringBuilder for all ICharSequence-based methods and constructors (closes LUCENENET-592).


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

Branch: refs/heads/master
Commit: 5b2480a440c1037825ab2caae5fe16e22cc6e7ba
Parents: 6719968
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Oct 19 22:37:59 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Oct 19 23:16:58 2017 +0700

----------------------------------------------------------------------
 .../Flexible/Core/Nodes/FieldQueryNode.cs       | 17 ++++++++++-
 .../Flexible/Core/Nodes/FuzzyQueryNode.cs       | 16 +++++++++++
 .../Flexible/Core/Nodes/QuotedFieldQueryNode.cs | 17 ++++++++++-
 .../Flexible/Core/Util/UnescapedCharSequence.cs | 30 +++++++++++++++-----
 .../Standard/Nodes/PrefixWildcardQueryNode.cs   | 17 ++++++++++-
 .../Flexible/Standard/Nodes/RegexpQueryNode.cs  | 17 ++++++++++-
 .../Standard/Nodes/WildcardQueryNode.cs         | 17 ++++++++++-
 7 files changed, 119 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5b2480a4/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
index 5e1731f..c819a05 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.QueryParsers.Flexible.Core.Parser;
 using Lucene.Net.Support;
 using System.Globalization;
+using System.Text;
 
 namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 {
@@ -61,7 +62,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
          // LUCENENET specific overload for passing text as string
         public FieldQueryNode(string field, string text, int begin,
             int end)
-            : this(field, new StringCharSequenceWrapper(text), begin, end)
+            : this(field, text.ToCharSequence(), begin, end)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="field">field name</param>
+        /// <param name="text">value</param>
+        /// <param name="begin">position in the query string</param>
+        /// <param name="end">position in the query string</param>
+         // LUCENENET specific overload for passing text as StringBuilder
+        public FieldQueryNode(string field, StringBuilder text, int begin,
+            int end)
+            : this(field, text.ToCharSequence(), begin, end)
         {
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5b2480a4/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
index fb4ba7f..2618ee3 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
@@ -1,5 +1,6 @@
 using Lucene.Net.QueryParsers.Flexible.Core.Parser;
 using Lucene.Net.Support;
+using System.Text;
 
 namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 {
@@ -53,6 +54,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         /// <param name="minSimilarity">similarity value</param>
         /// <param name="begin">position in the query string</param>
         /// <param name="end">position in the query string</param>
+         // LUCENENET specific overload for StringBuilder term
+        public FuzzyQueryNode(string field, StringBuilder term,
+            float minSimilarity, int begin, int end)
+            : this(field, term.ToCharSequence(), minSimilarity, begin, end)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="field">Name of the field query will use.</param>
+        /// <param name="term">Term token to use for building term for the query</param>
+        /// <param name="minSimilarity">similarity value</param>
+        /// <param name="begin">position in the query string</param>
+        /// <param name="end">position in the query string</param>
         public FuzzyQueryNode(string field, ICharSequence term,
             float minSimilarity, int begin, int end)
             : base(field, term, begin, end)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5b2480a4/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
index 2217b66..0e37fde 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
@@ -1,5 +1,6 @@
 using Lucene.Net.QueryParsers.Flexible.Core.Parser;
 using Lucene.Net.Support;
+using System.Text;
 
 namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
 {
@@ -33,7 +34,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         /// <param name="text">value</param>
         /// <param name="begin">position in the query string</param>
         /// <param name="end">position in the query string</param>
-        // LUCENENET specific overload for text string
+        // LUCENENET specific overload for string text
         public QuotedFieldQueryNode(string field, string text, int begin,
             int end)
             : this(field, text.ToCharSequence(), begin, end)
@@ -47,6 +48,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
         /// <param name="text">value</param>
         /// <param name="begin">position in the query string</param>
         /// <param name="end">position in the query string</param>
+        // LUCENENET specific overload for StringBuilder text
+        public QuotedFieldQueryNode(string field, StringBuilder text, int begin,
+            int end)
+            : this(field, text.ToCharSequence(), begin, end)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="field">field name</param>
+        /// <param name="text">value</param>
+        /// <param name="begin">position in the query string</param>
+        /// <param name="end">position in the query string</param>
         public QuotedFieldQueryNode(string field, ICharSequence text, int begin,
             int end)
             : base(field, text, begin, end)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5b2480a4/src/Lucene.Net.QueryParser/Flexible/Core/Util/UnescapedCharSequence.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Util/UnescapedCharSequence.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Util/UnescapedCharSequence.cs
index cf5d2be..a13f9bf 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Util/UnescapedCharSequence.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Util/UnescapedCharSequence.cs
@@ -57,9 +57,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Util
         }
 
         /// <summary>
-        /// Create a non-escaped <see cref="ICharSequence"/>
+        /// Create a non-escaped <see cref="string"/>
         /// </summary>
-         // LUCENENET specific overload for text as string
+        // LUCENENET specific overload for text as string
         public UnescapedCharSequence(string text)
         {
             this.chars = new char[text.Length];
@@ -72,19 +72,35 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Util
         }
 
         /// <summary>
-        /// Create a copy of an existent <see cref="UnescapedCharSequence"/>
+        /// Create a non-escaped <see cref="StringBuilder"/>
         /// </summary>
-        private UnescapedCharSequence(UnescapedCharSequence text)
+        // LUCENENET specific overload for text as StringBuilder
+        public UnescapedCharSequence(StringBuilder text)
         {
             this.chars = new char[text.Length];
             this.wasEscaped = new bool[text.Length];
-            for (int i = 0; i <= text.Length; i++)
+            for (int i = 0; i < text.Length; i++)
             {
-                this.chars[i] = text.chars[i];
-                this.wasEscaped[i] = text.wasEscaped[i];
+                this.chars[i] = text[i];
+                this.wasEscaped[i] = false;
             }
         }
 
+        // LUCENENET specific - not needed (see LUCENENET-592)
+        ///// <summary>
+        ///// Create a copy of an existent <see cref="UnescapedCharSequence"/>
+        ///// </summary>
+        //private UnescapedCharSequence(UnescapedCharSequence text)
+        //{
+        //    this.chars = new char[text.Length];
+        //    this.wasEscaped = new bool[text.Length];
+        //    for (int i = 0; i <= text.Length; i++)
+        //    {
+        //        this.chars[i] = text.chars[i];
+        //        this.wasEscaped[i] = text.wasEscaped[i];
+        //    }
+        //}
+
         //public char CharAt(int index) // LUCENENET specific - replaced with this[index]
         //{
         //    return this.chars[index];

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5b2480a4/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
index 99da6a9..c512efc 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
@@ -1,5 +1,6 @@
 using Lucene.Net.QueryParsers.Flexible.Core.Nodes;
 using Lucene.Net.Support;
+using System.Text;
 
 namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 {
@@ -38,7 +39,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         // LUCENENET specific overload for passing text as string
         public PrefixWildcardQueryNode(string field, string text,
             int begin, int end)
-            : this(field, new StringCharSequenceWrapper(text), begin, end)
+            : this(field, text.ToCharSequence(), begin, end)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="field">field name</param>
+        /// <param name="text">value including the wildcard</param>
+        /// <param name="begin">position in the query string</param>
+        /// <param name="end">position in the query string</param>
+        // LUCENENET specific overload for passing text as StringBuilder
+        public PrefixWildcardQueryNode(string field, StringBuilder text,
+            int begin, int end)
+            : this(field, text.ToCharSequence(), begin, end)
         {
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5b2480a4/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
index bd434c4..e81b948 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/RegexpQueryNode.cs
@@ -2,6 +2,7 @@
 using Lucene.Net.QueryParsers.Flexible.Core.Parser;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
+using System.Text;
 
 namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 {
@@ -40,7 +41,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         // LUCENENET specific overload for passing text as string
         public RegexpQueryNode(string field, string text, int begin,
             int end)
-            : this(field, new StringCharSequenceWrapper(text), begin, end)
+            : this(field, text.ToCharSequence(), begin, end)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="field">field name</param>
+        /// <param name="text">value that contains a regular expression</param>
+        /// <param name="begin">position in the query string</param>
+        /// <param name="end">position in the query string</param>
+        // LUCENENET specific overload for passing text as StringBuilder
+        public RegexpQueryNode(string field, StringBuilder text, int begin,
+            int end)
+            : this(field, text.ToCharSequence(), begin, end)
         {
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5b2480a4/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
index 5cb764d..b1bb957 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.QueryParsers.Flexible.Core.Nodes;
 using Lucene.Net.QueryParsers.Flexible.Core.Parser;
 using Lucene.Net.Support;
+using System.Text;
 
 namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
 {
@@ -37,7 +38,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
         // LUCENENET specific overload for passing text as string
         public WildcardQueryNode(string field, string text, int begin,
             int end)
-            : this(field, new StringCharSequenceWrapper(text), begin, end)
+            : this(field, text.ToCharSequence(), begin, end)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="field">field name</param>
+        /// <param name="text">value that contains one or more wild card characters (? or *)</param>
+        /// <param name="begin">position in the query string</param>
+        /// <param name="end">position in the query string</param>
+        // LUCENENET specific overload for passing text as StringBuilder
+        public WildcardQueryNode(string field, StringBuilder text, int begin,
+            int end)
+            : this(field, text.ToCharSequence(), begin, end)
         {
         }
 


[09/10] lucenenet git commit: SWEEP: Upgraded NuGet dependencies to latest stable version

Posted by ni...@apache.org.
SWEEP: Upgraded NuGet dependencies to latest stable version


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

Branch: refs/heads/master
Commit: 233712bf634f3bb256c808866830faf9b1b809dd
Parents: 78c4706
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Oct 20 06:26:04 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Oct 20 17:29:20 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj  |  2 +-
 .../Lucene.Net.QueryParser.csproj               |  2 +-
 .../Lucene.Net.Replicator.csproj                |  2 +-
 .../Lucene.Net.TestFramework.csproj             |  4 ++--
 .../Lucene.Net.Tests.Analysis.Common.csproj     |  2 +-
 .../Lucene.Net.Tests.Analysis.Kuromoji.csproj   |  2 +-
 .../Lucene.Net.Tests.Analysis.Phonetic.csproj   |  2 +-
 .../Lucene.Net.Tests.Analysis.SmartCn.csproj    |  2 +-
 .../Lucene.Net.Tests.Analysis.Stempel.csproj    |  2 +-
 .../Lucene.Net.Tests.Benchmark.csproj           |  2 +-
 .../Lucene.Net.Tests.Classification.csproj      |  2 +-
 .../Lucene.Net.Tests.Codecs.csproj              |  2 +-
 .../Lucene.Net.Tests.Demo.csproj                |  2 +-
 .../Lucene.Net.Tests.Expressions.csproj         |  2 +-
 .../Lucene.Net.Tests.Facet.csproj               |  2 +-
 .../Lucene.Net.Tests.Grouping.csproj            |  2 +-
 .../Lucene.Net.Tests.Highlighter.csproj         |  2 +-
 .../Lucene.Net.Tests.Join.csproj                |  2 +-
 .../Lucene.Net.Tests.Memory.csproj              |  2 +-
 .../Lucene.Net.Tests.Misc.csproj                |  2 +-
 .../Lucene.Net.Tests.Queries.csproj             |  2 +-
 .../Lucene.Net.Tests.QueryParser.csproj         |  2 +-
 .../Lucene.Net.Tests.Replicator.csproj          |  4 ++--
 .../Lucene.Net.Tests.Sandbox.csproj             |  2 +-
 .../Lucene.Net.Tests.Spatial.csproj             |  2 +-
 .../Lucene.Net.Tests.Suggest.csproj             |  2 +-
 src/Lucene.Net.Tests/Lucene.Net.Tests.csproj    |  2 +-
 src/Lucene.Net/Lucene.Net.csproj                | 20 ++++++++++----------
 .../Lucene.Net.Tests.ICU.csproj                 |  2 +-
 .../Lucene.Net.Tests.Cli.csproj                 |  2 +-
 30 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
index a3758c3..be2532c 100644
--- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
+++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
@@ -56,7 +56,7 @@
   </PropertyGroup>-->
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
index 7c70c55..468131c 100644
--- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
+++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
@@ -60,7 +60,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.0.1" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
index 9e4f832..d663475 100644
--- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
+++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
@@ -53,7 +53,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
   <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index 3845413..d414b3f 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -66,8 +66,8 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="System.Diagnostics.StackTrace" Version="4.0.1" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
+    <PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
+    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index feeff4e..ef17941 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
index 4ff4906..2f251a3 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
index 498e351..3f5a803 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
@@ -53,7 +53,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj
index ef4a5e5d..202d907 100644
--- a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj
+++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj
@@ -53,7 +53,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
   
   <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
index ebd4f6a..988e9e9 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
index 1cebdd9..b673582 100644
--- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
+++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
@@ -58,7 +58,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
   
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
index b1d0722..432f4fb 100644
--- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
+++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 16387ad..4a02eb1 100644
--- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
+++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
index 85e70aa..ebb4ca7 100644
--- a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
+++ b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
index 0564757..0fb9c1c 100644
--- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
+++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
index 30ad1c1..60bf222 100644
--- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
+++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
index bc2f293..62ec7d6 100644
--- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
+++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
index 3445812..c6852b3 100644
--- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
+++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
@@ -55,7 +55,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
index 048b569..1d34313 100644
--- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
+++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
index b3c3de9..fa1466c 100644
--- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
+++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
@@ -55,7 +55,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
index 60a94e2..9006786 100644
--- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
+++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
@@ -53,7 +53,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 d98226f..afcd30f 100644
--- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
+++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
@@ -53,7 +53,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 f5e8694..6f23eb2 100644
--- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
+++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
@@ -55,7 +55,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 9ad958a..6470320 100644
--- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj
+++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj
@@ -51,12 +51,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="NUnit" Version="3.8.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 627a4ca..a87a815 100644
--- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
+++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
@@ -55,7 +55,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 4891db1..54b33cc 100644
--- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
+++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
@@ -56,7 +56,7 @@
     <PackageReference Include="Spatial4n.Core.NTS" Version="0.4.1-beta00007" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 8f6bd1d..c5a2690 100644
--- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
+++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj
@@ -56,7 +56,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 58efbe4..13a16d7 100644
--- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
+++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj
@@ -60,7 +60,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/Lucene.Net/Lucene.Net.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 1f7681c..8825f84 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -48,22 +48,22 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
   </ItemGroup>
   
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
     <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" />
-    <PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
-    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
-    <PackageReference Include="System.IO.MemoryMappedFiles" Version="4.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
+    <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
+    <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
+    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
+    <PackageReference Include="System.IO.MemoryMappedFiles" Version="4.3.0" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Thread" Version="4.0.0" />
-    <PackageReference Include="System.Threading.ThreadPool" Version="4.0.10" />
+    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
+    <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
   </ItemGroup>
 
   <!-- NOTE: Microsoft's recommendation is not to use the ICloneable interface. We put in a FEATURE_CLONEABLE constant in case anyone wants to add it to the build -->

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/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 4d54a53..a18ac09 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
@@ -67,7 +67,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/233712bf/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
----------------------------------------------------------------------
diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
index fd52b4c..363e65a 100644
--- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
+++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
     <!-- Required by NUnit3TestAdapter on .NET Core -->
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.3" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">


[10/10] lucenenet git commit: Added new .NET Standard targets to README.md (commented out until released)

Posted by ni...@apache.org.
Added new .NET Standard targets to README.md (commented out until released)


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

Branch: refs/heads/master
Commit: 7f0a041039601f54cd7c97d927f4451607a86818
Parents: 233712b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Oct 20 17:24:36 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Oct 20 17:29:23 2017 +0700

----------------------------------------------------------------------
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7f0a0410/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 541ae3f..57a34e7 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,14 @@ The Apache Lucene.Net web site is at:
 
 ### Lucene.Net 4.8.0
 
+<!-- TO BE CHANGED TO THIS WHEN RELEASED 
+
+- [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard)
+- [.NET Standard 1.6](https://docs.microsoft.com/en-us/dotnet/standard/net-standard)
+- .NET Framework 4.5
+
+-->
+
 - [.NET Standard 1.5](https://docs.microsoft.com/en-us/dotnet/standard/net-standard)
 - .NET Framework 4.5.1
 


[05/10] lucenenet git commit: Updated CHANGES.txt for 4.8.0-beta0005

Posted by ni...@apache.org.
Updated CHANGES.txt for 4.8.0-beta0005


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

Branch: refs/heads/master
Commit: fd691967e0bb3bbbf6099513f75a4a809529ed2a
Parents: 5b2480a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Oct 19 19:36:35 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Oct 20 01:26:01 2017 +0700

----------------------------------------------------------------------
 CHANGES.txt | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 207 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/fd691967/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5da80a7..b2aa1d0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,210 @@
-=================== Release 4.8.0-beta00004 =====================
+=================== Release 4.8.0-beta00005 =====================
+
+Bug
+•	Added [Obsolete] attribute to Lucene.Net.Field extension methods that are only for
+	pre-4.0 backward compatibility.
+•	BREAKING: Lucene.Net.Search.Similarites.BasicStats: Changed m_field from protected to 
+	private (to match Lucene).
+•	BREAKING: Lucene.Net.Util.MapOfSets: Changed Map property from IDictionary<TKey, HashSet<TValue>> 
+	to IDictionary<TKey, ISet<TValue>> (to match Lucene).
+•	BREAKING: Lucene.Net.Util.OfflineSorter: Changed setter of BufferSize property to private
+	(to match Lucene).
+•	BREAKING: Lucene.Net.Util.RamUsageEstimator.IdentityHashSet<KType>: Changed accessibility 
+	from public to internal (to match Lucene)
+•	BREAKING: Lucene.Net.Search.BitsFilteredDocIdSet: Changed constructor to throw ArgumentNullException 
+	instead of NullReferenceException (.NET convention)
+•	Lucene.Net.Search.ConstantScoreQuery.ConstantWeight: Fixed initialization issue with commented code 
+	in GetValueForNormalization() (that diverged from Lucene)
+•	Lucene.Net.Util.OfflineSorter: Added line to delete the output file (that existed in Lucene).
+•	BREAKING: Lucene.Net.Analysis.Common.Analysis.Util.AbstractAnalysisFactory: Changed return 
+	type of GetSet from ICollection<T> to ISet<T>.
+•[LUCENENET-544] - Turkish stemmer causes an IndexOutOfRange (Reported in prior version, added
+	regression test to show it is no longer an issue).
+•[LUCENENET-544] - replace java doc notation with ms style xml comments notation.
+•	Lucene.Net.Misc: Removed unnecessary dependency on Lucene.Net.Analysis.Common
+•	Lucene.Net.Highlighter: Removed unnecessary dependency on Lucene.Net.Analysis.Common
+•	BREAKING: Lucene.Net.Facet.Taxonomy.TaxonomyReader: Implemented IDisposable and proper dispose pattern.
+	Public Dispose(bool) method removed.
+•	Lucene.Net.Misc.IndexMergeTool: Added try-finally block to properly dispose of directories.
+•[LUCENENET-521] - Concurrency bug with MMapDirectory (added regression test to confirm fix).
+•[LUCENENET-530] - Create a truly Memory Mapped Directory type as MMapDirectory is not really memory mapped
+	Lucene.Net.Store: Fixed MMapDirectory concurrency using solution suggested by Vincent 
+	Van Den Berghe http://apache.markmail.org/message/hafnuhq2ydhfjmi2.
+•	Lucene.Net.Store.LockVerifyServer: Read/write 1 byte instead of 1 int (4 bytes). 
+	Also, we don't need 2 streams in .NET for input/output (solution provided by Vincent Van Den Berghe).
+•	Lucene.Net.TestFramework.Store.MockDirectoryWrapper.IndexInputSlicerAnonymousInnerClassHelper: Fixed Dispose() method.
+•	Lucene.Net.Index.IndexWriter: Fixed string formatting of numeric values in InfoStream message.
+•	Lucene.Net.Tests.Querys.CommonTermsQueryTest: Added missing TestRandomIndex() test
+•	Lucene.Net.Analysis.Common.Analysis.CharFilter.MappingCharFilterFactory: fixed escaping problem in parsing regex
+•	Lucene.Net.Search.SearcherLifetimeManager: Corrected bug in Lifetime reference count
+•	Lucene.Net.Spatial: Removed unnecessary dependencies on GeoAPI and NetTopologySuite
+•[LUCENENET-593] - Refactored Lucene.Net.Util.Constants so OS identification, processor architecture, and 
+	framework identification are more reliable. Searching for environment variables rather than using well-known APIs 
+	was causing a null reference exception on Linux.
+•	Lazily initialize codecs to ensure the correct type is loaded if overridden
+•	Lucene.Net.Search.FieldCacheRangeFilter.AnonymousStringFieldCacheRangeFilter: Fixed Debug.Assert condition that 
+	was causing assert to fail.
+•	Lucene.Net.Tests.Spatial.SpatialArgsTest.CalcDistanceFromErrPct(): Test fails because floating point asserts 
+	didn't contain any delta and the implementation has changed in .NET Core 2.0 so it is no longer on the nose 
+	(but still well within tolerance for floating point numbers).
+•	Lucene.Net.Tests.Index.TestConcurrentMergeScheduler: Fixed FailOnlyOnFlush class to match the original, 
+	which was causing TestFlushExceptions() to fail. Also removed throw statement on a background thread that 
+	was causing a crash.
+•	Lucene.Net.Tests.Search.TestMutiTermConstantScore: Made Small and Reader variables instance members, since 
+	they are being set by instance methods. When they were static, tests could cross threads on the instance.
+•	Lucene.Net.TestFramework.Util.LuceneTestCase: Added missing catch block for UnauthorizedAccessException, 
+	which does not subclass IOException in .NET as was the case in Java.
+•	Lucene.Net.Tests.Index.TestTransactionRollback: Fixed issue where the value passed to substring could 
+	potentially go beyond the length of the string.
+•	Lucene.Net.Benchmark.ByTask.Tasks.TestPerfTasksLogic.TestLocale(): Original test was using no-NO which 
+	is not consistently supported across platforms on .NET. Changed the test (and the documentation) to use nb-NO instead.
+•	Lucene.Net.Tests.Benchmark.ByTask.TestPerfTasksLogic.TestCollator(): Changed culture from no-NO to nb-NO to ensure 
+	it runs consistently between dev and the CI server.
+•	Lucene.Net.Support.DictionaryExtensions: Fixed Store() method to save the date using the InvariantCulture so the 
+	format is unaffected by the ambient culture.
+•	Lucene.Net.TestFramework: Having sequential folder names creates situations where multiple threads are doing 
+	operations on the same folder at the same time. Changed implementation to use GetRandomFileName() to append 
+	a random string instead of an incremental number.
+•	Lucene.Net.Automaton (BasicAutomata + BasicOperations + MinimizationOperations + SpecialOperations): Corrected 
+	accessibility from internal to public and removed InternalsVisibleTo attributes unneeded as a result of these changes.
+•	Lucene.Net.Tests.Expressions.TestExpressionSorts: Added missing Collections.Shuffle call
+•	Patched behavior of all implementations of String.Split() and Regex.Split() using the .TrimEnd() extension method. 
+	In Java, only the empty entries at the end of the array are removed, not all empty entries.
+•	Lucene.Net.Tests.QueryParser.Flexible.Precedence.TestPrecedenceQueryParser: Fixed test to always use 
+	GregorianCalendar and local time zone.
+•	Added TimeZoneInfo.ConvertTime() to corresponding locations where time zone had been set in Lucene.
+•	Lucene.Net.Tests.Search.TestControlledRealTimeReopenThread.DoAfterWriter(): Enabled Thread priority for 
+	.NET Core 2.0 tests
+•	Lucene.Net.Tests.Search.TestMultiTermConstantScore: Added check to ensure a null instance variable 
+	doesn't cause the AfterClass method to fail
+•	Lucene.Net.Index (ConcurrentMergeScheduler + TaskMergeScheduler): Fixed null reference exception 
+	due to synchronization of list across threads.
+	
+Improvement
+•	BREAKING: Changed namespace of Collections class from Lucene.Net to Lucene.Net.Support.
+•	BREAKING: Changed namespace of IcuBreakIterator class from Lucene.Net to Lucene.Net.Support.
+•	Fixed several broken XML documentation comment issues.
+•	Lucene.Net.Codecs.MultiLevelSkipListReader: Implemented proper dispose pattern.
+•	BREAKING: Lucene.Net.Index.SegmentCommitInfo: Renamed Files() method to GetFiles().
+•	BREAKING: Lucene.Net.Index.SegmentInfos: Renamed Files() method to GetFiles().
+•	BREAKING: Lucene.Net.Search.Similarities.LMSimilarity.ICollectionModel: Changed Name 
+	property to GetName() method (consistency).
+•	BREAKING: Lucene.Net.Util (PagedBytes + PagedBytes.PagedBytesDataInput + PagedBytes.PagedBytesDataOutput): 
+	Changed Pointer > GetPointer(), Position > GetPosition()
+•	Lucene.Net.Util.PrintStreamInfoStream: Marked obsolete and replaced with class named TextWriterInfoStream.
+•	Lucene.Net.Util.RamUsageEstimator: Added SizeOf() overloads for ulong, uint, and ushort
+•	BREAKING: Lucene.Net.MultiTermQuery: Removed nested ConstantScoreAutoRewrite class, since it is exactly 
+	the same as the non-nested ConstantScoreAutoRewrite class. Made public constructor for ConstantScoreAutoRewrite.
+•	BREAKING: Lucene.Net.Index.SegmentReader.ICoreClosedListener: Renamed ICoreDisposedListener, OnClose() > OnDispose()
+•	Lucene.Net.Search.ReferenceManager: Implemented proper dispose pattern.
+•	Lucene.Net.Util.IOUtils: Added Dispose() and DisposeWhileHandlingException() overloads
+	and marked Close() and CloseWhileHandlingException() overloads [Obsolete].
+•	Lucene.Net.Search.BooleanQuery: Added documentation to show .NET usage of collection initializer.
+•	Lucene.Net.Search.MultiPhraseQuery: Implemented IEnumerable<T> so collection initializer can be used and 
+	added documentation to show usage of collection initializer.
+•	Lucene.Net.Search.PhraseQuery: Implemented IEnumerable<T> so collection initializer can be used and 
+	added documentation to show usage of collection initializer.
+•	Lucene.Net.Search.NGramPhraseQuery: Added documentation to show usage of collection initializer.
+•	Lucene.Net.Queries.CommonTermsQuery: Implemented IEnumerable<T> so collection initializer can be used and 
+	added documentation to show usage of collection initializer.
+•	Lucene.Net.Search.DisjunctionMaxQuery: Added documentation to show usage of collection initializer.
+•	Lucene.Net.Facet.Range.DoubleRangeFacetCounts: Added missing params keyword on ranges constructor argument.
+•	BREAKING: Lucene.Net.Support.MathExtension: Renamed MathExtensions and added overloads of ToRadians() 
+	for decimal and int, and added the ToDegrees() method overloads.
+•	Lucene.Net.Analysis.Stempel: Modified Egothor.Stemmer Compile and DiffIt programs to accept file 
+	encoding on the command line and cleaned up implementation.
+•[Pull Request #207] - Added ReferenceManager<G>.GetContext(), which is similar to ReferenceManager<G>.Acquire() but can be 
+	used in a using block to implicitly dereference instead of having to do it explicitly in a finally block.
+•	Lucene.Net.Support.Document: Added extension methods to make casting to the correct IIndexableField-derived type simpler.
+•	BREAKING: Lucene.Net.Store.FSDirectory: Removed Fsync() method and m_staleFiles variable and all references to them.
+•	Lucene.Net.Store.NativeFSLockFactory: Refactored implementation to utilize locking/sharing features of FileStream in .NET
+	on Windows only - fallback to a different locking strategy on other plaforms. (solution mostly provided by Vincent Van Den Burghe).
+•	Ported StreamTokenizer from Apache Harmony.
+•	Moved SystemProperties class from Lucene.Net.TestFramework to Lucene.Net so the more Java System.properties-like 
+	default value and security exception handling can be used globally
+•	Lucene.Net.Support.Character: Ported Digit(char, int) method from Apache Harmony for use in Lucene.Net.Benchmark.
+•	Lucene.Net.Support.DictionaryExtensions: Added Load and Store methods from Apache Harmony, so an 
+	IDictionary<string, string> can be used the same way the Properties class is used in Java 
+	(saving and loading the same file format).
+•	Lucene.Net.Support.StringTokenizer: Did a fresh port from Apache Harmony and ported tests.
+•	Lucene.Net.Support: Added a SystemConsole class as a stand-in for System.Console, but with the ability to 
+	swap Out and Error to a different destination than System.Out and System.Error.
+•	Lucene.Net.Support.StringExtensions: Added a TrimEnd() method that can be used on string arrays. 
+	This is to mimic Java's Split() method that removes only the null or empty elements from the end 
+	of the array that is returned, but leaves any prior empty elements intact.
+•	Lucene.Net.Support.StringBuilderExtensions: Added IndexOf() extension methods and tests from Apache Harmony.
+•	Lucene.Net.Util.SPIClassIterator: Factored out code to get all non-Microsoft referenced assemblies into a 
+	new class in Support named AssemblyUtils
+•	BREAKING: Lucene.Net.Index.IIndexableField: Renamed FieldType > IndexableFieldType and added additional FieldType 
+	property on Lucene.Net.Documents.Field that returns FieldType rather than IIndexableFieldType so we can avoid casting.
+•	Lucene.Net.Documents.Field: Added similar Number value types as in Java so the numeric types can be stored as object 
+	without boxing/unboxing. Also added overloads for numeric GetXXXValue() fields to IIndexableField so numeric values 
+	can be retrieved without boxing/unboxing.
+•	Lucene.Net.Documents.Field: Added NumericType property that returns an enum so the Field type can be determined without boxing/unboxing. 
+•	Lucene.Net.Documents.Field: Added extension methods GetXXXValueOrDefault() to easily retrieve the numeric value if it is not a 
+	concern that it could be null.
+•	BREAKING: Lucene.Net.Facet.Taxonomy.WriterCache.CharBlockArray: Refactored to use BinaryReader/BinaryWriter for serialzation 
+	and eliminated the 2 serialization support classes StreamUtils and CharBlockArrayConverter
+•	BREAKING: Removed indescriminate use of [Serializable] and chose specific targets to make serializable,
+	namely types that maintain a single value, collection, or array.
+•	BREAKING: Added ICloneable to all places where it was used in Lucene, but made it a compilation option that can be used
+	in custom builds only, since Microsoft discourages use of this interface.
+•	Moved Intern() functionality to StringExtensions rather than using string.Intern() directly.
+•	Eliminated [Debuggable] attribute and added [MethodImpl(MethodImplOptions.NoInlining)] to each potential match 
+	for the StackTraceHelper, which allows tests that use it to work in release mode. Solution provided by Vincent Van Den Berghe.
+•	Changed to new .csproj format and merged Lucene.Net.sln and Lucene.Net.Portable.sln files into one Lucene.Net.sln file.
+•	Require VS 2017+ to load solution
+•	Lucene.Net.Search.Suggest.Analyzing.FSTUtil.Path<T>.Output: Changed accessibility to public. This wasn't made public until 
+	Lucene 5.1, but doing it for 4.8 since it is required by end users.
+•	BREAKING: Lucene.Net.MMapDirectory: Removed UnmapHack/UNMAP_SUPPORTED features since these are not needed in .NET.
+•	Lucene.Net.Suggest.Analyzing.FreeTextSuggester: Changed to use Path.GetRandomFileName() instead of using random 
+	integers to make the file name. Changed to delete the folder using System.IO.Directory.Delete and rearranged 
+	try catch statements so the Lucene Directory disposes before deleting the OS directory.
+•	Lucene.Net.TestFramework.Index.BasePostingsFormatTestCase + Lucene.Net.Suggest.Analyzing 
+	(AnalyzingInfixSuggesterTest + TestFreeTextSuggester) + Lucene.Net.Tests.Index.TestCodecs: 
+	Added using blocks to make the tests run more reliably.
+•	BREAKING: Lucene.Net.Support.IO.FileSupport: Removed unused GetFiles(), GetLuceneIndexFiles(), and Sync() methods
+•	Lucene.Net.Support.IO.FileSupport: Made class static
+•	Lucene.Net.Support.IO.FileSupport: Fixed several issues with CreateTempFile() implementation
+•	Lucene.Net.Support.IO.FileSupport: Added GetCanonicalPath() method + tests
+•	Swapped GetCanonicalPath() call into each of the locations where it was originally used in Lucene
+•	Lucene.Net + Lucene.Net.Facet + Lucene.Net.ICU: Added extension methods to Document class for adding
+	non-obsolete project-related Field types
+•	BREAKING: Lucene.Net.Facet: De-nested DrillSidewaysResult from DrillSideways class
+•	BREAKING: Lucene.Net.Support: Removed CharAt() method from StringCharSequenceWrapper
+•	Lucene.Net.Support: Added StringBuilderCharSequenceWrapper class and StringBuilder.ToCharSequence()
+	extension method.
+•[LUCENENET-592] - Lucene.Net.QueryParser.Flexible: Added an overload of type StringBuilder for all 
+	ICharSequence-based methods and constructors.
+
+New Feature
+•	Lucene.Net.Search.Filter: Added NewAnonymous() method for easy creation of anonymous classes via delegate methods.
+•	Lucene.Net.Search.DocIdSet: Added NewAnonymous() method for easy creation of anonymous classes via delegate methods.
+•	Lucene.Net.Search.Collector: Added Collector.NewAnonymous() method for easy creation of anonymous classes via delegate methods.
+•[LUCENENET-514] - Ported Lucene.Net.Analysis.SmartCn (Smart Chinese Analyzer)
+•[LUCENENET-569] - Ported Lucene.Net.Analysis.Phonetic
+•[LUCENENET-563] - Ported Lucene.Net.Demo (part of lucene-cli utility)
+•[LUCENENET-577] - Port Lock Stress Test CLI Utility (part of lucene-cli utility)
+•[LUCENENET-576] - Port IndexUpgrader CLI Utility (part of lucene-cli utility)
+•[LUCENENET-575] - Port CheckIndex CLI Utility (part of lucene-cli utility)
+•[LUCENENET-582] - Port Index Splitter CLI Utility (part of lucene-cli utility)
+•[LUCENENET-585] - Port High Freq Terms CLI Utility (part of lucene-cli utility)
+•[LUCENENET-584] - Port Get Term Info CLI Utility (part of lucene-cli utility)
+•[LUCENENET-581] - Port Compound File Extractor CLI Utility (part of lucene-cli utility)
+•[LUCENENET-586] - Port Index Merge Tool CLI Utility (part of lucene-cli utility)
+•[LUCENENET-583] - Port Multi-Pass Index Splitter CLI Utility (part of lucene-cli utility)
+•[LUCENENET-579] - Port Print Taxonomy Stats CLI Utility (part of lucene-cli utility)
+•[LUCENENET-578] - Port Lock Verify Server CLI Utility (part of lucene-cli utility)
+•[LUCENENET-588] - Create unified CLI tool (lucene-cli) to wrap all Lucene maintenance tools and demos for .NET
+•[LUCENENET-565 & Pull Request #209] - Port Lucene.Net.Replicator
+•[LUCENENET-567] - Port Lucene.Net.Analysis.Kuromoji
+•	Added Collation features of Lucene.Net.Analysis.ICU to Lucene.Net.ICU (as linked files).
+•[LUCENENET-564] - Port Lucene.Net.Benchmarks
+•	Added .NET Core 2.0 support
+•	Added .NET Framework 4.5 support
+•	Created JavaDocToMarkdownConverter utility to assist with converting java docs to markdown docs for docfx.
+
+=================== Release 4.8.0-beta00004 =====================
 
 Bug
 •	AssemblyVersion and other metadata not being set on .NET Standard assemblies 


[08/10] lucenenet git commit: SWEEP: Removed unnecessary NetStandardImplicitVersion from all project files

Posted by ni...@apache.org.
SWEEP: Removed unnecessary NetStandardImplicitVersion from all project files


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

Branch: refs/heads/master
Commit: 78c47064ceb5de61e78a8da17e655d329669f623
Parents: bf2b3ab
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Oct 20 04:30:38 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Oct 20 17:29:17 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj    | 1 -
 .../Lucene.Net.Analysis.Kuromoji.csproj                             | 1 -
 .../Lucene.Net.Analysis.Phonetic.csproj                             | 1 -
 src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj  | 1 -
 src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj  | 1 -
 src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj                | 1 -
 src/Lucene.Net.Classification/Lucene.Net.Classification.csproj      | 1 -
 src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj                      | 1 -
 src/Lucene.Net.Demo/Lucene.Net.Demo.csproj                          | 1 -
 src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj            | 1 -
 src/Lucene.Net.Facet/Lucene.Net.Facet.csproj                        | 1 -
 src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj                  | 1 -
 src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj            | 1 -
 src/Lucene.Net.Join/Lucene.Net.Join.csproj                          | 1 -
 src/Lucene.Net.Memory/Lucene.Net.Memory.csproj                      | 1 -
 src/Lucene.Net.Misc/Lucene.Net.Misc.csproj                          | 1 -
 src/Lucene.Net.Queries/Lucene.Net.Queries.csproj                    | 1 -
 src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj            | 1 -
 src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj              | 1 -
 src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj                    | 1 -
 src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj                    | 1 -
 src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj                    | 1 -
 src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj        | 1 -
 .../Lucene.Net.Tests.Analysis.Common.csproj                         | 1 -
 src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj              | 1 -
 src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj        | 1 -
 src/Lucene.Net/Lucene.Net.csproj                                    | 1 -
 src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj                     | 1 -
 .../Lucene.Net.Replicator.AspNetCore.csproj                         | 1 -
 29 files changed, 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
index f49bd66..f562916 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Analysis.Common</AssemblyTitle>
     <Description>Analyzers for indexing content in different languages and domains for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
index cd11592..500aaec 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
+++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Analysis.Kuromoji</AssemblyTitle>
     <Description>Japanese Morphological Analyzer for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
index 97b26f9..910f161 100644
--- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
+++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Analysis.Phonetic</AssemblyTitle>
     <Description>Analyzer for indexing phonetic signatures (for sounds-alike search) for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
index 01ea975..5231ba2 100644
--- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
+++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Analysis.SmartCn</AssemblyTitle>
     <Description>Analyzer for indexing Chinese for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
index 711839d..9d9eb48 100644
--- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Analysis.Stempel</AssemblyTitle>
     <Description>Analyzer for indexing Polish for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
index af9e7a7..67c6321 100644
--- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
+++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Benchmark</AssemblyTitle>
     <Description>System for benchmarking the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
index fbd3a8c..e950a94 100644
--- a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
+++ b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Classification</AssemblyTitle>
     <Description>Classification module for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
index 036b287..a3758c3 100644
--- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
+++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Codecs</AssemblyTitle>
     <Description>Specialized codecs and postings formats for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
index 21696d7..281dfc5 100644
--- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
+++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Demo</AssemblyTitle>
     <Description>Simple example code for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
index d1de44e..6b3767f 100644
--- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
+++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Expressions</AssemblyTitle>
     <Description>Dynamically computed values to sort/facet/search on based on a pluggable grammar for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
index 4c76348..0b2d7e6 100644
--- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
+++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Facet</AssemblyTitle>
     <Description>Faceted indexing and search capabilities for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
index 041d186..e901749 100644
--- a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
+++ b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Grouping</AssemblyTitle>
     <Description>Collectors for grouping search results for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
index 8f9e051..b019de9 100644
--- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
+++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Highlighter</AssemblyTitle>
     <Description>Highlights search keywords in results from the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Join/Lucene.Net.Join.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
index 42a53ca..185cdcb 100644
--- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj
+++ b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Join</AssemblyTitle>
     <Description>Index-time and Query-time joins for normalized content of the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
index d016693..30231ae 100644
--- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
+++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Memory</AssemblyTitle>
     <Description>Single-document in-memory index implementation for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
index c7c51e7..c38bde9 100644
--- a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
+++ b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Misc</AssemblyTitle>
     <Description>Index tools and other miscellaneous functionality for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
index f721a2a..314568a 100644
--- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
+++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Queries</AssemblyTitle>
     <Description>Extended Filters and Queries for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
index cfd307d..7c70c55 100644
--- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
+++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.QueryParser</AssemblyTitle>
     <Description>Query parsers and parsing framework for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
index b335db9..9e4f832 100644
--- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
+++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Replicator</AssemblyTitle>
     <Description>Replicator that allows replication of files between a server and client(s) for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
index 7603040..e097612 100644
--- a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
+++ b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Sandbox</AssemblyTitle>
     <Description>Various third party contributions and new ideas extensions for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
index aee03e2..a8f81c7 100644
--- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
+++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Spatial</AssemblyTitle>
     <Description>Geospatial search for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
index 1797ba5..eea2630 100644
--- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
+++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.Suggest</AssemblyTitle>
     <Description>Auto-suggest and Spellchecking support for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index a2406a0..3845413 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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.TestFramework</AssemblyTitle>
     <Description>Framework for testing Lucene.Net-based applications from The Apache Software Foundation.</Description>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index e5a99bf..feeff4e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -29,7 +29,6 @@
     <!--<TargetFramework>net451</TargetFramework>
     <TargetFramework Condition=" '$(Configuration)' == 'Debug_NetCoreApp1_0' OR '$(Configuration)' == 'Release_NetCoreApp1_0' ">netcoreapp1.0</TargetFramework>-->
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.6.0</NetStandardImplicitPackageVersion>
     
     <AssemblyTitle>Lucene.Net.Tests.Analysis.Common</AssemblyTitle>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
index fed3c7a..85e70aa 100644
--- a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
+++ b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj
@@ -29,7 +29,6 @@
     <!--<TargetFramework>net451</TargetFramework>
     <TargetFramework Condition=" '$(Configuration)' == 'Debug_NetCoreApp1_0' OR '$(Configuration)' == 'Release_NetCoreApp1_0' ">netcoreapp1.0</TargetFramework>-->
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.6.0</NetStandardImplicitPackageVersion>
     
     <AssemblyTitle>Lucene.Net.Tests.Demo</AssemblyTitle>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/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 4acd977..4891db1 100644
--- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
+++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj
@@ -29,7 +29,6 @@
     <!--<TargetFramework>net451</TargetFramework>
     <TargetFramework Condition=" '$(Configuration)' == 'Debug_NetCoreApp1_0' OR '$(Configuration)' == 'Release_NetCoreApp1_0' ">netcoreapp1.0</TargetFramework>-->
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.6.0</NetStandardImplicitPackageVersion>
 
     <AssemblyTitle>Lucene.Net.Tests.Spatial</AssemblyTitle>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/src/Lucene.Net/Lucene.Net.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 847cbc6..1f7681c 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/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 979a016..bbdbd99 100644
--- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
+++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
@@ -26,7 +26,6 @@
   <PropertyGroup>
     <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>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/78c47064/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 701d28f..b259315 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
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <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>


[03/10] lucenenet git commit: API: Lucene.Net.Support: Added StringBuilderCharSequenceWrapper class and StringBuilder.ToCharSequence() extension method.

Posted by ni...@apache.org.
API: Lucene.Net.Support: Added StringBuilderCharSequenceWrapper class and StringBuilder.ToCharSequence() extension method.


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

Branch: refs/heads/master
Commit: 67199687c0f97482307d6b4e6b22482458d48ec9
Parents: a343b98
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Oct 19 22:23:00 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Oct 19 23:16:55 2017 +0700

----------------------------------------------------------------------
 .../Support/StringBuilderCharSequenceWrapper.cs | 74 ++++++++++++++++++++
 .../Support/StringBuilderExtensions.cs          |  9 +++
 2 files changed, 83 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/67199687/src/Lucene.Net/Support/StringBuilderCharSequenceWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/StringBuilderCharSequenceWrapper.cs b/src/Lucene.Net/Support/StringBuilderCharSequenceWrapper.cs
new file mode 100644
index 0000000..19ecfff
--- /dev/null
+++ b/src/Lucene.Net/Support/StringBuilderCharSequenceWrapper.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Text;
+
+namespace Lucene.Net.Support
+{
+    /*
+	 * Licensed to the Apache Software Foundation (ASF) under one or more
+	 * contributor license agreements.  See the NOTICE file distributed with
+	 * this work for additional information regarding copyright ownership.
+	 * The ASF licenses this file to You under the Apache License, Version 2.0
+	 * (the "License"); you may not use this file except in compliance with
+	 * the License.  You may obtain a copy of the License at
+	 *
+	 *     http://www.apache.org/licenses/LICENSE-2.0
+	 *
+	 * Unless required by applicable law or agreed to in writing, software
+	 * distributed under the License is distributed on an "AS IS" BASIS,
+	 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	 * See the License for the specific language governing permissions and
+	 * limitations under the License.
+	 */
+
+    /// <summary>
+    /// An adapter for <see cref="StringBuilder"/> that implements <see cref="ICharSequence"/>
+    /// </summary>
+    public class StringBuilderCharSequenceWrapper : ICharSequence
+    {
+        private readonly StringBuilder value;
+
+        public StringBuilderCharSequenceWrapper(StringBuilder wrappedValue)
+        {
+            if (wrappedValue == null)
+                throw new ArgumentNullException("wrappedValue");
+
+            this.value = wrappedValue;
+        }
+
+        // LUCENENET specific - added to .NETify
+        public char this[int index]
+        {
+            get { return value[index]; }
+        }
+
+        public int Length
+        {
+            get { return value.Length; }
+        }
+
+        public ICharSequence SubSequence(int start, int end)
+        {
+            return new StringCharSequenceWrapper(value.ToString(start, end - start));
+        }
+
+        public override int GetHashCode()
+        {
+            return value.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+                return false;
+            if (!(obj is StringBuilder))
+                return false;
+
+            return value.Equals(obj as StringBuilder);
+        }
+
+        public override string ToString()
+        {
+            return value.ToString();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/67199687/src/Lucene.Net/Support/StringBuilderExtensions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/StringBuilderExtensions.cs b/src/Lucene.Net/Support/StringBuilderExtensions.cs
index 6b02511..d6d543b 100644
--- a/src/Lucene.Net/Support/StringBuilderExtensions.cs
+++ b/src/Lucene.Net/Support/StringBuilderExtensions.cs
@@ -216,5 +216,14 @@ namespace Lucene.Net.Support
 
             return -1;
         }
+
+        /// <summary>
+        /// Convenience method to wrap a string in a <see cref="StringBuilderCharSequenceWrapper"/>
+        /// so a <see cref="StringBuilder"/> can be used as <see cref="ICharSequence"/> in .NET.
+        /// </summary>
+        public static ICharSequence ToCharSequence(this StringBuilder text)
+        {
+            return new StringBuilderCharSequenceWrapper(text);
+        }
     }
 }
\ No newline at end of file


[07/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)

Posted by ni...@apache.org.
SWEEP: Changed all projects to target .NET Standard 1.6 instead of .NET Standard 1.5 (incompatible with Microsoft.Extensions.DependencyModel)


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

Branch: refs/heads/master
Commit: bf2b3ab81a1961857adced14590089f71e44fd79
Parents: fd69196
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Oct 20 04:00:13 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Oct 20 04:00:13 2017 +0700

----------------------------------------------------------------------
 .../Analysis/Util/BufferedCharFilter.cs               |  8 ++++----
 .../Lucene.Net.Analysis.Common.csproj                 | 10 +++++-----
 .../Dict/BinaryDictionary.cs                          |  2 +-
 .../Lucene.Net.Analysis.Kuromoji.csproj               | 10 +++++-----
 .../Lucene.Net.Analysis.Phonetic.csproj               |  8 ++++----
 src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs    |  2 +-
 .../Lucene.Net.Analysis.SmartCn.csproj                | 10 +++++-----
 .../Lucene.Net.Analysis.Stempel.csproj                |  8 ++++----
 src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj  | 10 +++++-----
 .../Lucene.Net.Classification.csproj                  |  8 ++++----
 src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj        | 10 +++++-----
 src/Lucene.Net.Demo/Lucene.Net.Demo.csproj            |  8 ++++----
 .../Lucene.Net.Expressions.csproj                     | 12 ++++++------
 src/Lucene.Net.Facet/Lucene.Net.Facet.csproj          | 10 +++++-----
 src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj    |  8 ++++----
 .../Lucene.Net.Highlighter.csproj                     | 10 +++++-----
 src/Lucene.Net.Join/Lucene.Net.Join.csproj            |  8 ++++----
 src/Lucene.Net.Memory/Lucene.Net.Memory.csproj        |  8 ++++----
 src/Lucene.Net.Misc/Lucene.Net.Misc.csproj            |  8 ++++----
 src/Lucene.Net.Queries/Lucene.Net.Queries.csproj      |  8 ++++----
 .../Lucene.Net.QueryParser.csproj                     | 10 +++++-----
 .../Lucene.Net.Replicator.csproj                      |  8 ++++----
 src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj      |  8 ++++----
 src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj      |  8 ++++----
 src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj      |  8 ++++----
 .../Analysis/BaseTokenStreamTestCase.cs               |  4 ++--
 .../Lucene.Net.TestFramework.csproj                   | 10 +++++-----
 .../Store/SlowClosingMockIndexInputWrapper.cs         |  2 +-
 .../Store/SlowOpeningMockIndexInputWrapper.cs         |  4 ++--
 .../Support/ApiScanTestBase.cs                        |  4 ++--
 .../Support/CultureInfoSupport.cs                     |  4 ++--
 .../Util/ThrottledIndexOutput.cs                      |  4 ++--
 src/Lucene.Net.TestFramework/Util/VirtualMethod.cs    |  4 ++--
 .../Lucene.Net.Tests.Analysis.Common.csproj           |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Analysis.Kuromoji.csproj         |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Analysis.Phonetic.csproj         |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Analysis.SmartCn.csproj          |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Analysis.Stempel.csproj          |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Benchmark.csproj                 |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Classification.csproj            |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Codecs.csproj                    |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Expressions.csproj               |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Facet.csproj                     |  2 +-
 src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs        |  4 ++--
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Grouping.csproj                  |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Highlighter.csproj               |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Join.csproj                      |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Memory.csproj                    |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Misc.csproj                      |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Queries.csproj                   |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.QueryParser.csproj               |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Xml/TestQueryTemplateManager.cs                   |  2 +-
 .../Lucene.Net.Tests.Replicator.csproj                |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Sandbox.csproj                   |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Spatial.csproj                   |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Lucene.Net.Tests.Suggest.csproj                   |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 .../Index/TestDocumentsWriterDeleteQueue.cs           |  4 ++--
 .../Index/TestDocumentsWriterStallControl.cs          |  6 +++---
 src/Lucene.Net.Tests/Index/TestIndexWriter.cs         |  8 ++++----
 .../Index/TestIndexWriterNRTIsCurrent.cs              |  4 ++--
 src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs   |  4 ++--
 .../Index/TestIndexWriterWithThreads.cs               |  4 ++--
 src/Lucene.Net.Tests/Index/TestPostingsFormat.cs      |  2 +-
 .../Index/TestSnapshotDeletionPolicy.cs               |  4 ++--
 src/Lucene.Net.Tests/Lucene.Net.Tests.csproj          |  2 +-
 .../Search/TestControlledRealTimeReopenThread.cs      | 12 ++++++------
 src/Lucene.Net.Tests/Search/TestSearcherManager.cs    |  4 ++--
 .../Search/TestTimeLimitingCollector.cs               |  2 +-
 src/Lucene.Net.Tests/Support/TestApiConsistency.cs    |  2 +-
 src/Lucene.Net.Tests/TestWorstCaseTestBehavior.cs     |  8 ++++----
 src/Lucene.Net.Tests/Util/TestSetOnce.cs              |  2 +-
 src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs      |  8 ++++----
 src/Lucene.Net/Index/DocumentsWriterFlushControl.cs   |  4 ++--
 src/Lucene.Net/Index/DocumentsWriterStallControl.cs   |  4 ++--
 src/Lucene.Net/Index/IndexWriter.cs                   | 14 +++++++-------
 src/Lucene.Net/Index/MergePolicy.cs                   |  4 ++--
 src/Lucene.Net/Index/TaskMergeScheduler.cs            |  6 +++---
 src/Lucene.Net/Lucene.Net.csproj                      | 12 ++++++------
 .../Search/ControlledRealTimeReopenThread.cs          |  8 ++++----
 src/Lucene.Net/Search/IndexSearcher.cs                |  2 +-
 src/Lucene.Net/Search/TimeLimitingCollector.cs        |  4 ++--
 src/Lucene.Net/Store/Lock.cs                          |  4 ++--
 src/Lucene.Net/Store/RateLimiter.cs                   |  4 ++--
 src/Lucene.Net/Support/AssemblyUtils.cs               |  4 ++--
 .../Support/IO/MemoryMappedFileByteBuffer.cs          |  2 +-
 src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs    |  4 ++--
 src/Lucene.Net/Support/SimpleStringInterner.cs        |  2 +-
 src/Lucene.Net/Support/StringExtensions.cs            |  2 +-
 src/Lucene.Net/Support/StringInterner.cs              |  2 +-
 src/Lucene.Net/Support/Threading/ThreadClass.cs       |  8 ++++----
 src/Lucene.Net/Util/IOUtils.cs                        |  4 ++--
 src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj       | 10 +++++-----
 .../Lucene.Net.Replicator.AspNetCore.csproj           |  8 ++++----
 .../Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj  |  2 +-
 .../Support/TestApiConsistency.cs                     |  2 +-
 116 files changed, 263 insertions(+), 263 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs
index bf843f8..5bd976a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Analysis.Util
         private int mark = -1;
         private int markLimit = -1;
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         /// <summary>
         /// LUCENENET specific to throw an exception if the user calls <see cref="Close()"/> instead of <see cref="TextReader.Dispose()"/>
         /// </summary>
@@ -115,7 +115,7 @@ namespace Lucene.Net.Analysis.Util
         {
             if (disposing)
             {
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
                 this.isDisposing = true;
 #endif
                 lock (m_lock)
@@ -127,7 +127,7 @@ namespace Lucene.Net.Analysis.Util
                         buf = null;
                     }
                 }
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
                 this.isDisposing = false;
 #endif
             }
@@ -616,7 +616,7 @@ namespace Lucene.Net.Analysis.Util
         {
             throw new NotImplementedException();
         }
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         public override object InitializeLifetimeService()
         {
             throw new NotImplementedException();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
index 00da789..f49bd66 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.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.Analysis.Common</AssemblyTitle>
     <Description>Analyzers for indexing content in different languages and domains for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -60,11 +60,11 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
   
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
   </ItemGroup>
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs b/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
index 66f3a68..be83df3 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
+++ b/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Analysis.Ja.Dict
         static BinaryDictionary()
         {
             string currentPath = SystemProperties.GetProperty("kuromoji.data.dir",
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
                 System.AppContext.BaseDirectory
 #else
                 AppDomain.CurrentDomain.BaseDirectory

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
index b757072..cd11592 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
+++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.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.Analysis.Kuromoji</AssemblyTitle>
     <Description>Japanese Morphological Analyzer for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -64,12 +64,12 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>-->
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Globalization.Extensions" Version="4.3.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" 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/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
index 33c928d..97b26f9 100644
--- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
+++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.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.Analysis.Phonetic</AssemblyTitle>
     <Description>Analyzer for indexing phonetic signatures (for sounds-alike search) for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -59,7 +59,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/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs b/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
index 285dd8a..fd1f4b8 100644
--- a/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
+++ b/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.Analysis.Cn.Smart
             if (ANALYSIS_DATA_DIR.Length != 0)
                 return;
 
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
             string currentPath = System.AppContext.BaseDirectory;
 #else
             string currentPath = AppDomain.CurrentDomain.BaseDirectory;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
index 16f4feb..01ea975 100644
--- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
+++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.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.Analysis.SmartCn</AssemblyTitle>
     <Description>Analyzer for indexing Chinese for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -70,11 +70,11 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>-->
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Text.Encoding.CodePages" 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/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
index 7a6d920..711839d 100644
--- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.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.Analysis.Stempel</AssemblyTitle>
     <Description>Analyzer for indexing Polish for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -57,7 +57,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/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
index 803087c..af9e7a7 100644
--- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
+++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.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.Benchmark</AssemblyTitle>
     <Description>System for benchmarking 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="SharpZipLib.NETStandard" Version="0.86.0.1" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
   </ItemGroup>
 
-  <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/Lucene.Net.Classification/Lucene.Net.Classification.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
index d89ca18..fbd3a8c 100644
--- a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
+++ b/src/Lucene.Net.Classification/Lucene.Net.Classification.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.Classification</AssemblyTitle>
     <Description>Classification module for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -57,7 +57,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/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
index c6c90f9..036b287 100644
--- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
+++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.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.Codecs</AssemblyTitle>
     <Description>Specialized codecs and postings formats for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -56,11 +56,11 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>-->
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
   </ItemGroup>
 
-  <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/Lucene.Net.Demo/Lucene.Net.Demo.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
index bbd5592..21696d7 100644
--- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
+++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.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.Demo</AssemblyTitle>
     <Description>Simple example code for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -60,7 +60,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/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
index afbc8dc..d1de44e 100644
--- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
+++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.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.Expressions</AssemblyTitle>
     <Description>Dynamically computed values to sort/facet/search on based on a pluggable grammar for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -68,18 +68,18 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>-->
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' OR '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' OR '$(TargetFramework)' == 'netstandard2.0' ">
     <!-- LUCENENET TODO: Do we really need to remove and re-add CommonAssemblyInfo just to use Exclude? -->
     <Compile Remove="Properties\Settings.Designer.cs;..\CommonAssemblyInfo.cs" />
     <Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" Exclude="Properties\Settings.Designer.cs" />

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
index 91f83fe..4c76348 100644
--- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
+++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.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.Facet</AssemblyTitle>
     <Description>Faceted indexing and search capabilities for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -58,12 +58,12 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>-->
   
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
   </ItemGroup>
 
-  <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/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
index 2c72bfa..041d186 100644
--- a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
+++ b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.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.Grouping</AssemblyTitle>
     <Description>Collectors for grouping search results for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -57,7 +57,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/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
index 98658c7..8f9e051 100644
--- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
+++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.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.Highlighter</AssemblyTitle>
     <Description>Highlights search keywords in results from the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -57,11 +57,11 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>-->
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
   </ItemGroup>
 
-  <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/Lucene.Net.Join/Lucene.Net.Join.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
index 40983d2..42a53ca 100644
--- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj
+++ b/src/Lucene.Net.Join/Lucene.Net.Join.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.Join</AssemblyTitle>
     <Description>Index-time and Query-time joins for normalized content of the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -56,7 +56,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/Lucene.Net.Memory/Lucene.Net.Memory.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
index 10bd285..d016693 100644
--- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
+++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.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.Memory</AssemblyTitle>
     <Description>Single-document in-memory index implementation for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -57,7 +57,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/Lucene.Net.Misc/Lucene.Net.Misc.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
index 8f3cff0..c7c51e7 100644
--- a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
+++ b/src/Lucene.Net.Misc/Lucene.Net.Misc.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.Misc</AssemblyTitle>
     <Description>Index tools and other miscellaneous functionality for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -57,7 +57,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/Lucene.Net.Queries/Lucene.Net.Queries.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
index 3b83ddf..f721a2a 100644
--- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
+++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.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.Queries</AssemblyTitle>
     <Description>Extended Filters and Queries for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -56,7 +56,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/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
index ab3de64..cfd307d 100644
--- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
+++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.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.QueryParser</AssemblyTitle>
     <Description>Query parsers and parsing framework for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -60,11 +60,11 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Xml.XmlDocument" Version="4.0.1" />
   </ItemGroup>
 
-  <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/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
index 3e5e787..b335db9 100644
--- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
+++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.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.Replicator</AssemblyTitle>
     <Description>Replicator that allows replication of files between a server and client(s) for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -61,7 +61,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/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
index b827d82..7603040 100644
--- a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
+++ b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.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.Sandbox</AssemblyTitle>
     <Description>Various third party contributions and new ideas extensions for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -56,7 +56,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/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
index 50c98b2..aee03e2 100644
--- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
+++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.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.Spatial</AssemblyTitle>
     <Description>Geospatial search for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -67,7 +67,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/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
index 38cf9a9..1797ba5 100644
--- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
+++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.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.Suggest</AssemblyTitle>
     <Description>Auto-suggest and Spellchecking support for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
@@ -58,7 +58,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/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index bc3f6ee..9e5870e 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -694,12 +694,12 @@ namespace Lucene.Net.Analysis
                 startingGun.Signal();
                 foreach (var t in threads)
                 {
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
                     try
                     {
 #endif
                         t.Join();
-#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.TestFramework/Lucene.Net.TestFramework.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index 2f9cd34..a2406a0 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.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.TestFramework</AssemblyTitle>
     <Description>Framework for testing Lucene.Net-based applications from The Apache Software Foundation.</Description>
@@ -66,14 +66,14 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Diagnostics.StackTrace" Version="4.0.1" />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_STACKTRACE</DefineConstants>
     <DebugType>portable</DebugType>
   </PropertyGroup>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
index fb7511e..00890fa 100644
--- a/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/SlowClosingMockIndexInputWrapper.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Store
                 {
                     Thread.Sleep(50);
                 }
-//#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)
 //                {
 //                    throw new ThreadInterruptedException("Thread Interrupted Exception", ie);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs b/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs
index 2a8c24a..6604404 100644
--- a/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/SlowOpeningMockIndexInputWrapper.cs
@@ -29,12 +29,12 @@ namespace Lucene.Net.Store
         public SlowOpeningMockIndexInputWrapper(MockDirectoryWrapper dir, string name, IndexInput @delegate)
             : base(dir, name, @delegate)
         {
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
             try
             {
 #endif
                 Thread.Sleep(50);
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
             }
             catch (ThreadInterruptedException ie)
             {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
index a6860d0..532de93 100644
--- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
@@ -238,7 +238,7 @@ namespace Lucene.Net.Support
                 "the consumer if the array is not cloned using arr.ToArray().");
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         //[Test, LuceneNetSpecific]
         public virtual void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
         {
@@ -824,7 +824,7 @@ namespace Lucene.Net.Support
             return result.ToArray();
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         private static IEnumerable<string> GetMethodsThatReturnWritableArray(Assembly assembly)
         {
             var result = new List<string>();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs b/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
index f49d879..8ed288a 100644
--- a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
+++ b/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
@@ -28,7 +28,7 @@ namespace Lucene.Net.Support
 {
     public static class CultureInfoSupport
     {
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
 
         #region culturePool
         private static string[] specificCulturePool = new string[] 
@@ -645,7 +645,7 @@ namespace Lucene.Net.Support
 
         public static CultureInfo[] GetNeutralAndSpecificCultures()
         {
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
             return supportedNeutralCultures.Union(supportedSpecificCultures).ToArray();
 #else
             return CultureInfo.GetCultures(CultureTypes.SpecificCultures | CultureTypes.NeutralCultures);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
index 4c161cf..7a9f71b 100644
--- a/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
+++ b/src/Lucene.Net.TestFramework/Util/ThrottledIndexOutput.cs
@@ -146,12 +146,12 @@ namespace Lucene.Net.Util
             {
                 return;
             }
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
 //            try
 //            {
 //#endif 
                 Thread.Sleep(TimeSpan.FromMilliseconds(ms));
-//#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.TestFramework/Util/VirtualMethod.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs b/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs
index dd2cd37..e4a9696 100644
--- a/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs
+++ b/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs
@@ -2,7 +2,7 @@ using Lucene.Net.Support;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
 using System.Linq;
 #endif
 using System.Reflection;
@@ -169,7 +169,7 @@ namespace Lucene.Net.Util
 
         private MethodInfo GetMethod(Type clazz, string methodName, BindingFlags bindingFlags, Type[] methodParameters)
         {
-#if NETSTANDARD1_5
+#if NETSTANDARD1_6
             var methods = clazz.GetTypeInfo().GetMethods(bindingFlags).Where(x => {
                 return x.Name.Equals(methodName, StringComparison.Ordinal)
                     && x.GetParameters().Select(y => y.ParameterType).SequenceEqual(methodParameters);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index 0735ec0..e5a99bf 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -64,7 +64,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.Analysis.Common/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
index 1aadc62..d849a78 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Analysis.Standard.ClassicAnalyzer))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
index ab95f04..4ff4906 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj
@@ -66,7 +66,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.Analysis.Kuromoji/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
index 50d9119..f21cbde 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Ja.Support
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Analysis.Ja.GraphvizFormatter))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
index 5067fc3..498e351 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj
@@ -62,7 +62,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.Analysis.Phonetic/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
index 149f6ad..542b8bb 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Phonetic
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Analysis.Phonetic.BeiderMorseFilter))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj
index da684c8..ef4a5e5d 100644
--- a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj
+++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.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.Analysis.SmartCn/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
index 227d346..a0dcf4e 100644
--- a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Cn.Smart.Support
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Analysis.Cn.Smart.AnalyzerProfile))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
index c4df6ff..ebd4f6a 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj
@@ -62,7 +62,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.Analysis.Stempel/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
index ca268bf..eaf90be 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Stempel
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Analysis.Stempel.StempelFilter))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
index 4f8ea71..1cebdd9 100644
--- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
+++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
@@ -70,7 +70,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.Benchmark/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
index 2e5ddc1..49776c9 100644
--- a/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Benchmarks.Support
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Benchmarks.Constants))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
index 3d748ce..b1d0722 100644
--- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
+++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj
@@ -62,7 +62,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.Classification/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
index af3ce69..def796f 100644
--- a/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Classification
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Classification.KNearestNeighborClassifier))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/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 241c972..16387ad 100644
--- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
+++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj
@@ -63,7 +63,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.Codecs/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
index 16870b1..20d7784 100644
--- a/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Codecs.Tests
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Codecs.BlockTerms.BlockTermsReader))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
index 919598b..0564757 100644
--- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
+++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj
@@ -62,7 +62,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.Expressions/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
index 0c87919..c1eb4c4 100644
--- a/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Expressions
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Expressions.Bindings))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
index 6fc3378..30ad1c1 100644
--- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj
+++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.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.Facet/SlowRAMDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
index 4cff489..28da740 100644
--- a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
+++ b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs
@@ -80,12 +80,12 @@ namespace Lucene.Net.Facet
             {
                 sTime = random.Next(sTime);
             }
-//#if !NETSTANDARD1_5
+//#if !NETSTANDARD1_6
 //            try
 //            {
 //#endif
                 Thread.Sleep(sTime);
-//#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.Facet/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
index 9f161fa..5b9b189 100644
--- a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Tests.Facet
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Facet.Facets))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
index 0047c86..bc2f293 100644
--- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
+++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj
@@ -62,7 +62,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.Grouping/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
index fbe4acc..bbbbea8 100644
--- a/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Tests.Grouping
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Search.Grouping.ICollectedSearchGroup))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
index 138e058..3445812 100644
--- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
+++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj
@@ -67,7 +67,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.Highlighter/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
index 43e2f56..098aeb1 100644
--- a/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Search
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Search.Highlight.DefaultEncoder))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
index 6fb634b..048b569 100644
--- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
+++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj
@@ -62,7 +62,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.Join/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
index a9a5e16..feb4475 100644
--- a/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Join
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Join.FakeScorer))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
index 04ccca8..b3c3de9 100644
--- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj
+++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.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.Memory/Support/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
index 1c0fb22..267fde1 100644
--- a/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Tests.Memory
             base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
         }
 
-#if !NETSTANDARD1_5
+#if !NETSTANDARD1_6
         [Test, LuceneNetSpecific]
         [TestCase(typeof(Lucene.Net.Index.Memory.MemoryIndex))]
         public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/bf2b3ab8/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
index 4c2a3cc..60a94e2 100644
--- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj
+++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.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>
 


[02/10] lucenenet git commit: BREAKING: Lucene.Net.Support: Removed CharAt() method from StringCharSequenceWrapper.

Posted by ni...@apache.org.
BREAKING: Lucene.Net.Support: Removed CharAt() method from StringCharSequenceWrapper.


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

Branch: refs/heads/master
Commit: a343b9832fb2807fb680b9717d111041ec951e9c
Parents: be7fb88
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Oct 19 22:22:33 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Oct 19 23:16:54 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net/Support/StringCharSequenceWrapper.cs | 12 ++++++++----
 src/Lucene.Net/Support/StringExtensions.cs          |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a343b983/src/Lucene.Net/Support/StringCharSequenceWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/StringCharSequenceWrapper.cs b/src/Lucene.Net/Support/StringCharSequenceWrapper.cs
index 3e95d55..d490f6a 100644
--- a/src/Lucene.Net/Support/StringCharSequenceWrapper.cs
+++ b/src/Lucene.Net/Support/StringCharSequenceWrapper.cs
@@ -19,6 +19,9 @@ namespace Lucene.Net.Support
 	 * limitations under the License.
 	 */
 
+    /// <summary>
+    /// An adapter for <see cref="string"/> that implements <see cref="ICharSequence"/>
+    /// </summary>
     public class StringCharSequenceWrapper : ICharSequence
     {
         public static readonly StringCharSequenceWrapper Empty = new StringCharSequenceWrapper(string.Empty);
@@ -35,10 +38,11 @@ namespace Lucene.Net.Support
             get { return value.Length; }
         }
 
-        public char CharAt(int index)
-        {
-            return value[index];
-        }
+        // LUCENENET specific - removed
+        //public char CharAt(int index)
+        //{
+        //    return value[index];
+        //}
 
         // LUCENENET specific - added to .NETify
         public char this[int index]

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a343b983/src/Lucene.Net/Support/StringExtensions.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/StringExtensions.cs b/src/Lucene.Net/Support/StringExtensions.cs
index 8f99970..c4cc7da 100644
--- a/src/Lucene.Net/Support/StringExtensions.cs
+++ b/src/Lucene.Net/Support/StringExtensions.cs
@@ -97,7 +97,7 @@ namespace Lucene.Net.Support
 
         /// <summary>
         /// Convenience method to wrap a string in a <see cref="StringCharSequenceWrapper"/>
-        /// so a string can be used as <see cref="ICharSequence"/> in .NET.
+        /// so a <see cref="string"/> can be used as <see cref="ICharSequence"/> in .NET.
         /// </summary>
         public static ICharSequence ToCharSequence(this string str)
         {


[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)

Posted by ni...@apache.org.
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)