diff options
| author | Steve Pfister <steveisok@users.noreply.github.com> | 2021-08-06 15:12:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-06 15:12:42 +0300 |
| commit | 57947cbb5cf7f4e01fad7a68c98cd6976d6d9309 (patch) | |
| tree | bafab655a3b0dceff9c9ae8086fb528a74395859 /Directory.Build.targets | |
| parent | db91a98e1b9f74b39668a0572134e8b5c4f0c405 (diff) | |
Fix duplicate license files in msi packages (#56959)
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 https://github.com/dotnet/runtime/issues/56516
Diffstat (limited to 'Directory.Build.targets')
| -rw-r--r-- | Directory.Build.targets | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Directory.Build.targets b/Directory.Build.targets index 78cb82f2331..ef235ee5ae6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -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" /> |