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 e6dd79f054bac0a3c78a4aaee9475b62fb7f9c9d Author: Shad Storhaug <[email protected]> AuthorDate: Sun Jul 14 04:45:39 2019 +0700 Added .NET Standard 2.0 target to projects where it was missing (fixes #216) --- src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj | 2 +- .../Lucene.Net.Analysis.Kuromoji.csproj | 8 ++++---- .../Lucene.Net.Analysis.Phonetic.csproj | 8 ++++---- .../Lucene.Net.Analysis.SmartCn.csproj | 8 ++++---- .../Lucene.Net.Analysis.Stempel.csproj | 8 ++++---- src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj | 2 +- src/Lucene.Net.Classification/Lucene.Net.Classification.csproj | 8 ++++---- src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj | 8 ++++---- src/Lucene.Net.Demo/Lucene.Net.Demo.csproj | 2 +- src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj | 8 ++++---- src/Lucene.Net.Facet/Lucene.Net.Facet.csproj | 8 ++++---- src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj | 8 ++++---- src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj | 8 ++++---- src/Lucene.Net.Join/Lucene.Net.Join.csproj | 8 ++++---- src/Lucene.Net.Memory/Lucene.Net.Memory.csproj | 2 +- src/Lucene.Net.Misc/Lucene.Net.Misc.csproj | 8 ++++---- src/Lucene.Net.Queries/Lucene.Net.Queries.csproj | 8 ++++---- src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj | 2 +- src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj | 8 ++++---- src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj | 8 ++++---- src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 2 +- src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj | 8 ++++---- src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj | 2 +- src/Lucene.Net/Lucene.Net.csproj | 2 +- src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 8 ++++---- .../Lucene.Net.Replicator.AspNetCore.csproj | 8 ++++---- 26 files changed, 80 insertions(+), 80 deletions(-) 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 4a83c67..780f3bd 100644 --- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj +++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj @@ -25,7 +25,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Analysis.Common</AssemblyTitle> 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 1d027e2..80539b1 100644 --- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Analysis.Kuromoji</AssemblyTitle> @@ -46,14 +46,14 @@ </ItemGroup> <!-- NOTE: Microsoft's recommendation is not to use the ICloneable interface. We put in a FEATURE_CLONEABLE constant in case anyone wants to add it to the build --> - <!--<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' "> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' "> <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <PackageReference Include="System.Globalization.Extensions" Version="$(SystemGlobalizationExtensionsPackageVersion)" /> 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 33e5b57..dc0e7b9 100644 --- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj +++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Analysis.Phonetic</AssemblyTitle> @@ -46,9 +46,9 @@ <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> 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 7dcbd6c..62bc605 100644 --- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Analysis.SmartCn</AssemblyTitle> @@ -53,14 +53,14 @@ <PackageReference Include="ICU4N" Version="$(ICU4NPackageVersion)" /> </ItemGroup> - <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> 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 869f298..1125e00 100644 --- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj +++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Analysis.Stempel</AssemblyTitle> @@ -44,9 +44,9 @@ <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj index b5fbd7d..f1d5b73 100644 --- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj +++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj @@ -25,7 +25,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Benchmark</AssemblyTitle> diff --git a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj index 7e80480..fa3997f 100644 --- a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj +++ b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Classification</AssemblyTitle> @@ -40,9 +40,9 @@ <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj index c37d2b1..0fb6086 100644 --- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj +++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Codecs</AssemblyTitle> @@ -39,9 +39,9 @@ <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" /> diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj index 88f5210..7d6bf28 100644 --- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj +++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj @@ -25,7 +25,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Demo</AssemblyTitle> diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj index 68ed9af..5f2c880 100644 --- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj +++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Expressions</AssemblyTitle> @@ -47,7 +47,7 @@ <PackageReference Include="Antlr3.Runtime" Version="$(Antlr3RuntimePackageVersion)" /> </ItemGroup> - <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" /> <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="$(SystemReflectionEmitILGenerationPackageVersion)" /> <PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsPackageVersion)" /> @@ -56,7 +56,7 @@ <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" /> diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj index bc1c6b2..6409055 100644 --- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj +++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Facet</AssemblyTitle> @@ -45,9 +45,9 @@ </ItemGroup> <!-- NOTE: Microsoft's recommendation is not to use the ICloneable interface. We put in a FEATURE_CLONEABLE constant in case anyone wants to add it to the build --> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadPackageVersion)" /> diff --git a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj index 2e2f5aa..34c3fe5 100644 --- a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj +++ b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Grouping</AssemblyTitle> @@ -40,9 +40,9 @@ <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj index 9eed3b2..642b6f2 100644 --- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj +++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Highlighter</AssemblyTitle> @@ -44,9 +44,9 @@ <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj index dd282c8..425ea9b 100644 --- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj +++ b/src/Lucene.Net.Join/Lucene.Net.Join.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Join</AssemblyTitle> @@ -43,9 +43,9 @@ <ProjectReference Include="..\Lucene.Net.Grouping\Lucene.Net.Grouping.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj index 5bcb143..d24a383 100644 --- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj +++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj @@ -25,7 +25,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Memory</AssemblyTitle> diff --git a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj index fbdc51b..372359d 100644 --- a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj +++ b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Misc</AssemblyTitle> @@ -43,9 +43,9 @@ <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj index cdcb187..b49a13c 100644 --- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj +++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Queries</AssemblyTitle> @@ -39,9 +39,9 @@ <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj index b331207..c2ceb39 100644 --- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj +++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj @@ -25,7 +25,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.QueryParser</AssemblyTitle> diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj index cd59401..a7e2473 100644 --- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj +++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Replicator</AssemblyTitle> @@ -44,9 +44,9 @@ <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj index 77abfff..2735c79 100644 --- a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj +++ b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Sandbox</AssemblyTitle> @@ -39,9 +39,9 @@ <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj index c23ed96..89e895a 100644 --- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj +++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj @@ -25,7 +25,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Spatial</AssemblyTitle> diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj index 245ff95..4018c0c 100644 --- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj +++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Suggest</AssemblyTitle> @@ -45,9 +45,9 @@ <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType> diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 86dea98..8557b51 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -26,7 +26,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.TestFramework</AssemblyTitle> diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index 55a85cd..a0bd3c2 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -25,7 +25,7 @@ <PropertyGroup> <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net</AssemblyTitle> diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj index 1bb0ade..f59941b 100644 --- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj +++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj @@ -24,8 +24,8 @@ <Import Project="$(SolutionDir)build/NuGet.props" /> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net45</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.ICU</AssemblyTitle> @@ -69,10 +69,10 @@ </ItemGroup> <!-- NOTE: Microsoft's recommendation is not to use the ICloneable interface. We put in a FEATURE_CLONEABLE constant in case anyone wants to add it to the build --> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <PackageReference Include="System.Globalization" Version="$(SystemGlobalizationPackageVersion)" /> 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 c8a4a1b..d97b993 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,8 +25,8 @@ <!--<Import Project="$(SolutionDir)build/NuGet.props" />--> <PropertyGroup> - <TargetFrameworks>netstandard1.6</TargetFrameworks> - <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks> + <TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks> + <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Replicator.AspNetCore</AssemblyTitle> @@ -44,9 +44,9 @@ <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(MicrosoftAspNetCoreHttpAbstractionsPackageVersion)" /> </ItemGroup> - <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <DebugType>portable</DebugType> - </PropertyGroup>--> + </PropertyGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <DebugType>portable</DebugType>
