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 667131c5272594e905c6893af98c3fceaaa14783 Author: Shad Storhaug <[email protected]> AuthorDate: Tue Jan 4 04:17:24 2022 +0700 Directory.Build.props: Migrated Dependencies.props reference here so it can conditionally select package reference versions based on target framework. Moved Source Link references here, too so the version numbers can be resolved. --- Directory.Build.props | 15 ++++++--------- Directory.Build.targets | 12 ++++++++++++ TestTargetFramework.props | 2 -- build/Dependencies.props | 2 ++ .../Lucene.Net.Analysis.Common.csproj | 2 +- .../Lucene.Net.Analysis.Kuromoji.csproj | 2 +- .../Lucene.Net.Analysis.Morfologik.csproj | 2 +- .../Lucene.Net.Analysis.OpenNLP.csproj | 2 +- .../Lucene.Net.Analysis.Phonetic.csproj | 2 +- .../Lucene.Net.Analysis.SmartCn.csproj | 2 +- .../Lucene.Net.Analysis.Stempel.csproj | 2 +- src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj | 2 +- .../Lucene.Net.Classification.csproj | 2 +- src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj | 2 +- src/Lucene.Net.Demo/Lucene.Net.Demo.csproj | 2 +- src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj | 2 +- src/Lucene.Net.Facet/Lucene.Net.Facet.csproj | 2 +- src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj | 2 +- src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj | 2 +- src/Lucene.Net.Join/Lucene.Net.Join.csproj | 2 +- src/Lucene.Net.Memory/Lucene.Net.Memory.csproj | 2 +- src/Lucene.Net.Misc/Lucene.Net.Misc.csproj | 2 +- src/Lucene.Net.Queries/Lucene.Net.Queries.csproj | 2 +- src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj | 2 +- src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj | 2 +- src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj | 2 +- src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 2 +- src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj | 2 +- .../Lucene.Net.TestFramework.csproj | 2 +- src/Lucene.Net/Lucene.Net.csproj | 2 +- .../Lucene.Net.CodeAnalysis.CSharp.csproj | 2 +- .../Lucene.Net.CodeAnalysis.VisualBasic.csproj | 2 +- src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 2 +- .../Lucene.Net.Replicator.AspNetCore.csproj | 2 +- .../Lucene.Net.Tests.CodeAnalysis.csproj | 2 +- .../Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj | 2 -- src/dotnet/tools/lucene-cli/lucene-cli.csproj | 2 -- 37 files changed, 51 insertions(+), 46 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8881ad5..92f0a4c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,6 +20,12 @@ --> <Project> <PropertyGroup> + <!-- According to the docs (https://docs.microsoft.com/en-us/cpp/build/reference/common-macros-for-build-commands-and-properties?view=vs-2019), the + SolutionDir is only available when running in the IDE, so we patch to ensure it also works when using dotnet.exe --> + <SolutionDir Condition=" '$(SolutionDir)' == '' ">$(MSBuildThisFileDirectory)</SolutionDir> + </PropertyGroup> + + <PropertyGroup> <LangVersion>9.0</LangVersion> </PropertyGroup> @@ -74,15 +80,6 @@ <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> </PropertyGroup> - <!-- This is for testing only, we use SourceLink from any Azure DevOps git repo --> - <ItemGroup Condition=" '$(BUILD_REPOSITORY_PROVIDER)' == 'TfsGit' " Label="SourceLink Packages (experimental Azure Repos)"> - <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.1" PrivateAssets="All"/> - </ItemGroup> - - <ItemGroup Condition=" '$(BUILD_REPOSITORY_PROVIDER)' == 'GitHub' " Label="SourceLink Packages (main repo)"> - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/> - </ItemGroup> - <!-- Settings to override the above Version of Builds. These can be used to "freeze" the build number for a release, so whether building within an IDE or from the commmand line, the version is always what is diff --git a/Directory.Build.targets b/Directory.Build.targets index f435cdd..a436d23 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -20,6 +20,8 @@ --> <Project> + <Import Project="$(SolutionDir)build/Dependencies.props" /> + <!-- Features in .NET 5.x and .NET 6.x only --> <PropertyGroup Condition=" $(TargetFramework.StartsWith('net5.')) Or $(TargetFramework.StartsWith('net6.')) "> @@ -135,6 +137,16 @@ </ItemGroup> </Target> + <!-- Global PackageReferences --> + <!-- This is for testing only, we use SourceLink from any Azure DevOps git repo --> + <ItemGroup Condition=" '$(BUILD_REPOSITORY_PROVIDER)' == 'TfsGit' " Label="SourceLink Packages (experimental Azure Repos)"> + <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkAzureReposGitPackageReferenceVersion)" PrivateAssets="All"/> + </ItemGroup> + + <ItemGroup Condition=" '$(BUILD_REPOSITORY_PROVIDER)' == 'GitHub' " Label="SourceLink Packages (main repo)"> + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageReferenceVersion)" PrivateAssets="All"/> + </ItemGroup> + <Import Project="build\Release.targets" Condition="Exists('build\Release.targets')" /> </Project> \ No newline at end of file diff --git a/TestTargetFramework.props b/TestTargetFramework.props index d8f4194..88c4d5d 100644 --- a/TestTargetFramework.props +++ b/TestTargetFramework.props @@ -69,7 +69,5 @@ <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn> <NoWarn Label="Naming rule violation">$(NoWarn);IDE1006</NoWarn> </PropertyGroup> - - <Import Project="build/Dependencies.props" /> </Project> diff --git a/build/Dependencies.props b/build/Dependencies.props index eda7bd0..819cfd6 100644 --- a/build/Dependencies.props +++ b/build/Dependencies.props @@ -60,6 +60,8 @@ <MicrosoftExtensionsDependencyInjectionPackageVersion>$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)</MicrosoftExtensionsDependencyInjectionPackageVersion> <MicrosoftExtensionsOptionsPackageVersion>2.0.0</MicrosoftExtensionsOptionsPackageVersion> <MicrosoftNETTestSdkPackageVersion>16.6.1</MicrosoftNETTestSdkPackageVersion> + <MicrosoftSourceLinkAzureReposGitPackageReferenceVersion>1.1.1</MicrosoftSourceLinkAzureReposGitPackageReferenceVersion> + <MicrosoftSourceLinkGitHubPackageReferenceVersion>$(MicrosoftSourceLinkAzureReposGitPackageReferenceVersion)</MicrosoftSourceLinkGitHubPackageReferenceVersion> <MorfologikFsaPackageVersion>2.1.7-beta-0004</MorfologikFsaPackageVersion> <MorfologikPolishPackageVersion>$(MorfologikFsaPackageVersion)</MorfologikPolishPackageVersion> <MorfologikStemmingPackageVersion>$(MorfologikFsaPackageVersion)</MorfologikStemmingPackageVersion> 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 16f6f5d..338752a 100644 --- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj +++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <EmbeddedResource Include="**/*.rslp" Exclude="bin/**/*;obj/**/*" Label="RSLP Test Data" /> diff --git a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj index 9f488b5..56d40f4 100644 --- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> diff --git a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj index 4a16060..39c8c38 100644 --- a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj +++ b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj @@ -40,7 +40,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <Compile Remove="Properties\AssemblyInfo.cs" /> diff --git a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj index 6e7546f..4923a99 100644 --- a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj +++ b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj @@ -40,7 +40,7 @@ <RootNamespace>Lucene.Net.Analysis.OpenNlp</RootNamespace> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" /> diff --git a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj index a021405..0000d0d 100644 --- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj +++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <EmbeddedResource Include="Language\*.txt" /> 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 14f4ee9..1fa5f59 100644 --- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <EmbeddedResource Include="Hhmm/*.mem" Label="Dict Test Data" /> diff --git a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj index 4794100..a27a5a2 100644 --- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj +++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <EmbeddedResource Include="Pl\*.tbl;Pl\*.txt" /> diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj index ef39433..d7b933e 100644 --- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj +++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" /> diff --git a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj index 4995eae..6a63956 100644 --- a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj +++ b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj index 5e5aa9c..7adea81 100644 --- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj +++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj index c598356..5d35886 100644 --- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj +++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj @@ -36,7 +36,7 @@ <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj index d8523d8..770857a 100644 --- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj +++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" /> diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj index 16868bc..e1862e1 100644 --- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj +++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Join\Lucene.Net.Join.csproj" /> diff --git a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj index 5bb866e..3273c1f 100644 --- a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj +++ b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj index b114124..cad555d 100644 --- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj +++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Memory\Lucene.Net.Memory.csproj" /> diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj index 68253eb..b28ea84 100644 --- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj +++ b/src/Lucene.Net.Join/Lucene.Net.Join.csproj @@ -41,7 +41,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Grouping\Lucene.Net.Grouping.csproj" /> diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj index 9317a4f..287fb7f 100644 --- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj +++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj index 09e7025..34c0a16 100644 --- a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj +++ b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <Compile Remove="Store\*" /> diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj index b2956a2..3424fa7 100644 --- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj +++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj index ffd6654..49f5740 100644 --- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj +++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj @@ -43,7 +43,7 @@ <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" /> diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj index cd1d361..d02150e 100644 --- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj +++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj index 694817b..14d273b 100644 --- a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj +++ b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj index 6ebe413..9bc7ba0 100644 --- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj +++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj index 3ebd211..4324a03 100644 --- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj +++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj @@ -39,7 +39,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" /> diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 5c24dae..23b4f0a 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -43,7 +43,7 @@ <NoWarn Label="Collection initialization can be simplified">$(NoWarn);IDE0028</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <None Remove="Util\europarl.lines.txt.gz" /> diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index d339021..661121d 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -34,7 +34,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <PropertyGroup Label="NuGet Package File Paths"> <LuceneNetDotNetDir>$(SolutionDir)src\dotnet\</LuceneNetDotNetDir> diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj index 9c00e0f..2905dd3 100644 --- a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj +++ b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj @@ -26,7 +26,7 @@ <IncludeBuildOutput>false</IncludeBuildOutput> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <Import Project="..\Lucene.Net.CodeAnalysis\Version.props" /> <ItemGroup> diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj index 16c36e7..6c2d113 100644 --- a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj +++ b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj @@ -26,7 +26,7 @@ <IncludeBuildOutput>false</IncludeBuildOutput> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <Import Project="..\Lucene.Net.CodeAnalysis\Version.props" /> <ItemGroup> diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj index 78e555f..7e8b3a0 100644 --- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj +++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj @@ -40,7 +40,7 @@ <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR</DefineConstants> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <Compile Include="..\..\Lucene.Net.Analysis.Common\Analysis\Th\**\*.cs" LinkBase="Analysis\Th" /> 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 aaaac77..69a7893 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 @@ -35,7 +35,7 @@ <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <ItemGroup> <ProjectReference Include="..\..\Lucene.Net.Replicator\Lucene.Net.Replicator.csproj" /> diff --git a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj index fdf9b80..33bd8bc 100644 --- a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj +++ b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj @@ -29,7 +29,7 @@ <IsPublishable Condition=" '$(TargetFramework)' == 'net5.0' ">true</IsPublishable> </PropertyGroup> - <Import Project="$(SolutionDir)build/Dependencies.props" /> + <Import Project="$(SolutionDir)build/TestReferences.Common.targets" /> <ItemGroup> diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj index 22b744a..8d7fa73 100644 --- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj +++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj @@ -29,8 +29,6 @@ <IsPublishable Condition=" '$(TargetFramework)' == 'net6.0' ">true</IsPublishable> </PropertyGroup> - <Import Project="$(SolutionDir)build\Dependencies.props" /> - <ItemGroup> <Compile Remove="SourceCode\TestInputForParser.cs" /> <None Remove="Configuration\appsettings.json" /> diff --git a/src/dotnet/tools/lucene-cli/lucene-cli.csproj b/src/dotnet/tools/lucene-cli/lucene-cli.csproj index 1f3018c..89ca0ef 100644 --- a/src/dotnet/tools/lucene-cli/lucene-cli.csproj +++ b/src/dotnet/tools/lucene-cli/lucene-cli.csproj @@ -44,8 +44,6 @@ <NoWarn Label="Remove unused parameter">$(NoWarn);IDE0060</NoWarn> </PropertyGroup> - <Import Project="$(SolutionDir)build\Dependencies.props" /> - <ItemGroup> <None Include="docs\index.md" Pack="true" PackagePath="\readme.md"/> <None Update="appsettings.json">
