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 a703534fbc5681c316ca9b9b9dabdc5b5dcdfe83 Author: Shad Storhaug <[email protected]> AuthorDate: Sun Jul 7 04:58:38 2019 +0700 Moved all PackageReference versions to a common build/Dependencies.props file. Also moved common test project references (NUnit, Microsoft.NET.Test.Sdk, etc) into a common project file build/TestReferences.Common.targets. --- Directory.Build.props | 2 ++ Lucene.Net.sln | 2 ++ build/Dependencies.props | 41 ++++++++++++++++++++++ build/TestReferences.Common.targets | 10 ++++++ .../Lucene.Net.Analysis.Common.csproj | 2 +- .../Lucene.Net.Analysis.Kuromoji.csproj | 6 ++-- .../Lucene.Net.Analysis.SmartCn.csproj | 6 ++-- .../Lucene.Net.Benchmark.csproj | 12 +++---- src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj | 2 +- .../Lucene.Net.Expressions.csproj | 14 ++++---- src/Lucene.Net.Facet/Lucene.Net.Facet.csproj | 4 +-- .../Lucene.Net.Highlighter.csproj | 2 +- .../Lucene.Net.QueryParser.csproj | 2 +- .../Lucene.Net.Replicator.csproj | 2 +- src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 2 +- .../Lucene.Net.TestFramework.csproj | 12 +++---- .../Lucene.Net.Tests.Analysis.Common.csproj | 9 +---- .../Lucene.Net.Tests.Analysis.Kuromoji.csproj | 11 ++---- .../Lucene.Net.Tests.Analysis.Phonetic.csproj | 9 +---- .../Lucene.Net.Tests.Analysis.SmartCn.csproj | 13 ++----- .../Lucene.Net.Tests.Analysis.Stempel.csproj | 9 +---- .../Lucene.Net.Tests.Benchmark.csproj | 12 +++---- .../Lucene.Net.Tests.Classification.csproj | 9 +---- .../Lucene.Net.Tests.Codecs.csproj | 9 +---- .../Lucene.Net.Tests.Demo.csproj | 9 +---- .../Lucene.Net.Tests.Expressions.csproj | 9 +---- .../Lucene.Net.Tests.Facet.csproj | 9 +---- .../Lucene.Net.Tests.Grouping.csproj | 9 +---- .../Lucene.Net.Tests.Highlighter.csproj | 11 ++---- .../Lucene.Net.Tests.Join.csproj | 9 +---- .../Lucene.Net.Tests.Memory.csproj | 9 +---- .../Lucene.Net.Tests.Misc.csproj | 9 +---- .../Lucene.Net.Tests.Queries.csproj | 9 +---- .../Lucene.Net.Tests.QueryParser.csproj | 9 +---- .../Lucene.Net.Tests.Replicator.csproj | 12 +++---- .../Lucene.Net.Tests.Sandbox.csproj | 9 +---- .../Lucene.Net.Tests.Spatial.csproj | 14 +++----- .../Lucene.Net.Tests.Suggest.csproj | 9 +---- src/Lucene.Net.Tests/Lucene.Net.Tests.csproj | 9 +---- src/Lucene.Net/Lucene.Net.csproj | 26 +++++++------- src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 6 ++-- .../Lucene.Net.Replicator.AspNetCore.csproj | 2 +- .../Lucene.Net.Tests.ICU.csproj | 14 +++----- .../Lucene.Net.Tests.Cli.csproj | 9 +---- 44 files changed, 148 insertions(+), 256 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index f4d5eee..fc37121 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,6 +19,8 @@ --> <Project> + <Import Project="build\Dependencies.props" /> + <PropertyGroup Label="NuGet Package Defaults"> <IsPackable>false</IsPackable> </PropertyGroup> diff --git a/Lucene.Net.sln b/Lucene.Net.sln index 8d25e3c..5fcb135 100644 --- a/Lucene.Net.sln +++ b/Lucene.Net.sln @@ -30,8 +30,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4016BDAB ProjectSection(SolutionItems) = preProject build.bat = build.bat build\build.ps1 = build\build.ps1 + build\Dependencies.props = build\Dependencies.props build\NuGet.props = build\NuGet.props src\CommonAssemblyInfo.cs = src\CommonAssemblyInfo.cs + build\TestReferences.Common.targets = build\TestReferences.Common.targets TestTargetFramework.proj = TestTargetFramework.proj Version.proj = Version.proj EndProjectSection diff --git a/build/Dependencies.props b/build/Dependencies.props new file mode 100644 index 0000000..e71518f --- /dev/null +++ b/build/Dependencies.props @@ -0,0 +1,41 @@ +<Project> + <PropertyGroup Label="NuGet Package Reference Versions"> + <Antlr3RuntimePackageVersion>3.5.1</Antlr3RuntimePackageVersion> + <IcuNetPackageVersion>54.1.1-alpha</IcuNetPackageVersion> + <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>1.0.3</MicrosoftAspNetCoreHttpAbstractionsPackageVersion> + <MicrosoftAspNetCoreTestHostPackageVersion>1.0.3</MicrosoftAspNetCoreTestHostPackageVersion> + <MicrosoftCSharpPackageVersion>4.4.0</MicrosoftCSharpPackageVersion> + <MicrosoftExtensionsDependencyModelPackageVersion>2.0.0</MicrosoftExtensionsDependencyModelPackageVersion> + <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion> + <NETStandardLibrary16PackageVersion>1.6.1</NETStandardLibrary16PackageVersion> + <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> + <NewtonsoftJsonPackageVersion>10.0.3</NewtonsoftJsonPackageVersion> + <NUnitPackageVersion>3.8.1</NUnitPackageVersion> + <NUnit3TestAdapterPackageVersion>3.8.0</NUnit3TestAdapterPackageVersion> + <SharpZipLibPackageVersion>0.86.0</SharpZipLibPackageVersion> + <SharpZipLibNETStandardPackageVersion>0.86.0.1</SharpZipLibNETStandardPackageVersion> + <Spatial4nCorePackageVersion>0.4.1-beta00007</Spatial4nCorePackageVersion> + <Spatial4nCoreNTSPackageVersion>0.4.1-beta00007</Spatial4nCoreNTSPackageVersion> + <SystemCollectionsNonGenericPackageVersion>4.3.0</SystemCollectionsNonGenericPackageVersion> + <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion> + <SystemComponentModelPrimitivesPackageVersion>4.3.0</SystemComponentModelPrimitivesPackageVersion> + <SystemDiagnosticsProcessPackageVersion>4.3.0</SystemDiagnosticsProcessPackageVersion> + <SystemDiagnosticsStackTracePackageVersion>4.3.0</SystemDiagnosticsStackTracePackageVersion> + <SystemDiagnosticsTraceSourcePackageVersion>4.3.0</SystemDiagnosticsTraceSourcePackageVersion> + <SystemGlobalizationExtensionsPackageVersion>4.3.0</SystemGlobalizationExtensionsPackageVersion> + <SystemGlobalizationPackageVersion>4.3.0</SystemGlobalizationPackageVersion> + <SystemIOMemoryMappedFilesPackageVersion>4.3.0</SystemIOMemoryMappedFilesPackageVersion> + <SystemNetNameResolutionPackageVersion>4.3.0</SystemNetNameResolutionPackageVersion> + <SystemNetPrimitivesPackageVersion>4.3.0</SystemNetPrimitivesPackageVersion> + <SystemNetSocketsPackageVersion>4.3.0</SystemNetSocketsPackageVersion> + <SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion> + <SystemReflectionEmitILGenerationPackageVersion>4.3.0</SystemReflectionEmitILGenerationPackageVersion> + <SystemReflectionTypeExtensionsPackageVersion>4.3.0</SystemReflectionTypeExtensionsPackageVersion> + <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion> + <SystemTextEncodingCodePagesPackageVersion>4.3.0</SystemTextEncodingCodePagesPackageVersion> + <SystemThreadingThreadPackageVersion>4.3.0</SystemThreadingThreadPackageVersion> + <SystemThreadingThreadPoolPackageVersion>4.3.0</SystemThreadingThreadPoolPackageVersion> + <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion> + <TeamCityVSTestTestAdapterPackageVersion>1.0.5</TeamCityVSTestTestAdapterPackageVersion> + </PropertyGroup> +</Project> \ No newline at end of file diff --git a/build/TestReferences.Common.targets b/build/TestReferences.Common.targets new file mode 100644 index 0000000..a7d30d4 --- /dev/null +++ b/build/TestReferences.Common.targets @@ -0,0 +1,10 @@ +<Project> + <ItemGroup Label="Test Project Common References"> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" /> + <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" /> + <PackageReference Include="NUnit3TestAdapter" Version="$(NUnit3TestAdapterPackageVersion)" /> + <!-- Required by NUnit3TestAdapter on .NET Core --> + <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" /> + <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="$(TeamCityVSTestTestAdapterPackageVersion)" /> + </ItemGroup> +</Project> \ No newline at end of file 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 4f5e3b1..36fcd49 100644 --- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj +++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj @@ -59,7 +59,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" /> + <PackageReference Include="System.ComponentModel.Primitives" Version="$(SystemComponentModelPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' "> 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 ca2abe7..8c12316 100644 --- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj @@ -50,7 +50,7 @@ <!-- 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' "> - <PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" /> + <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> @@ -59,8 +59,8 @@ </PropertyGroup>--> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Globalization.Extensions" Version="4.3.0" /> - <PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" /> + <PackageReference Include="System.Globalization.Extensions" Version="$(SystemGlobalizationExtensionsPackageVersion)" /> + <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> 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 934fcdc..25b7cd4 100644 --- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj @@ -52,11 +52,11 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="icu.net" Version="54.1.1-alpha" /> + <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> </ItemGroup> <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> - <PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" /> + <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> @@ -65,7 +65,7 @@ </PropertyGroup>--> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" /> + <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj index 494df7a..18bf87e 100644 --- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj +++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj @@ -55,13 +55,13 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="icu.net" Version="54.1.1-alpha" /> - <PackageReference Include="Spatial4n.Core" Version="0.4.1-beta00007" /> + <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> + <PackageReference Include="Spatial4n.Core" Version="$(Spatial4nCorePackageVersion)" /> </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' "> - <PackageReference Include="SharpZipLib.NETStandard" Version="0.86.0.1" /> + <PackageReference Include="SharpZipLib.NETStandard" Version="$(SharpZipLibNETStandardPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> @@ -69,8 +69,8 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="SharpZipLib.NETStandard" Version="0.86.0.1" /> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="SharpZipLib.NETStandard" Version="$(SharpZipLibNETStandardPackageVersion)" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> @@ -83,7 +83,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'net45' "> - <PackageReference Include="SharpZipLib" Version="0.86.0" /> + <PackageReference Include="SharpZipLib" Version="$(SharpZipLibPackageVersion)" /> <Reference Include="System" /> <Reference Include="Microsoft.CSharp" /> </ItemGroup> diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj index 5cb5a8b..966f8df 100644 --- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj +++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj @@ -51,7 +51,7 @@ </PropertyGroup>--> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="Microsoft.CSharp" Version="4.4.0" /> + <PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj index 34f34d6..4c889da 100644 --- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj +++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj @@ -48,13 +48,13 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Antlr3.Runtime" Version="3.5.1" /> + <PackageReference Include="Antlr3.Runtime" Version="$(Antlr3RuntimePackageVersion)" /> </ItemGroup> <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> - <PackageReference Include="System.Reflection.Emit" Version="4.3.0" /> - <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" /> - <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" /> + <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" /> + <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="$(SystemReflectionEmitILGenerationPackageVersion)" /> + <PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> @@ -63,9 +63,9 @@ </PropertyGroup>--> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Reflection.Emit" Version="4.3.0" /> - <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" /> - <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" /> + <PackageReference Include="System.Reflection.Emit" Version="$(SystemReflectionEmitPackageVersion)" /> + <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="$(SystemReflectionEmitILGenerationPackageVersion)" /> + <PackageReference Include="System.Reflection.TypeExtensions" Version="$(SystemReflectionTypeExtensionsPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj index 399d43a..39bae76 100644 --- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj +++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj @@ -53,8 +53,8 @@ </PropertyGroup>--> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Threading.Thread" Version="4.3.0" /> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadPackageVersion)" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj index f900596..2a0fc17 100644 --- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj +++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj @@ -52,7 +52,7 @@ </PropertyGroup>--> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj index ce388fd..ed0d525 100644 --- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj +++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj @@ -55,7 +55,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" /> + <PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj index bd17773..7868f65 100644 --- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj +++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj @@ -48,7 +48,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> + <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> </ItemGroup> <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj index 6e6ce65..c1ff135 100644 --- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj +++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj @@ -53,7 +53,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Spatial4n.Core" Version="0.4.1-beta00007" /> + <PackageReference Include="Spatial4n.Core" Version="$(Spatial4nCorePackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 0443b6e..1094a83 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -52,8 +52,8 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="icu.net" Version="54.1.1-alpha" /> - <PackageReference Include="NUnit" Version="3.8.1" /> + <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> + <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> @@ -62,10 +62,10 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" /> - <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" /> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> - <PackageReference Include="System.Threading.Thread" Version="4.3.0" /> + <PackageReference Include="System.Diagnostics.StackTrace" Version="$(SystemDiagnosticsStackTracePackageVersion)" /> + <PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourcePackageVersion)" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> + <PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> 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 ff5f81d..73bc732 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 @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> 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 a8f0409..4d9c1af 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 @@ -48,21 +48,14 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> 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 a8687fb..8584dbe 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 @@ -47,14 +47,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> 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 cbc3d35..87e339d 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 @@ -47,17 +47,10 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup>--> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> @@ -65,7 +58,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> 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 1855b82..522db08 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 @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 ae8a4bd..b313765 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -50,15 +50,11 @@ <ProjectReference Include="..\Lucene.Net.Highlighter\Lucene.Net.Highlighter.csproj" /> <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> + + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <ItemGroup> - <PackageReference Include="icu.net" Version="54.1.1-alpha" /> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> + <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> @@ -66,7 +62,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> 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 21a2171..c52fe26 100644 --- a/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj +++ b/src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 00aa964..79d2449 100644 --- a/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj +++ b/src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> 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 375e7d2..67a924d 100644 --- a/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj +++ b/src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 71daf18..2a66b0b 100644 --- a/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj +++ b/src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 6e06b72..bee0686 100644 --- a/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj +++ b/src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY</DefineConstants> 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 44924ec..11527c0 100644 --- a/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj +++ b/src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 b7ae873..6cfd595 100644 --- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj +++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj @@ -49,21 +49,14 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" /> + <PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> 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 a1a0f26..6a1f46f 100644 --- a/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj +++ b/src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj @@ -48,14 +48,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 e562a58..4b1235b 100644 --- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj +++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj @@ -49,14 +49,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 ac42151..5edf464 100644 --- a/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj +++ b/src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj @@ -47,14 +47,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 79302f8..4575b4e 100644 --- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj +++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj @@ -47,14 +47,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 8c0fe07..f14328c 100644 --- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj +++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj @@ -49,14 +49,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 22cd711..ecb3ace 100644 --- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj @@ -47,16 +47,12 @@ <ProjectReference Include="..\dotnet\Lucene.Net.Replicator.AspNetCore\Lucene.Net.Replicator.AspNetCore.csproj" /> <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> + + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.0.3" /> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> + <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" /> + <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> 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 2e756f3..21322d3 100644 --- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj +++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj @@ -49,14 +49,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType> 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 d28f8f0..047145a 100644 --- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj +++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj @@ -47,16 +47,12 @@ <ProjectReference Include="..\Lucene.Net.Spatial\Lucene.Net.Spatial.csproj" /> <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> + + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <PackageReference Include="Spatial4n.Core" Version="0.4.1-beta00007" /> - <PackageReference Include="Spatial4n.Core.NTS" Version="0.4.1-beta00007" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> + <PackageReference Include="Spatial4n.Core" Version="$(Spatial4nCorePackageVersion)" /> + <PackageReference Include="Spatial4n.Core.NTS" Version="$(Spatial4nCoreNTSPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> @@ -64,7 +60,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> 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 6938c79..9beb24f 100644 --- a/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj +++ b/src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj @@ -50,14 +50,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY</DefineConstants> diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj index 82ff392..d8dc3a4 100644 --- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj +++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj @@ -54,14 +54,7 @@ <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE</DefineConstants> diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index a660f0d..b988d57 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -42,22 +42,22 @@ </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> - <PackageReference Include="Microsoft.CSharp" Version="4.4.0" /> + <PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" /> </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="Microsoft.CSharp" Version="4.4.0" /> - <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" /> - <PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> - <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" /> - <PackageReference Include="System.Collections.Specialized" Version="4.3.0" /> - <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" /> - <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" /> - <PackageReference Include="System.IO.MemoryMappedFiles" Version="4.3.0" /> - <PackageReference Include="System.Net.NameResolution" Version="4.3.0" /> - <PackageReference Include="System.Net.Sockets" Version="4.3.0" /> - <PackageReference Include="System.Threading.Thread" Version="4.3.0" /> - <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" /> + <PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" /> + <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" /> + <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> + <PackageReference Include="System.Collections.NonGeneric" Version="$(SystemCollectionsNonGenericPackageVersion)" /> + <PackageReference Include="System.Collections.Specialized" Version="$(SystemCollectionsSpecializedPackageVersion)" /> + <PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessPackageVersion)" /> + <PackageReference Include="System.Diagnostics.TraceSource" Version="$(SystemDiagnosticsTraceSourcePackageVersion)" /> + <PackageReference Include="System.IO.MemoryMappedFiles" Version="$(SystemIOMemoryMappedFilesPackageVersion)" /> + <PackageReference Include="System.Net.NameResolution" Version="$(SystemNetNameResolutionPackageVersion)" /> + <PackageReference Include="System.Net.Sockets" Version="$(SystemNetSocketsPackageVersion)" /> + <PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadPackageVersion)" /> + <PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolPackageVersion)" /> </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 --> diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj index 69b9802..2607d48 100644 --- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj +++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj @@ -59,7 +59,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="icu.net" Version="54.1.1-alpha" /> + <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> </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 --> @@ -69,8 +69,8 @@ </PropertyGroup>--> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> - <PackageReference Include="System.Globalization" Version="4.3.0" /> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> + <PackageReference Include="System.Globalization" Version="$(SystemGlobalizationPackageVersion)" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> 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 002ddf9..df124a8 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 @@ -48,7 +48,7 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.0.3" /> + <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(MicrosoftAspNetCoreHttpAbstractionsPackageVersion)" /> </ItemGroup> <!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> 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 8bae0a0..16d50ca 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 @@ -60,19 +60,15 @@ <ProjectReference Include="..\..\Lucene.Net.Tests.Analysis.Common\Lucene.Net.Tests.Analysis.Common.csproj" /> </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> + <ItemGroup> - <PackageReference Include="icu.net" Version="54.1.1-alpha" /> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> + <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> - <PackageReference Include="System.Net.Primitives" Version="4.3.0" /> - <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" /> + <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> + <PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" /> </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> 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 48e3774..3fec7de 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 @@ -45,14 +45,7 @@ <ProjectReference Include="..\..\..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" /> </ItemGroup> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" /> - <PackageReference Include="NUnit" Version="3.8.1" /> - <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" /> - <!-- Required by NUnit3TestAdapter on .NET Core --> - <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" /> - <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.5" /> - </ItemGroup> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' "> <DebugType>portable</DebugType>
