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:34 UTC
[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)
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>