From 57947cbb5cf7f4e01fad7a68c98cd6976d6d9309 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steveisok@users.noreply.github.com>
Date: Fri, 6 Aug 2021 08:12:42 -0400
Subject: 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
---
 Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Directory.Build.targets')

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" />
-- 
cgit v1.2.3