Skip to content

Commit a2e4124

Browse files
committed
eng/nuget.props: Resolved conflict - cannot specify PackageLicenseExpression and PackageLicenseFile at the same time. Removed the PackageLicenseFile property, but kept the automation to pack the file into the NuGet package.
1 parent fd68390 commit a2e4124

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

eng/nuget.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626
<PackageIcon>lucene-net-icon-128x128.png</PackageIcon>
2727
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
2828
<PackageReadmeFile>readme.md</PackageReadmeFile>
29-
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
3029
<PackageNoticeFile>NOTICE.txt</PackageNoticeFile>
3130
<ReleaseNotesUrl Condition=" '$(PackageVersion)' != '' ">https://github.com/$(GitHubOrganization)/$(GitHubProject)/releases/tag/v$(PackageVersion)</ReleaseNotesUrl>
3231
<PackageReleaseNotes>$(ReleaseNotesUrl)</PackageReleaseNotes>
3332
</PropertyGroup>
3433
<ItemGroup>
3534
<None Include="$(RepositoryRoot)README.md" Pack="true" PackagePath="$(PackageReadmeFile)"/>
36-
<None Include="$(RepositoryRoot)LICENSE.txt" Pack="true" PackagePath="$(PackageLicenseFile)"/>
35+
<None Include="$(RepositoryRoot)LICENSE.txt" Pack="true" PackagePath="LICENSE.txt"/>
3736
<None Include="$(RepositoryRoot)NOTICE.txt" Pack="true" PackagePath="$(PackageNoticeFile)"/>
3837
<None Include="$(RepositoryRoot)branding\$(PackageIcon)" Pack="true" PackagePath="$(PackageIcon)" Visible="false"/>
3938
</ItemGroup>

0 commit comments

Comments
 (0)