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 26c0145f852b3f330683e43c6e8832ac78c8e644 Author: Shad Storhaug <[email protected]> AuthorDate: Mon Feb 3 22:25:11 2020 +0700 Fixed merge conflict: Removed CommonAssemblyKeys.cs reference from Lucene.Net.csproj --- src/Lucene.Net/Lucene.Net.csproj | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index 0b369ce..edcf9bd 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -46,21 +46,6 @@ </ItemGroup> <ItemGroup> - <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" /> - </ItemGroup> - - <PropertyGroup Label="NuGet Package File Paths"> - <LuceneNetCodeAnalysisDir>$(SolutionDir)src\dotnet\Lucene.Net.CodeAnalysis\</LuceneNetCodeAnalysisDir> - <LuceneNetCodeAnalysisAssemblyFile>$(LuceneNetCodeAnalysisDir)bin\$(Configuration)\netstandard2.0\*.dll</LuceneNetCodeAnalysisAssemblyFile> - </PropertyGroup> - - <ItemGroup Label="NuGet Package Files"> - <None Include="$(LuceneNetCodeAnalysisDir)tools\*.ps1" Pack="true" PackagePath="tools" /> - <None Include="$(LuceneNetCodeAnalysisAssemblyFile)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" /> - <None Include="$(LuceneNetCodeAnalysisAssemblyFile)" Pack="true" PackagePath="analyzers/dotnet/vb" Visible="false" /> - </ItemGroup> - - <ItemGroup> <PackageReference Include="J2N" Version="$(J2NPackageVersion)" /> </ItemGroup>
