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 2021/09/26 17:02:48 UTC

[lucenenet] branch master updated (89bad64 -> ecbe437)

This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git.


    from 89bad64  BUG: Lucene.Net.Index.IndexReader: Use ConditionalWeakTable/WeakDictionary to ensure dead elements are pruned and garbage collected (fixes #506).
     new 69fc48e  SWEEP: Added tests for net6.0
     new c95da24  SWEEP: Added target for net6.0
     new ecbe437  README.md, websites/site/index.md: Updated docs to include .NET 6.0

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/Generate-TestWorkflows.ps1       | 17 +++--
 .github/workflows/Lucene-Net-Tests-AllProjects.yml |  8 ++-
 .../workflows/Lucene-Net-Tests-Analysis-Common.yml |  8 ++-
 .../Lucene-Net-Tests-Analysis-Kuromoji.yml         |  8 ++-
 .../Lucene-Net-Tests-Analysis-Morfologik.yml       |  8 ++-
 .../Lucene-Net-Tests-Analysis-OpenNLP.yml          |  6 ++
 .../Lucene-Net-Tests-Analysis-Phonetic.yml         |  8 ++-
 .../Lucene-Net-Tests-Analysis-SmartCn.yml          |  8 ++-
 .../Lucene-Net-Tests-Analysis-Stempel.yml          |  8 ++-
 .github/workflows/Lucene-Net-Tests-Benchmark.yml   |  8 ++-
 .../workflows/Lucene-Net-Tests-Classification.yml  |  8 ++-
 .github/workflows/Lucene-Net-Tests-Cli.yml         |  6 ++
 .../workflows/Lucene-Net-Tests-CodeAnalysis.yml    |  6 ++
 .github/workflows/Lucene-Net-Tests-Codecs.yml      |  8 ++-
 .github/workflows/Lucene-Net-Tests-Demo.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-Expressions.yml | 12 +++-
 .github/workflows/Lucene-Net-Tests-Facet.yml       | 12 +++-
 .github/workflows/Lucene-Net-Tests-Grouping.yml    | 12 +++-
 .github/workflows/Lucene-Net-Tests-Highlighter.yml | 12 +++-
 .github/workflows/Lucene-Net-Tests-ICU.yml         | 12 +++-
 .github/workflows/Lucene-Net-Tests-Join.yml        | 12 +++-
 .github/workflows/Lucene-Net-Tests-Memory.yml      | 12 +++-
 .github/workflows/Lucene-Net-Tests-Misc.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-Queries.yml     | 10 ++-
 .github/workflows/Lucene-Net-Tests-QueryParser.yml | 10 ++-
 .github/workflows/Lucene-Net-Tests-Replicator.yml  | 12 +++-
 .github/workflows/Lucene-Net-Tests-Sandbox.yml     | 10 ++-
 .github/workflows/Lucene-Net-Tests-Spatial.yml     | 12 +++-
 .github/workflows/Lucene-Net-Tests-Suggest.yml     | 12 +++-
 ...Net-Tests-TestFramework-DependencyInjection.yml |  8 ++-
 .../workflows/Lucene-Net-Tests-TestFramework.yml   |  8 ++-
 .github/workflows/Lucene-Net-Tests-_A-D.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_E-I.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_I-J.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_J-S.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_T-Z.yml        | 10 ++-
 Directory.Build.props                              |  4 +-
 Directory.Build.targets                            | 28 +++++---
 README.md                                          | 12 ++--
 TestTargetFramework.props                          |  5 +-
 azure-pipelines.yml                                | 80 +++++++++++++++++++++-
 build/Dependencies.props                           |  8 +--
 build/azure-templates/run-tests-on-os.yml          |  7 ++
 build/build.ps1                                    |  4 +-
 .../Lucene.Net.Analysis.Common.csproj              |  4 +-
 .../Lucene.Net.Analysis.Kuromoji.csproj            |  4 +-
 .../Lucene.Net.Analysis.Morfologik.csproj          |  4 +-
 .../Lucene.Net.Analysis.OpenNLP.csproj             |  2 +
 .../Lucene.Net.Analysis.Phonetic.csproj            |  4 +-
 .../Lucene.Net.Analysis.SmartCn.csproj             |  4 +-
 .../Lucene.Net.Analysis.Stempel.csproj             |  4 +-
 .../Lucene.Net.Benchmark.csproj                    | 10 ++-
 .../Lucene.Net.Classification.csproj               |  4 +-
 src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj     |  4 +-
 src/Lucene.Net.Demo/Lucene.Net.Demo.csproj         |  4 +-
 .../Lucene.Net.Expressions.csproj                  |  4 +-
 src/Lucene.Net.Facet/Lucene.Net.Facet.csproj       |  4 +-
 src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj |  4 +-
 .../Lucene.Net.Highlighter.csproj                  |  4 +-
 src/Lucene.Net.Join/Lucene.Net.Join.csproj         |  4 +-
 src/Lucene.Net.Memory/Lucene.Net.Memory.csproj     |  4 +-
 src/Lucene.Net.Misc/Lucene.Net.Misc.csproj         |  4 +-
 src/Lucene.Net.Queries/Lucene.Net.Queries.csproj   |  4 +-
 .../Flexible/Standard/Parser/ParseException.cs     |  4 +-
 .../Lucene.Net.QueryParser.csproj                  |  4 +-
 .../Lucene.Net.Replicator.csproj                   |  4 +-
 src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj   |  4 +-
 src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj   |  4 +-
 src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj   |  4 +-
 .../Lucene.Net.TestFramework.csproj                | 23 +++++--
 .../Support/ExceptionSerializationTestBase.cs      |  2 +
 .../Support/TestApiConsistency.cs                  |  4 +-
 .../Support/TestApiConsistency.cs                  |  2 +-
 .../Support/TestApiConsistency.cs                  |  4 +-
 .../Support/TestApiConsistency.cs                  |  4 +-
 src/Lucene.Net/Lucene.Net.csproj                   | 12 +++-
 src/Lucene.Net/Store/NativeFSLockFactory.cs        |  7 ++
 .../Lucene.Net.CodeAnalysis.CSharp.csproj          |  1 +
 .../Lucene.Net.CodeAnalysis.VisualBasic.csproj     |  1 +
 src/dotnet/Lucene.Net.CodeAnalysis/Version.props   |  2 +-
 src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj    |  4 +-
 .../Lucene.Net.Replicator.AspNetCore.csproj        |  4 +-
 .../Lucene.Net.Tests.CodeAnalysis.csproj           |  1 +
 .../Lucene.Net.Tests.Cli.csproj                    |  2 +
 src/dotnet/tools/lucene-cli/lucene-cli.csproj      |  2 +
 websites/site/index.md                             |  4 +-
 86 files changed, 539 insertions(+), 143 deletions(-)

[lucenenet] 03/03: README.md, websites/site/index.md: Updated docs to include .NET 6.0

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit ecbe43735d5785921f0d3f002ae672f6a11a2aff
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Sep 26 23:18:50 2021 +0700

    README.md, websites/site/index.md: Updated docs to include .NET 6.0
---
 README.md              | 12 +++++++-----
 websites/site/index.md |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index b813042..26b3949 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache Lucene.NET
+# Apache Lucene.NET
 
 [![Nuget](https://img.shields.io/nuget/dt/Lucene.Net)](https://www.nuget.org/packages/Lucene.Net)
 [![Azure DevOps builds (master)](https://img.shields.io/azure-devops/build/lucene-net/6ba240c9-9598-47e7-a793-0ed8a4ba2f8b/3/master)](https://dev.azure.com/lucene-net/Lucene.NET/_build?definitionId=3&_a=summary)
@@ -20,7 +20,7 @@ The Apache Lucene.NET web site is at:
 
 ### Lucene.NET 4.8.0
 
-
+- [.NET 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
 - [.NET Standard 2.1](https://docs.microsoft.com/en-us/dotnet/standard/net-standard)
 - [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard)
 - .NET Framework 4.5
@@ -33,7 +33,7 @@ Working toward Lucene.NET 4.8.0 (currently in BETA)
 
 * The beta version is extremely stable
 * Has more than 7800+ passing unit tests
-* Integrates well with .NET 5.0 and .NET Core 2+
+* Integrates well with .NET 6.0, .NET 5.0 and .NET Core 2+
 * Supports .NET Standard 2.1 and .NET Standard 2.0 
 * Supports .NET Framework 4.5+
 * Some developers already use it in production environments
@@ -176,7 +176,7 @@ Building on the Command Line is currently only supported on Windows.
 ##### Prerequisites
 
 1. [Powershell](https://msdn.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell) 3.0 or higher (see [this question](http://stackoverflow.com/questions/1825585/determine-installed-powershell-version) to check your Powershell version)
-2. [.NET 5.0 SDK or higher](https://dotnet.microsoft.com/download/visual-studio-sdks)
+2. [.NET 6.0 SDK or higher](https://dotnet.microsoft.com/download/visual-studio-sdks)
 3. [.NET Framework 4.8 Developer Pack](https://dotnet.microsoft.com/download/visual-studio-sdks)
 
 ##### Execution
@@ -254,9 +254,11 @@ Then all you need to do is choose the `Lucene.Net Local Packages` feed from the
 #### Prerequisites
 
 1. Visual Studio 2019 or higher
-2. [.NET 5.0 SDK or higher](https://dotnet.microsoft.com/download/visual-studio-sdks)
+2. [.NET 6.0 SDK or higher](https://dotnet.microsoft.com/download/visual-studio-sdks)
 3. [.NET Framework 4.8 Developer Pack](https://dotnet.microsoft.com/download/visual-studio-sdks)
 
+> **NOTE:** Preview versions of .NET SDK may require the "Use previews of the .NET SDK (requires restart)" option to be enabled in Visual Studio under Tools > Options > Environment > Preview Features.
+
 #### Execution
 
 1. Open `Lucene.Net.sln` in Visual Studio.
diff --git a/websites/site/index.md b/websites/site/index.md
index f867a9b..0b2e4ac 100644
--- a/websites/site/index.md
+++ b/websites/site/index.md
@@ -1,4 +1,4 @@
----
+---
 title: Welcome to the Lucene.NET website!
 description: Lucene.NET is a port of the Lucene search engine library, written in C# and targeted at .NET runtime users.
 documentType: index
@@ -15,7 +15,7 @@ Lucene.Net is a port of the Lucene search engine library, written in C# and targ
 
 * The beta version is extremely stable
 * Has more than 7800+ passing unit tests
-* Integrates well with .NET 5.0 and .NET Core 2+
+* Integrates well with .NET 6.0, .NET 5.0 and .NET Core 2+
 * Supports .NET Standard 2.1 and .NET Standard 2.0 
 * Supports .NET Framework 4.5+
 * Some developers already use it in production environments

[lucenenet] 02/03: SWEEP: Added target for net6.0

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit c95da24b31530aa4d13313ef50d252dcf792d57a
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Sep 26 15:05:57 2021 +0700

    SWEEP: Added target for net6.0
---
 Directory.Build.props                              |  4 +---
 Directory.Build.targets                            |  8 +++++++-
 TestTargetFramework.props                          |  2 ++
 build/Dependencies.props                           |  8 ++------
 .../Lucene.Net.Analysis.Common.csproj              |  4 +++-
 .../Lucene.Net.Analysis.Kuromoji.csproj            |  4 +++-
 .../Lucene.Net.Analysis.Morfologik.csproj          |  4 +++-
 .../Lucene.Net.Analysis.OpenNLP.csproj             |  2 ++
 .../Lucene.Net.Analysis.Phonetic.csproj            |  4 +++-
 .../Lucene.Net.Analysis.SmartCn.csproj             |  4 +++-
 .../Lucene.Net.Analysis.Stempel.csproj             |  4 +++-
 .../Lucene.Net.Benchmark.csproj                    | 10 ++++++++--
 .../Lucene.Net.Classification.csproj               |  4 +++-
 src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj     |  4 +++-
 src/Lucene.Net.Demo/Lucene.Net.Demo.csproj         |  4 +++-
 .../Lucene.Net.Expressions.csproj                  |  4 +++-
 src/Lucene.Net.Facet/Lucene.Net.Facet.csproj       |  4 +++-
 src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj |  4 +++-
 .../Lucene.Net.Highlighter.csproj                  |  4 +++-
 src/Lucene.Net.Join/Lucene.Net.Join.csproj         |  4 +++-
 src/Lucene.Net.Memory/Lucene.Net.Memory.csproj     |  4 +++-
 src/Lucene.Net.Misc/Lucene.Net.Misc.csproj         |  4 +++-
 src/Lucene.Net.Queries/Lucene.Net.Queries.csproj   |  4 +++-
 .../Flexible/Standard/Parser/ParseException.cs     |  4 ++--
 .../Lucene.Net.QueryParser.csproj                  |  4 +++-
 .../Lucene.Net.Replicator.csproj                   |  4 +++-
 src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj   |  4 +++-
 src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj   |  4 +++-
 src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj   |  4 +++-
 .../Lucene.Net.TestFramework.csproj                | 23 ++++++++++++++++------
 .../Support/ExceptionSerializationTestBase.cs      |  2 ++
 .../Support/TestApiConsistency.cs                  |  4 ++--
 .../Support/TestApiConsistency.cs                  |  2 +-
 .../Support/TestApiConsistency.cs                  |  4 ++--
 .../Support/TestApiConsistency.cs                  |  4 ++--
 src/Lucene.Net/Lucene.Net.csproj                   | 12 ++++++++---
 src/Lucene.Net/Store/NativeFSLockFactory.cs        |  7 +++++++
 .../Lucene.Net.CodeAnalysis.CSharp.csproj          |  1 +
 .../Lucene.Net.CodeAnalysis.VisualBasic.csproj     |  1 +
 src/dotnet/Lucene.Net.CodeAnalysis/Version.props   |  2 +-
 src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj    |  4 +++-
 .../Lucene.Net.Replicator.AspNetCore.csproj        |  4 +++-
 .../Lucene.Net.Tests.CodeAnalysis.csproj           |  1 +
 .../Lucene.Net.Tests.Cli.csproj                    |  2 ++
 src/dotnet/tools/lucene-cli/lucene-cli.csproj      |  2 ++
 45 files changed, 146 insertions(+), 55 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 092f1bc..532a8c6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,4 +1,4 @@
-<!--
+<!--
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,8 +19,6 @@
 
 -->
 <Project>
-  <Import Project="build\Dependencies.props" />
-
   <PropertyGroup>
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 186c314..9ccf545 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -69,13 +69,19 @@
     <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_STACKTRACE</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_CLOSE</DefineConstants>
-    <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_TYPE_GETMETHOD__BINDINGFLAGS_PARAMS</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_XSLT</DefineConstants>
 
   </PropertyGroup>
 
+  <!-- Features in .NET Framework 4.5+, .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, .NET 5.x (No .NET 6.x support ) -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' ">
+
+    <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE</DefineConstants>
+
+  </PropertyGroup>
+
   <!-- Features in .NET Standard 1.x and .NET Core 1.x -->
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard1.')) Or $(TargetFramework.StartsWith('netcoreapp1.')) ">
     
diff --git a/TestTargetFramework.props b/TestTargetFramework.props
index 88c4d5d..d8f4194 100644
--- a/TestTargetFramework.props
+++ b/TestTargetFramework.props
@@ -69,5 +69,7 @@
     <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn>
     <NoWarn Label="Naming rule violation">$(NoWarn);IDE1006</NoWarn>
   </PropertyGroup>
+
+  <Import Project="build/Dependencies.props" />
   
 </Project>
diff --git a/build/Dependencies.props b/build/Dependencies.props
index e4d5084..7f92198 100644
--- a/build/Dependencies.props
+++ b/build/Dependencies.props
@@ -47,13 +47,9 @@
     <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftCodeAnalysisVisualBasicPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicPackageVersion>
     <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>$(MicrosoftCodeAnalysisVisualBasicPackageVersion)</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1>1.1.2</MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationJsonPackageVersion_NET4_5_1>
-    <MicrosoftExtensionsConfigurationXmlPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationXmlPackageVersion_NET4_5_1>
     <MicrosoftExtensionsConfigurationPackageVersion>2.0.0</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion Condition=" $(TargetFramework.StartsWith('net45')) ">1.1.2</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion Condition=" $(TargetFramework.StartsWith('net6.')) ">6.0.0-rc.1.21451.13</MicrosoftExtensionsConfigurationPackageVersion>
     <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
     <MicrosoftExtensionsConfigurationCommandLinePackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
     <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
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 62530a0..ee7887a 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Common</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="**/*.rslp" Exclude="bin/**/*;obj/**/*" Label="RSLP Test Data" />
     <EmbeddedResource Include="**/*.dtd" Exclude="bin/**/*;obj/**/*" Label="DTD Test Data" />
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 643c847..51228ca 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
+++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Kuromoji</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" />
     <EmbeddedResource Include="**/*.dat" Exclude="bin/**/*;obj/**/*" Label="DAT Test Data" />
diff --git a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
index 9668a39..2571a6e 100644
--- a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
+++ b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Morfologik</AssemblyTitle>
@@ -35,6 +35,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <Compile Remove="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
index 848d91b..016fcb4 100644
--- a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
+++ b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
@@ -35,6 +35,8 @@
     <RootNamespace>Lucene.Net.Analysis.OpenNlp</RootNamespace>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" />
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.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 4bf3e01..e558a66 100644
--- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
+++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Phonetic</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="Language\*.txt" />
     <EmbeddedResource Include="Language\Bm\*" Exclude="*.cs" />
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 d59b8b3..f4ae687 100644
--- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
+++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.SmartCn</AssemblyTitle>
@@ -35,6 +35,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="Hhmm/*.mem" Label="Dict Test Data" />
     <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" />
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 e038c76..18c336b 100644
--- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Stempel</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="Pl\*.tbl;Pl\*.txt" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
index 86e065c..f6e4080 100644
--- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
+++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Benchmark</AssemblyTitle>
@@ -34,8 +34,10 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
-  <ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" />
+    <ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" />
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
     <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
     <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj" />
@@ -51,6 +53,10 @@
     <PackageReference Include="Spatial4n.Core" Version="$(Spatial4nCorePackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="SharpZipLib" Version="$(SharpZipLibPackageVersion)" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
     <PackageReference Include="SharpZipLib" Version="$(SharpZipLibPackageVersion)" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
index ae9125f..dcb14f3 100644
--- a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
+++ b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Classification</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
     <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
index 6a5a819..67816ef 100644
--- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
+++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Codecs</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
index 7d15941..c598356 100644
--- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
+++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
@@ -24,7 +24,7 @@
   <!-- Demo is deployed through the dotnet/tools/lucene-cli package -->
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Demo</AssemblyTitle>
@@ -36,6 +36,8 @@
     <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
     <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
index 3fe8003..d438dab 100644
--- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
+++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Expressions</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
index 6dcc9a1..20dd129 100644
--- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
+++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Facet</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Join\Lucene.Net.Join.csproj" />
     <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
diff --git a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
index 137013a..d7f73b4 100644
--- a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
+++ b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Grouping</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
     <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
index fa9c435..8ff5f7c 100644
--- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
+++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Highlighter</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Memory\Lucene.Net.Memory.csproj" />
     <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
index b26d13f..a1c32bb 100644
--- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj
+++ b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <RootNamespace>Lucene.Net.Search.Join</RootNamespace>
@@ -36,6 +36,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Grouping\Lucene.Net.Grouping.csproj" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
index 3139df0..fbfa416 100644
--- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
+++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
     
     <AssemblyTitle>Lucene.Net.Memory</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
index 57ee091..7340736 100644
--- a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
+++ b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Misc</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <Compile Remove="Store\*" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
index 9e8179a..e597d34 100644
--- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
+++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Queries</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
   </ItemGroup>
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
index 519645d..e167f0d 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         /// </summary>
         public ParseException(Token currentToken,
             int[][] expectedTokenSequences, string[] tokenImage)
-            : base(string.Format(QueryParserMessages.INVALID_SYNTAX, Initialize(
+            : base(string.Format(QueryParserMessages.INVALID_SYNTAX!, Initialize(
                 currentToken, expectedTokenSequences, tokenImage)))
         {
             this.CurrentToken = currentToken;
@@ -73,7 +73,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         /// these constructors.
         /// </summary>
         public ParseException()
-            : base(string.Format(QueryParserMessages.INVALID_SYNTAX, "Error"))
+            : base(string.Format(QueryParserMessages.INVALID_SYNTAX!, "Error")!)
         {
         }
 
diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
index 4d287a7..8558a28 100644
--- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
+++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <RootNamespace>Lucene.Net.QueryParsers</RootNamespace>
@@ -37,6 +37,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
     <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn>
   </PropertyGroup>
+
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
   
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
index a39aca9..3bc3f88 100644
--- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
+++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Replicator</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
     <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj" />
diff --git a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
index 8f7fc93..9bc6a73 100644
--- a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
+++ b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Sandbox</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
index 1ab1a90..c116d28 100644
--- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
+++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Spatial</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
     <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
index 466f960..0811676 100644
--- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
+++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Suggest</AssemblyTitle>
@@ -34,6 +34,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
     <ProjectReference Include="..\Lucene.Net.Misc\Lucene.Net.Misc.csproj" />
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index 372aa91..fccf5e4 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0;</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.TestFramework</AssemblyTitle>
@@ -40,6 +40,8 @@
     <DefineConstants>$(DefineConstants);TESTFRAMEWORK_NUNIT</DefineConstants>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <Compile Include="..\Lucene.Net.TestFramework.NUnit\Support\TestFramework\Assert.cs" Link="Support\TestFramework\Assert.cs" />
   </ItemGroup>
@@ -61,6 +63,15 @@
     <PackageReference Include="RandomizedTesting.Generators" Version="$(RandomizedTestingGeneratorsPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
@@ -79,11 +90,11 @@
   </ItemGroup>
   
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion_NET4_5_1)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion_NET4_5_1)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
   </ItemGroup>
 
diff --git a/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs b/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs
index f70e070..1c81999 100644
--- a/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ExceptionSerializationTestBase.cs
@@ -44,11 +44,13 @@ namespace Lucene.Net.Util
 
             try
             {
+#pragma warning disable SYSLIB0011 // Type or member is obsolete (BinaryFormatter)
                 var binaryFormatter = new BinaryFormatter();
                 using var serializationStream = new MemoryStream();
                 binaryFormatter.Serialize(serializationStream, exception);
                 serializationStream.Seek(0, SeekOrigin.Begin);
                 clone = (T)binaryFormatter.Deserialize(serializationStream);
+#pragma warning restore SYSLIB0011 // Type or member is obsolete (BinaryFormatter)
             }
             catch (SerializationException)
             {
diff --git a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
index 8521bf8..3bb6777 100644
--- a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
@@ -45,7 +45,7 @@ namespace Lucene.Net.Tests.Facet
         [TestCase(typeof(Lucene.Net.Facet.Facets))]
         public override void TestPublicFields(Type typeFromTargetAssembly)
         {
-            base.TestPublicFields(typeFromTargetAssembly, @"OrdAndValue");
+            base.TestPublicFields(typeFromTargetAssembly, @"OrdAndValue|^System\.Runtime\.CompilerServices");
         }
 
         [Test, LuceneNetSpecific]
diff --git a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
index 7492719..e34708b 100644
--- a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Replicator
         [TestCase(typeof(Lucene.Net.Replicator.IReplicator))]
         public override void TestPublicFields(Type typeFromTargetAssembly)
         {
-            base.TestPublicFields(typeFromTargetAssembly);
+            base.TestPublicFields(typeFromTargetAssembly, @"^System\.Runtime\.CompilerServices");
         }
 
         [Test, LuceneNetSpecific]
diff --git a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
index b4d96e6..56b7254 100644
--- a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
@@ -45,7 +45,7 @@ namespace Lucene.Net.Tests.Spatial
         [TestCase(typeof(Lucene.Net.Spatial.DisjointSpatialFilter))]
         public override void TestPublicFields(Type typeFromTargetAssembly)
         {
-            base.TestPublicFields(typeFromTargetAssembly);
+            base.TestPublicFields(typeFromTargetAssembly, @"^System\.Runtime\.CompilerServices");
         }
 
         [Test, LuceneNetSpecific]
diff --git a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
index d0eed4e..ab068f2 100644
--- a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-#if TESTFRAMEWORK_NUNIT
+#if TESTFRAMEWORK_NUNIT
 using Lucene.Net.Attributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
@@ -46,7 +46,7 @@ namespace Lucene.Net.Tests.TestFramework
         [TestCase(typeof(Lucene.Net.RandomExtensions))]
         public override void TestPublicFields(Type typeFromTargetAssembly)
         {
-            base.TestPublicFields(typeFromTargetAssembly);
+            base.TestPublicFields(typeFromTargetAssembly, @"^System\.Runtime\.CompilerServices");
         }
 
         [Test, LuceneNetSpecific]
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 0bb541a..062565d 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net</AssemblyTitle>
@@ -33,6 +33,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <PropertyGroup Label="NuGet Package File Paths">
     <LuceneNetDotNetDir>$(SolutionDir)src\dotnet\</LuceneNetDotNetDir>
     <LuceneNetCodeAnalysisToolsDir>$(LuceneNetDotNetDir)Lucene.Net.CodeAnalysis\tools\</LuceneNetCodeAnalysisToolsDir>
@@ -49,7 +51,11 @@
   <ItemGroup>
     <PackageReference Include="J2N" Version="$(J2NPackageVersion)" />
   </ItemGroup>
-    
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
   </ItemGroup>
@@ -59,7 +65,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Lucene.Net/Store/NativeFSLockFactory.cs b/src/Lucene.Net/Store/NativeFSLockFactory.cs
index c02efb9..484d889 100644
--- a/src/Lucene.Net/Store/NativeFSLockFactory.cs
+++ b/src/Lucene.Net/Store/NativeFSLockFactory.cs
@@ -116,7 +116,9 @@ namespace Lucene.Net.Store
                 return FileSupport.GetFileIOExceptionHResult(provokeException: (fileName) =>
                 {
                     using var lockStream = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite);
+#pragma warning disable CA1416 // Validate platform compatibility
                     lockStream.Lock(0, 1); // Create an exclusive lock
+#pragma warning restore CA1416 // Validate platform compatibility
                     using var stream = new FileStream(fileName, FileMode.Open, FileAccess.Write, FileShare.ReadWrite);
                     // try to find out if the file is locked by writing a byte. Note that we need to flush the stream to find out.
                     stream.WriteByte(0);
@@ -207,7 +209,9 @@ namespace Lucene.Net.Store
             switch (LockingStrategy)
             {
                 case FSLockingStrategy.FileStreamLockViolation:
+#pragma warning disable CA1416 // Validate platform compatibility
                     return new NativeFSLock(m_lockDir, path);
+#pragma warning restore CA1416 // Validate platform compatibility
                 case FSLockingStrategy.FileSharingViolation:
                     return new SharingNativeFSLock(m_lockDir, path);
                 default:
@@ -562,6 +566,9 @@ namespace Lucene.Net.Store
     }
 
     // Uses FileStream locking of file pages.
+#if NET6_0
+    [System.Runtime.Versioning.SupportedOSPlatform("windows")]
+#endif
     internal class NativeFSLock : Lock
     {
 #pragma warning disable CA2213 // Disposable fields should be disposed
diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj
index 287b9df..9c00e0f 100644
--- a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj
+++ b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj
@@ -26,6 +26,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
   <Import Project="..\Lucene.Net.CodeAnalysis\Version.props" />
 
   <ItemGroup>
diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj
index 96fddc8..16c36e7 100644
--- a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj
+++ b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj
@@ -26,6 +26,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
   <Import Project="..\Lucene.Net.CodeAnalysis\Version.props" />
 
   <ItemGroup>
diff --git a/src/dotnet/Lucene.Net.CodeAnalysis/Version.props b/src/dotnet/Lucene.Net.CodeAnalysis/Version.props
index 86cc7ef..3a2ff83 100644
--- a/src/dotnet/Lucene.Net.CodeAnalysis/Version.props
+++ b/src/dotnet/Lucene.Net.CodeAnalysis/Version.props
@@ -22,7 +22,7 @@
 
          IMPORTANT: Make sure you update the AssemblyVersionRevision number on every code/dependency/script change!
      -->
-    <AssemblyVersionRevision>10</AssemblyVersionRevision>
+    <AssemblyVersionRevision>11</AssemblyVersionRevision>
 
     <AssemblyMajorMinorPatchPattern>^\d+\.\d+\.\d+</AssemblyMajorMinorPatchPattern>
     <AssemblyMajorMinorPatch>$([System.Text.RegularExpressions.Regex]::Match($(AssemblyVersion), $(AssemblyMajorMinorPatchPattern)))</AssemblyMajorMinorPatch>
diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
index 2609630..0df5322 100644
--- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
+++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
@@ -24,7 +24,7 @@
   <Import Project="$(SolutionDir)build/NuGet.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.ICU</AssemblyTitle>
@@ -35,6 +35,8 @@
     <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR</DefineConstants>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <Compile Include="..\..\Lucene.Net.Analysis.Common\Analysis\Th\**\*.cs" LinkBase="Analysis\Th" />
     <Compile Include="..\..\Lucene.Net.Analysis.Common\Analysis\Util\CharArrayIterator.cs" Link="Analysis\Util\CharArrayIterator.cs" />
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 eda1b13..aaaac77 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
@@ -25,7 +25,7 @@
   <!--<Import Project="$(SolutionDir)build/NuGet.props" />-->
   
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net461</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Replicator.AspNetCore</AssemblyTitle>
@@ -35,6 +35,8 @@
     <NoWarn>$(NoWarn);1591;1573</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
+
   <ItemGroup>
     <ProjectReference Include="..\..\Lucene.Net.Replicator\Lucene.Net.Replicator.csproj" />
   </ItemGroup>
diff --git a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
index 98c2690..fdf9b80 100644
--- a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
+++ b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
@@ -29,6 +29,7 @@
     <IsPublishable Condition=" '$(TargetFramework)' == 'net5.0' ">true</IsPublishable>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build/Dependencies.props" />
   <Import Project="$(SolutionDir)build/TestReferences.Common.targets" />
 
   <ItemGroup>
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 ce60c03..5f9279e 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
@@ -29,6 +29,8 @@
     <IsPublishable Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">true</IsPublishable>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build\Dependencies.props" />
+
   <ItemGroup>
     <Compile Remove="SourceCode\TestInputForParser.cs" />
     <None Remove="Configuration\appsettings.json" />
diff --git a/src/dotnet/tools/lucene-cli/lucene-cli.csproj b/src/dotnet/tools/lucene-cli/lucene-cli.csproj
index ba41309..592bd11 100644
--- a/src/dotnet/tools/lucene-cli/lucene-cli.csproj
+++ b/src/dotnet/tools/lucene-cli/lucene-cli.csproj
@@ -43,6 +43,8 @@
     <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn>
   </PropertyGroup>
 
+  <Import Project="$(SolutionDir)build\Dependencies.props" />
+
   <ItemGroup>
     <None Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

[lucenenet] 01/03: SWEEP: Added tests for net6.0

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit 69fc48ebd0372302d6d359cb6715e63779770e90
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sat Sep 25 00:31:01 2021 +0700

    SWEEP: Added tests for net6.0
---
 .github/workflows/Generate-TestWorkflows.ps1       | 17 +++--
 .github/workflows/Lucene-Net-Tests-AllProjects.yml |  8 ++-
 .../workflows/Lucene-Net-Tests-Analysis-Common.yml |  8 ++-
 .../Lucene-Net-Tests-Analysis-Kuromoji.yml         |  8 ++-
 .../Lucene-Net-Tests-Analysis-Morfologik.yml       |  8 ++-
 .../Lucene-Net-Tests-Analysis-OpenNLP.yml          |  6 ++
 .../Lucene-Net-Tests-Analysis-Phonetic.yml         |  8 ++-
 .../Lucene-Net-Tests-Analysis-SmartCn.yml          |  8 ++-
 .../Lucene-Net-Tests-Analysis-Stempel.yml          |  8 ++-
 .github/workflows/Lucene-Net-Tests-Benchmark.yml   |  8 ++-
 .../workflows/Lucene-Net-Tests-Classification.yml  |  8 ++-
 .github/workflows/Lucene-Net-Tests-Cli.yml         |  6 ++
 .../workflows/Lucene-Net-Tests-CodeAnalysis.yml    |  6 ++
 .github/workflows/Lucene-Net-Tests-Codecs.yml      |  8 ++-
 .github/workflows/Lucene-Net-Tests-Demo.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-Expressions.yml | 12 +++-
 .github/workflows/Lucene-Net-Tests-Facet.yml       | 12 +++-
 .github/workflows/Lucene-Net-Tests-Grouping.yml    | 12 +++-
 .github/workflows/Lucene-Net-Tests-Highlighter.yml | 12 +++-
 .github/workflows/Lucene-Net-Tests-ICU.yml         | 12 +++-
 .github/workflows/Lucene-Net-Tests-Join.yml        | 12 +++-
 .github/workflows/Lucene-Net-Tests-Memory.yml      | 12 +++-
 .github/workflows/Lucene-Net-Tests-Misc.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-Queries.yml     | 10 ++-
 .github/workflows/Lucene-Net-Tests-QueryParser.yml | 10 ++-
 .github/workflows/Lucene-Net-Tests-Replicator.yml  | 12 +++-
 .github/workflows/Lucene-Net-Tests-Sandbox.yml     | 10 ++-
 .github/workflows/Lucene-Net-Tests-Spatial.yml     | 12 +++-
 .github/workflows/Lucene-Net-Tests-Suggest.yml     | 12 +++-
 ...Net-Tests-TestFramework-DependencyInjection.yml |  8 ++-
 .../workflows/Lucene-Net-Tests-TestFramework.yml   |  8 ++-
 .github/workflows/Lucene-Net-Tests-_A-D.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_E-I.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_I-J.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_J-S.yml        | 10 ++-
 .github/workflows/Lucene-Net-Tests-_T-Z.yml        | 10 ++-
 Directory.Build.targets                            | 20 +++---
 TestTargetFramework.props                          |  3 +-
 azure-pipelines.yml                                | 80 +++++++++++++++++++++-
 build/azure-templates/run-tests-on-os.yml          |  7 ++
 build/build.ps1                                    |  4 +-
 41 files changed, 384 insertions(+), 81 deletions(-)

diff --git a/.github/workflows/Generate-TestWorkflows.ps1 b/.github/workflows/Generate-TestWorkflows.ps1
index df44360..3efb378 100644
--- a/.github/workflows/Generate-TestWorkflows.ps1
+++ b/.github/workflows/Generate-TestWorkflows.ps1
@@ -38,7 +38,7 @@
 
  .PARAMETER TestFrameworks
     A string array of Dotnet target framework monikers to run the tests on. The default is
-    @('net5.0','net461','net48').
+    @('net6.0', 'net5.0','net461','net48').
 
  .PARAMETER OperatingSystems
     A string array of Github Actions operating system monikers to run the tests on.
@@ -65,7 +65,7 @@ param(
 
     [string]$RepoRoot = (Split-Path (Split-Path $PSScriptRoot)),
 
-    [string[]]$TestFrameworks = @('net5.0','net461','net48'), # targets under test: netstanrd2.1, netstanard2.0, net45
+    [string[]]$TestFrameworks = @('net6.0', 'net5.0','net461','net48'), # targets under test: net6.0, netstandard2.1, netstanard2.0, net45
 
     [string[]]$OperatingSystems = @('windows-latest', 'ubuntu-latest'),
 
@@ -73,6 +73,8 @@ param(
 
     [string[]]$Configurations = @('Release'),
 
+    [string]$DotNet6SDKVersion = '6.0.100-rc.1.21463.6',
+
     [string]$DotNet5SDKVersion = '5.0.400',
 
     [string]$DotNetCore3SDKVersion = '3.1.412'
@@ -155,6 +157,7 @@ function Write-TestWorkflow(
     [string[]]$TestFrameworks = @('net5.0', 'net48'),
     [string[]]$TestPlatforms = @('x64'),
     [string[]]$OperatingSystems = @('windows-latest', 'ubuntu-latest', 'macos-latest'),
+    [string]$DotNet6SDKVersion = $DotNet6SDKVersion,
     [string]$DotNet5SDKVersion = $DotNet5SDKVersion,
     [string]$DotNetCore3SDKVersion = $DotNetCore3SDKVersion) {
 
@@ -263,6 +266,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '$DotNet5SDKVersion'
+        if: `${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '$DotNet6SDKVersion'
 
       - run: |
           `$project_name = [System.IO.Path]::GetFileNameWithoutExtension(`$env:project_path)
@@ -307,7 +316,7 @@ try {
     Pop-Location
 }
 
-#Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $projectPath -RelativeRoot $repoRoot -TestFrameworks @('net5.0','netcoreapp3.1') -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion
+#Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $projectPath -RelativeRoot $repoRoot -TestFrameworks @('net5.0','netcoreapp3.1') -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet6SDKVersion $DotNet6SDKVersion -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion
 
 #Write-Host $TestProjects
 
@@ -331,5 +340,5 @@ foreach ($testProject in $TestProjects) {
     }
 
     #Write-Host "Project: $projectName"
-    Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $testProject -RelativeRoot $RepoRoot -TestFrameworks $frameworks -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion
+    Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $testProject -RelativeRoot $RepoRoot -TestFrameworks $frameworks -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet6SDKVersion $DotNet6SDKVersion -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion
 }
\ No newline at end of file
diff --git a/.github/workflows/Lucene-Net-Tests-AllProjects.yml b/.github/workflows/Lucene-Net-Tests-AllProjects.yml
index 4bce2a0..0f97f64 100644
--- a/.github/workflows/Lucene-Net-Tests-AllProjects.yml
+++ b/.github/workflows/Lucene-Net-Tests-AllProjects.yml
@@ -72,7 +72,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -102,6 +102,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml
index 206bf71..450191a 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml
@@ -56,7 +56,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -86,6 +86,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml
index 3e65046..c3e698b 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -83,6 +83,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml
index 2ff1bb5..d91f265 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -83,6 +83,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml
index 1f6210b..aea383e 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml
@@ -86,6 +86,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml
index 2fba3cf..595d977 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -80,6 +80,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml b/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml
index 1a447a3..b153a47 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml
@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -84,6 +84,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml
index a36c32b..2bbe813 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,6 +81,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Benchmark.yml b/.github/workflows/Lucene-Net-Tests-Benchmark.yml
index 783e4fa..563106c 100644
--- a/.github/workflows/Lucene-Net-Tests-Benchmark.yml
+++ b/.github/workflows/Lucene-Net-Tests-Benchmark.yml
@@ -63,7 +63,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -93,6 +93,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Classification.yml b/.github/workflows/Lucene-Net-Tests-Classification.yml
index d2653ff..ba9d164 100644
--- a/.github/workflows/Lucene-Net-Tests-Classification.yml
+++ b/.github/workflows/Lucene-Net-Tests-Classification.yml
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,6 +81,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Cli.yml b/.github/workflows/Lucene-Net-Tests-Cli.yml
index 5b466f7..722010b 100644
--- a/.github/workflows/Lucene-Net-Tests-Cli.yml
+++ b/.github/workflows/Lucene-Net-Tests-Cli.yml
@@ -100,6 +100,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml
index 1ff21a9..731c5be 100644
--- a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml
+++ b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml
@@ -79,6 +79,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Codecs.yml b/.github/workflows/Lucene-Net-Tests-Codecs.yml
index 742ea70..9941f67 100644
--- a/.github/workflows/Lucene-Net-Tests-Codecs.yml
+++ b/.github/workflows/Lucene-Net-Tests-Codecs.yml
@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -79,6 +79,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Demo.yml b/.github/workflows/Lucene-Net-Tests-Demo.yml
index 309b905..ebc2850 100644
--- a/.github/workflows/Lucene-Net-Tests-Demo.yml
+++ b/.github/workflows/Lucene-Net-Tests-Demo.yml
@@ -37,6 +37,7 @@ on:
     # Dependencies
     - 'src/Lucene.Net/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Expressions/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
@@ -45,7 +46,6 @@ on:
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
     - 'src/Lucene.Net.Demo/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -58,7 +58,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -88,6 +88,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Expressions.yml b/.github/workflows/Lucene-Net-Tests-Expressions.yml
index 59070e4..4556796 100644
--- a/.github/workflows/Lucene-Net-Tests-Expressions.yml
+++ b/.github/workflows/Lucene-Net-Tests-Expressions.yml
@@ -35,10 +35,10 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
-    - 'src/Lucene.Net.Queries/**/*'
-    - 'src/Lucene.Net.Expressions/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
+    - 'src/Lucene.Net.Queries/**/*'
+    - 'src/Lucene.Net.Expressions/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,6 +81,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Facet.yml b/.github/workflows/Lucene-Net-Tests-Facet.yml
index ed1f5ad..845b253 100644
--- a/.github/workflows/Lucene-Net-Tests-Facet.yml
+++ b/.github/workflows/Lucene-Net-Tests-Facet.yml
@@ -35,12 +35,12 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
     - 'src/Lucene.Net.Facet/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -83,6 +83,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Grouping.yml b/.github/workflows/Lucene-Net-Tests-Grouping.yml
index 6bff3c9..3a1082e 100644
--- a/.github/workflows/Lucene-Net-Tests-Grouping.yml
+++ b/.github/workflows/Lucene-Net-Tests-Grouping.yml
@@ -35,10 +35,10 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
-    - 'src/Lucene.Net.Queries/**/*'
-    - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
+    - 'src/Lucene.Net.Queries/**/*'
+    - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,6 +81,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Highlighter.yml b/.github/workflows/Lucene-Net-Tests-Highlighter.yml
index 43a9f1b..0f7f47b 100644
--- a/.github/workflows/Lucene-Net-Tests-Highlighter.yml
+++ b/.github/workflows/Lucene-Net-Tests-Highlighter.yml
@@ -36,11 +36,11 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Memory/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Highlighter/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -83,6 +83,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-ICU.yml b/.github/workflows/Lucene-Net-Tests-ICU.yml
index b9836b1..1289ebb 100644
--- a/.github/workflows/Lucene-Net-Tests-ICU.yml
+++ b/.github/workflows/Lucene-Net-Tests-ICU.yml
@@ -36,6 +36,7 @@ on:
     - 'src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/**/*.cs'
     - 'src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayIterator.cs'
     - 'src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs'
+    - 'src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/BaseTokenStreamFactoryTestCase.cs'
     - 'src/Lucene.Net.Tests.Analysis.ICU/Analysis/**/*.cs'
     - 'src/Lucene.Net.Tests.Analysis.ICU/Collation/**/*.cs'
     - 'src/Lucene.Net.Tests.Highlighter/PostingsHighlight/**/*.cs'
@@ -48,13 +49,12 @@ on:
     # Dependencies
     - 'src/Lucene.Net/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Memory/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Highlighter/**/*'
     - 'src/dotnet/Lucene.Net.ICU/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
-    - 'src/Lucene.Net.Tests.Analysis.Common/**/*'
 
     - '!**/*.md'
 
@@ -66,7 +66,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -96,6 +96,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Join.yml b/.github/workflows/Lucene-Net-Tests-Join.yml
index 1f4cfb8..b74c40f 100644
--- a/.github/workflows/Lucene-Net-Tests-Join.yml
+++ b/.github/workflows/Lucene-Net-Tests-Join.yml
@@ -35,11 +35,11 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -52,7 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -82,6 +82,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Memory.yml b/.github/workflows/Lucene-Net-Tests-Memory.yml
index 9fc87fc..90d64b2 100644
--- a/.github/workflows/Lucene-Net-Tests-Memory.yml
+++ b/.github/workflows/Lucene-Net-Tests-Memory.yml
@@ -36,12 +36,12 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
-    - 'src/Lucene.Net.Memory/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
+    - 'src/Lucene.Net.Memory/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -84,6 +84,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Misc.yml b/.github/workflows/Lucene-Net-Tests-Misc.yml
index a87942c..b99fe3f 100644
--- a/.github/workflows/Lucene-Net-Tests-Misc.yml
+++ b/.github/workflows/Lucene-Net-Tests-Misc.yml
@@ -35,9 +35,9 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
-    - 'src/Lucene.Net.Misc/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
+    - 'src/Lucene.Net.Misc/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -80,6 +80,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Queries.yml b/.github/workflows/Lucene-Net-Tests-Queries.yml
index 97ddb9d..9ac7737 100644
--- a/.github/workflows/Lucene-Net-Tests-Queries.yml
+++ b/.github/workflows/Lucene-Net-Tests-Queries.yml
@@ -35,9 +35,9 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
-    - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
+    - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -80,6 +80,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-QueryParser.yml b/.github/workflows/Lucene-Net-Tests-QueryParser.yml
index 24447a8..7d1614b 100644
--- a/.github/workflows/Lucene-Net-Tests-QueryParser.yml
+++ b/.github/workflows/Lucene-Net-Tests-QueryParser.yml
@@ -39,11 +39,11 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -56,7 +56,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -86,6 +86,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Replicator.yml b/.github/workflows/Lucene-Net-Tests-Replicator.yml
index 15085bf..f12abcf 100644
--- a/.github/workflows/Lucene-Net-Tests-Replicator.yml
+++ b/.github/workflows/Lucene-Net-Tests-Replicator.yml
@@ -35,14 +35,14 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
     - 'src/Lucene.Net.Facet/**/*'
     - 'src/Lucene.Net.Replicator/**/*'
     - 'src/dotnet/Lucene.Net.Replicator.AspNetCore/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -55,7 +55,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -85,6 +85,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Sandbox.yml b/.github/workflows/Lucene-Net-Tests-Sandbox.yml
index a00a9af..89dce7c 100644
--- a/.github/workflows/Lucene-Net-Tests-Sandbox.yml
+++ b/.github/workflows/Lucene-Net-Tests-Sandbox.yml
@@ -36,9 +36,9 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,6 +81,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Spatial.yml b/.github/workflows/Lucene-Net-Tests-Spatial.yml
index 4538a60..8b862e3 100644
--- a/.github/workflows/Lucene-Net-Tests-Spatial.yml
+++ b/.github/workflows/Lucene-Net-Tests-Spatial.yml
@@ -36,10 +36,10 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
-    - 'src/Lucene.Net.Queries/**/*'
-    - 'src/Lucene.Net.Spatial/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
+    - 'src/Lucene.Net.Queries/**/*'
+    - 'src/Lucene.Net.Spatial/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -52,7 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -82,6 +82,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-Suggest.yml b/.github/workflows/Lucene-Net-Tests-Suggest.yml
index 43b01ae..08a80ec 100644
--- a/.github/workflows/Lucene-Net-Tests-Suggest.yml
+++ b/.github/workflows/Lucene-Net-Tests-Suggest.yml
@@ -37,10 +37,10 @@ on:
     # Dependencies
     - 'src/Lucene.Net/**/*'
     - 'src/Lucene.Net.Analysis.Common/**/*'
-    - 'src/Lucene.Net.Queries/**/*'
+    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Misc/**/*'
+    - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Suggest/**/*'
-    - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
 
     - '!**/*.md'
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -83,6 +83,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml b/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml
index 2effe4d..65679cd 100644
--- a/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml
+++ b/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml
@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -79,6 +79,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-TestFramework.yml b/.github/workflows/Lucene-Net-Tests-TestFramework.yml
index 56da0f0..02b7913 100644
--- a/.github/workflows/Lucene-Net-Tests-TestFramework.yml
+++ b/.github/workflows/Lucene-Net-Tests-TestFramework.yml
@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,6 +81,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-_A-D.yml b/.github/workflows/Lucene-Net-Tests-_A-D.yml
index ed3de18..69205e3 100644
--- a/.github/workflows/Lucene-Net-Tests-_A-D.yml
+++ b/.github/workflows/Lucene-Net-Tests-_A-D.yml
@@ -40,12 +40,12 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
     - 'src/Lucene.Net.Facet/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
@@ -60,7 +60,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -90,6 +90,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-_E-I.yml b/.github/workflows/Lucene-Net-Tests-_E-I.yml
index 658e9fc..3096a4e 100644
--- a/.github/workflows/Lucene-Net-Tests-_E-I.yml
+++ b/.github/workflows/Lucene-Net-Tests-_E-I.yml
@@ -50,12 +50,12 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
     - 'src/Lucene.Net.Facet/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
@@ -70,7 +70,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -100,6 +100,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-_I-J.yml b/.github/workflows/Lucene-Net-Tests-_I-J.yml
index ad9bce4..45af465 100644
--- a/.github/workflows/Lucene-Net-Tests-_I-J.yml
+++ b/.github/workflows/Lucene-Net-Tests-_I-J.yml
@@ -55,12 +55,12 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
     - 'src/Lucene.Net.Facet/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
@@ -75,7 +75,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -105,6 +105,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-_J-S.yml b/.github/workflows/Lucene-Net-Tests-_J-S.yml
index 49f6aa8..717932f 100644
--- a/.github/workflows/Lucene-Net-Tests-_J-S.yml
+++ b/.github/workflows/Lucene-Net-Tests-_J-S.yml
@@ -42,12 +42,12 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
     - 'src/Lucene.Net.Facet/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
@@ -62,7 +62,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -92,6 +92,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/.github/workflows/Lucene-Net-Tests-_T-Z.yml b/.github/workflows/Lucene-Net-Tests-_T-Z.yml
index 2cc13fb..259fcd3 100644
--- a/.github/workflows/Lucene-Net-Tests-_T-Z.yml
+++ b/.github/workflows/Lucene-Net-Tests-_T-Z.yml
@@ -37,12 +37,12 @@ on:
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
+    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Codecs/**/*'
     - 'src/Lucene.Net.Queries/**/*'
     - 'src/Lucene.Net.Grouping/**/*'
     - 'src/Lucene.Net.Join/**/*'
     - 'src/Lucene.Net.Facet/**/*'
-    - 'src/Lucene.Net.Analysis.Common/**/*'
     - 'src/Lucene.Net.Sandbox/**/*'
     - 'src/Lucene.Net.QueryParser/**/*'
     - 'src/Lucene.Net.TestFramework/**/*'
@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net5.0, net461, net48]
+        framework: [net6.0, net5.0, net461, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -87,6 +87,12 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.400'
+        if: ${{ startswith(matrix.framework, 'net5.') }}
+
+      - name: Setup .NET 6 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.100-rc.1.21463.6'
 
       - run: |
           $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 0a9bad4..186c314 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -20,16 +20,16 @@
 -->
 <Project>
 
-  <!-- Features in .NET Core 3.x and .NET 5.x only -->
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3.')) Or $(TargetFramework.StartsWith('net5.')) ">
+  <!-- Features in .NET Core 3.x, .NET 5.x, and .NET 6.x only -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3.')) Or $(TargetFramework.StartsWith('net5.')) Or '$(TargetFramework)' == 'net6.0' ">
 
     <DefineConstants>$(DefineConstants);FEATURE_ARGITERATOR</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_REMOVE_CONTINUEENUMERATION</DefineConstants>
 
   </PropertyGroup>
   
-  <!-- Features in .NET Standard, .NET Core, and .NET 5 only (no .NET Framework support) -->
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcoreapp')) Or '$(TargetFramework)' == 'net5.0' ">
+  <!-- Features in .NET Standard, .NET Core, .NET 5.x, and .NET 6.x only (no .NET Framework support) -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcoreapp')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
     
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_ARRAYEMPTY</DefineConstants>
@@ -39,8 +39,8 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <!-- Features in .NET Standard 2.1 only -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' ">
+  <!-- Features in .NET Standard 2.1, .NET 5.x, and .NET 6.x only -->
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
 
     <DefineConstants>$(DefineConstants);FEATURE_CONDITIONALWEAKTABLE_ENUMERATOR</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_CONDITIONALWEAKTABLE_ADDORUPDATE</DefineConstants>
@@ -48,15 +48,15 @@
     
   </PropertyGroup>
 
-  <!-- Features in .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, and .NET 5 -->
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' ">
+  <!-- Features in .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, .NET 5.x, and .NET 6.x -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
 
     <DefineConstants>$(DefineConstants);FEATURE_ICONFIGURATIONROOT_PROVIDERS</DefineConstants>
 
   </PropertyGroup>
 
-  <!-- Features in .NET Framework 4.5+, .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, and .NET 5  -->
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' ">
+  <!-- Features in .NET Framework 4.5+, .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, .NET 5.x, and .NET 6.x  -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
 
     <DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_BASEDIRECTORY</DefineConstants>
     <DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_GETASSEMBLIES</DefineConstants>
diff --git a/TestTargetFramework.props b/TestTargetFramework.props
index 10b3b47..88c4d5d 100644
--- a/TestTargetFramework.props
+++ b/TestTargetFramework.props
@@ -30,11 +30,12 @@
     <!--<TargetFramework>net48</TargetFramework>-->
     <!--<TargetFramework>netcoreapp3.1</TargetFramework>-->
     <TargetFramework>net5.0</TargetFramework>
+    <!--<TargetFramework>net6.0</TargetFramework>-->
 
     <!-- Allow the build script to pass in the test frameworks to build for.
       This overrides the above TargetFramework setting. 
       LUCENENET TODO: Due to a parsing bug, we cannot pass a string with a ; to dotnet msbuild, so passing true as a workaround -->
-    <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48;net461</TargetFrameworks>
     <TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework>
   </PropertyGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4d18c79..16468f6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -121,9 +121,10 @@ stages:
       displayName: 'Setup Default Variable Values'
 
     - task: UseDotNet@2
-      displayName: 'Use .NET Core sdk 5.0.400'
+      displayName: 'Use .NET Core sdk 6.0.100-rc.1'
       inputs:
-        version: 5.0.400
+        packageType: 'sdk'
+        version: '6.0.100-rc.1.21463.6'
 
     - pwsh: |
         Import-Module "$(BuildDirectory)/psake.psm1"
@@ -236,6 +237,13 @@ stages:
     - template: 'build/azure-templates/publish-test-binaries.yml'
       parameters:
         publishDirectory: $(PublishTempDirectory)
+        framework: 'net6.0'
+        binaryArtifactName: '$(BinaryArtifactName)'
+        testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)'
+
+    - template: 'build/azure-templates/publish-test-binaries.yml'
+      parameters:
+        publishDirectory: $(PublishTempDirectory)
         framework: 'net5.0'
         binaryArtifactName: '$(BinaryArtifactName)'
         testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)'
@@ -318,6 +326,74 @@ stages:
   displayName: 'Test Stage:'
   jobs:
 
+  - job: Test_net6_0_x64
+    condition: and(succeeded(), ne(variables['RunTests'], 'false'))
+    strategy:
+      matrix:
+        Windows:
+          osName: 'Windows'
+          imageName: 'windows-2019'
+          maximumParallelJobs: 8
+          maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
+        Linux:
+          osName: 'Linux'
+          imageName: 'ubuntu-latest'
+          maximumParallelJobs: 7
+          maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
+        macOS:
+          osName: 'macOS'
+          imageName: 'macOS-latest'
+          maximumParallelJobs: 7
+          maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
+    displayName: 'Test net6.0,x64 on'
+    pool:
+      vmImage: $(imageName)
+    steps:
+    - template: 'build/azure-templates/run-tests-on-os.yml'
+      parameters:
+        osName: $(osName)
+        framework: 'net6.0'
+        vsTestPlatform: 'x64'
+        testBinariesArtifactName: '$(TestBinariesArtifactName)'
+        nugetArtifactName: '$(NuGetArtifactName)'
+        testResultsArtifactName: '$(TestResultsArtifactName)'
+        maximumParallelJobs: $(maximumParallelJobs)
+        maximumAllowedFailures: $(maximumAllowedFailures)
+
+  - job: Test_net6_0_x86 # Only run Nightly or if explicitly enabled with RunX86Tests
+    condition: and(succeeded(), ne(variables['RunTests'], 'false'), or(eq(variables['IsNightly'], 'true'), eq(variables['RunX86Tests'], 'true')))
+    strategy:
+      matrix:
+        Windows:
+          osName: 'Windows'
+          imageName: 'windows-2019'
+          maximumParallelJobs: 8
+          maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
+        Linux:
+          osName: 'Linux'
+          imageName: 'ubuntu-latest'
+          maximumParallelJobs: 7
+          maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
+        macOS:
+          osName: 'macOS'
+          imageName: 'macOS-latest'
+          maximumParallelJobs: 7
+          maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
+    displayName: 'Test net6.0,x86 on'
+    pool:
+      vmImage: $(imageName)
+    steps:
+    - template: 'build/azure-templates/run-tests-on-os.yml'
+      parameters:
+        osName: $(osName)
+        framework: 'net6.0'
+        vsTestPlatform: 'x86'
+        testBinariesArtifactName: '$(TestBinariesArtifactName)'
+        nugetArtifactName: '$(NuGetArtifactName)'
+        testResultsArtifactName: '$(TestResultsArtifactName)'
+        maximumParallelJobs: $(maximumParallelJobs)
+        maximumAllowedFailures: $(maximumAllowedFailures)
+
   - job: Test_net5_0_x64
     condition: and(succeeded(), ne(variables['RunTests'], 'false'))
     strategy:
diff --git a/build/azure-templates/run-tests-on-os.yml b/build/azure-templates/run-tests-on-os.yml
index d578ab0..2436432 100644
--- a/build/azure-templates/run-tests-on-os.yml
+++ b/build/azure-templates/run-tests-on-os.yml
@@ -83,6 +83,13 @@ steps:
   displayName: 'Use .NET sdk 5.0.400'
   inputs:
     version: 5.0.400
+  condition: and(succeeded(), contains('${{ parameters.framework }}', 'net5.'))
+
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 6.0.100-rc.1'
+  inputs:
+    packageType: 'sdk'
+    version: '6.0.100-rc.1.21463.6'
 
 #- template: 'show-all-files.yml' # Uncomment for debugging
 - pwsh: |
diff --git a/build/build.ps1 b/build/build.ps1
index 52ea7a3..123172e 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -27,7 +27,7 @@ properties {
     [string]$publish_directory = "$release_directory/Publish"
     [string]$solutionFile = "$base_directory/Lucene.Net.sln"
     [string]$sdkPath = "$env:programfiles/dotnet/sdk"
-    [string]$sdkVersion = "5.0.400"
+    [string]$sdkVersion = "6.0.100-rc.1.21463.6"
     [bool]$skipSdkInstallation = $false
     [string]$globalJsonFile = "$base_directory/global.json"
     [string]$versionPropsFile = "$base_directory/Version.props"
@@ -49,7 +49,7 @@ properties {
     [int]$maximumParalellJobs = 8
     
     #test paramters
-    [string]$frameworks_to_test = "net5.0,netcoreapp3.1,net48,net461"
+    [string]$frameworks_to_test = "net6.0,net5.0,netcoreapp3.1,net48,net461"
     [string]$where = ""
 }