Skip to content

Commit

Permalink
Fix duplicate license files in msi packages (dotnet#56959)
Browse files Browse the repository at this point in the history
It appears when we added the workloads subset, the msi projects
contained a step to add a License.txt file to the packages it creates.
This resulted in a conflict as runtime will also add one.

To fix, we'll skip adding the extra License.txt file when the project is
'msi.csproj'.

Fixes dotnet#56516
  • Loading branch information
steveisok authored Aug 6, 2021
1 parent db91a98 commit 57947cb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<None Include="$(LicenseFile)"
PackagePath="$([System.IO.Path]::GetFileName('$(LicenseFile)'))"
Pack="true"
Condition="'$(MSBuildProjectExtension)' != '.sfxproj'" />
Condition="'$(MSBuildProjectExtension)' != '.sfxproj' and '$(MSBuildProjectFile)' != 'msi.csproj'" />
<None Include="$(PackageThirdPartyNoticesFile)"
PackagePath="$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticesFile)'))"
Pack="true" />
Expand Down

0 comments on commit 57947cb

Please sign in to comment.