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 9bd6520d4fd40b1514f2c8a16f630663764069d7 Author: Shad Storhaug <[email protected]> AuthorDate: Fri Oct 25 21:23:58 2019 +0700 SWEEP: Changed test target framework from netcoreapp1.0 to netcoreapp1.1 --- TestTargetFramework.props | 4 ++-- azure-pipelines.yml | 6 +++--- .../azure-templates/publish-test-results-for-target-frameworks.yml | 2 +- build/build.ps1 | 2 +- .../Lucene.Net.Tests.Analysis.Common.csproj | 4 ++-- .../Lucene.Net.Tests.Analysis.Kuromoji.csproj | 6 +++--- .../Lucene.Net.Tests.Analysis.Phonetic.csproj | 4 ++-- .../Lucene.Net.Tests.Analysis.SmartCn.csproj | 6 +++--- .../Lucene.Net.Tests.Analysis.Stempel.csproj | 4 ++-- src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj | 6 +++--- .../Lucene.Net.Tests.Classification.csproj | 4 ++-- src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj | 4 ++-- src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj | 4 ++-- .../Lucene.Net.Tests.Expressions.csproj | 4 ++-- src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj | 4 ++-- src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj | 4 ++-- .../Lucene.Net.Tests.Highlighter.csproj | 6 +++--- src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj | 4 ++-- src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj | 4 ++-- src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj | 4 ++-- src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj | 4 ++-- .../Lucene.Net.Tests.QueryParser.csproj | 4 ++-- src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj | 4 ++-- src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj | 4 ++-- src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj | 6 +++--- src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj | 4 ++-- .../Lucene.Net.Tests.TestFramework.NUnit.csproj | 4 ++-- .../Lucene.Net.Tests.TestFramework.xUnit.csproj | 4 ++-- src/Lucene.Net.Tests._A-D/Lucene.Net.Tests._A-D.csproj | 4 ++-- src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj | 4 ++-- src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj | 6 ++---- src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj | 4 ++-- src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj | 4 ++-- src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs | 4 ++-- src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj | 6 +++--- 35 files changed, 75 insertions(+), 77 deletions(-) diff --git a/TestTargetFramework.props b/TestTargetFramework.props index f202cb1..1eadb7a 100644 --- a/TestTargetFramework.props +++ b/TestTargetFramework.props @@ -27,13 +27,13 @@ Note that the main libraries are multi-targeted, so this has no effect on how they are compiled, this setting only affects the test projects. --> <!--<TargetFramework>net451</TargetFramework>--> - <!--<TargetFramework>netcoreapp1.0</TargetFramework>--> + <!--<TargetFramework>netcoreapp1.1</TargetFramework>--> <TargetFramework>netcoreapp2.1</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' ">netcoreapp2.1;netcoreapp1.0</TargetFrameworks> + <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">netcoreapp2.1;netcoreapp1.1</TargetFrameworks> <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net451</TargetFrameworks> <TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework> </PropertyGroup> diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f57b108..4fd21d2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -224,7 +224,7 @@ stages: maximumParallelJobs: 7 maximumAllowedFailures: $(maximumAllowedFailures) - - job: Test_netcoreapp1_0 + - job: Test_netcoreapp1_1 condition: and(succeeded(), ne(variables['RunTests'], 'false')) strategy: matrix: @@ -240,14 +240,14 @@ stages: osName: 'macOS' imageName: 'macOS-10.14' maximumAllowedFailures: 4 # Maximum allowed failures for a successful build - displayName: 'Test netcoreapp1.0 on' + displayName: 'Test netcoreapp1.1 on' pool: vmImage: $(imageName) steps: - template: 'build/azure-templates/run-tests-on-os.yml' parameters: osName: $(osName) - testTargetFrameworks: 'netcoreapp1.0' + testTargetFrameworks: 'netcoreapp1.1' testResultsArtifactName: '$(TestResultsArtifactName)' publishedArtifactZipFileName: '$(PublishedArtifactZipFileName)' maximumParallelJobs: 7 diff --git a/build/azure-templates/publish-test-results-for-target-frameworks.yml b/build/azure-templates/publish-test-results-for-target-frameworks.yml index cc3af4f..009c44e 100644 --- a/build/azure-templates/publish-test-results-for-target-frameworks.yml +++ b/build/azure-templates/publish-test-results-for-target-frameworks.yml @@ -50,7 +50,7 @@ steps: - template: publish-test-results.yml parameters: - framework: 'netcoreapp1.0' + framework: 'netcoreapp1.1' testProjectName: '${{ parameters.testProjectName }}' osName: '${{ parameters.osName }}' testResultsFormat: '${{ parameters.testResultsFormat }}' diff --git a/build/build.ps1 b/build/build.ps1 index 9693969..a3eec77 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -48,7 +48,7 @@ properties { [int]$maximumParalellJobs = 8 #test paramters - [string]$frameworks_to_test = "netcoreapp2.1,netcoreapp1.0,net451" + [string]$frameworks_to_test = "netcoreapp2.1,netcoreapp1.1,net451" [string]$where = "" } diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj index dad8ffd..b759dde 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj +++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Analysis.Common</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -47,7 +47,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj index c41db1b..a368e2a 100644 --- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Analysis.Kuromoji</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -46,11 +46,11 @@ <DebugType>portable</DebugType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj index e7c97e2..b3b52a4 100644 --- a/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj +++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Analysis.Phonetic</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -43,7 +43,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj index 639ab03..8573c22 100644 --- a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Analysis.SmartCn</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -46,11 +46,11 @@ <DebugType>portable</DebugType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj index e691aae..c8a5754 100644 --- a/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj +++ b/src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Analysis.Stempel</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -46,7 +46,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj index eb82941..b8a1943 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Benchmark</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -53,11 +53,11 @@ <DebugType>portable</DebugType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj index a481236..135d98c 100644 --- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj +++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Classification</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -43,7 +43,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj index dd9e8c7..7fad164 100644 --- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj +++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Codecs</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -44,7 +44,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj index 44b2fc6..0669018 100644 --- a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj +++ b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Demo</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -46,7 +46,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj index 07ced3e..0d087fe 100644 --- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj +++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Expressions</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -43,7 +43,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj index bae2a72..d291ae5 100644 --- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj +++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Facet</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -44,7 +44,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj index 0873c4b..f4b6c36 100644 --- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj +++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Grouping</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -43,7 +43,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj index eea47a0..80a5b53 100644 --- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj +++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Highlighter</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -47,11 +47,11 @@ <DebugType>portable</DebugType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" /> </ItemGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj index a64d962..8988604 100644 --- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj +++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Join</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -43,7 +43,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj index cd8212b..d80ebc3 100644 --- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj +++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Memory</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -47,7 +47,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj index f36e9ef..8a0877d 100644 --- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj +++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Misc</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -42,7 +42,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj index 3fc9265..6aa1223 100644 --- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj +++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Queries</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -42,7 +42,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj index 5cb1cf4..f13a66b 100644 --- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj +++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.QueryParser</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -47,7 +47,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj index 2c5fb3c..37c9fa5 100644 --- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Replicator</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -49,7 +49,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj index 0da4bcd..d9b3f88 100644 --- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj +++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Sandbox</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -47,7 +47,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj index af18cfa..786e0fe 100644 --- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj +++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Spatial</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -51,11 +51,11 @@ <DebugType>portable</DebugType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj index 0b6ff79..5ecf694 100644 --- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj +++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.Suggest</AssemblyTitle> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> @@ -49,7 +49,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.TestFramework.NUnit/Lucene.Net.Tests.TestFramework.NUnit.csproj b/src/Lucene.Net.Tests.TestFramework.NUnit/Lucene.Net.Tests.TestFramework.NUnit.csproj index b9734d9..e875305 100644 --- a/src/Lucene.Net.Tests.TestFramework.NUnit/Lucene.Net.Tests.TestFramework.NUnit.csproj +++ b/src/Lucene.Net.Tests.TestFramework.NUnit/Lucene.Net.Tests.TestFramework.NUnit.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.TestFramework.NUnit</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> @@ -51,7 +51,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.TestFramework.xUnit/Lucene.Net.Tests.TestFramework.xUnit.csproj b/src/Lucene.Net.Tests.TestFramework.xUnit/Lucene.Net.Tests.TestFramework.xUnit.csproj index cab7dc7..cef9104 100644 --- a/src/Lucene.Net.Tests.TestFramework.xUnit/Lucene.Net.Tests.TestFramework.xUnit.csproj +++ b/src/Lucene.Net.Tests.TestFramework.xUnit/Lucene.Net.Tests.TestFramework.xUnit.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.TestFramework.xUnit</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> @@ -55,7 +55,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests._A-D/Lucene.Net.Tests._A-D.csproj b/src/Lucene.Net.Tests._A-D/Lucene.Net.Tests._A-D.csproj index 8987bdf..9e6dd36 100644 --- a/src/Lucene.Net.Tests._A-D/Lucene.Net.Tests._A-D.csproj +++ b/src/Lucene.Net.Tests._A-D/Lucene.Net.Tests._A-D.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests._A-D</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> @@ -58,7 +58,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj b/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj index 90d0940..a5d5f68 100644 --- a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj +++ b/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests._E-I</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> @@ -56,7 +56,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj b/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj index 4c7236c..66b4484 100644 --- a/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj +++ b/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests._J-S</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> @@ -57,8 +57,6 @@ <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> - - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> @@ -70,7 +68,7 @@ <DebugType>full</DebugType> </PropertyGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <Compile Remove="..\Lucene.Net.Tests\Support\TestCase.cs" /> </ItemGroup> diff --git a/src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj b/src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj index 5fabbd5..b73fa87 100644 --- a/src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj +++ b/src/Lucene.Net.Tests._T-U/Lucene.Net.Tests._T-U.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests._T-U</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> @@ -57,7 +57,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj b/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj index e67536c..e227333 100644 --- a/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj +++ b/src/Lucene.Net.Tests._U-Z/Lucene.Net.Tests._U-Z.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests._U-Z</AssemblyTitle> <RootNamespace>Lucene.Net</RootNamespace> @@ -59,7 +59,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs b/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs index 389696b..0e08523 100644 --- a/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs +++ b/src/Lucene.Net.Tests/Support/TestLurchTableThreading.cs @@ -77,7 +77,7 @@ namespace Lucene.Net.Support // LUCENENET TODO: For some reason, this logic depends on the underlying // implementation of Guid.NewGuid(), which has changed in .NET Core 2.0. // But the functionality of LurchTable seems unaffected by this change. -#if !NETCOREAPP2_1 +#if !NETCOREAPP [Test, LuceneNetSpecific] public void TestGuidHashCollision() { @@ -248,7 +248,7 @@ namespace Lucene.Net.Support ); Guid result = new Guid(bytes); -#if !NETCOREAPP2_1 +#if !NETCOREAPP Assert.AreEqual(guid.GetHashCode(), result.GetHashCode()); #endif return result; diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj index e7de7c8..1efa553 100644 --- a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj +++ b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj @@ -24,7 +24,7 @@ <Import Project="$(SolutionDir)TestTargetFramework.props" /> <PropertyGroup> - <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> + <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback> <AssemblyTitle>Lucene.Net.Tests.ICU</AssemblyTitle> <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR</DefineConstants> @@ -68,7 +68,7 @@ <PackageReference Include="ICU4N.Transliterator" Version="$(ICU4NTransliteratorPackageVersion)" /> </ItemGroup> - <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> <PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" /> </ItemGroup> @@ -78,7 +78,7 @@ <DebugType>portable</DebugType> </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' "> <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD1_6</DefineConstants> <DebugType>portable</DebugType> </PropertyGroup>
