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:50 UTC
[lucenenet] 02/03: SWEEP: Added target for net6.0
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>