From 7068cf36c830fe4761e434c32e6516d16730b367 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 13 May 2025 17:30:24 +0100
Subject: [PATCH 1/2] [ci] Fix issue with duplicate License on msi

---
 Directory.Build.targets | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 9679650c78c5..33fb78ecfa17 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -119,4 +119,17 @@
     </ItemGroup>
   </Target>
 
+  <!-- Packaging -->
+  <ItemGroup Condition="'$(IsPackable)' == 'true'">
+    <!-- The msi files add the license themselves. -->
+    <None Include="$(LicenseFile)"
+          PackagePath="$([System.IO.Path]::GetFileName('$(LicenseFile)'))"
+          Pack="true"
+          Condition="'$(MSBuildProjectFile)' != 'msi.csproj'" />
+    <None Include="$(PackageThirdPartyNoticesFile)"
+          PackagePath="$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticesFile)'))"
+          Pack="true" />
+  </ItemGroup>
+
+
 </Project>

From 69eb635d83090d149ed8484dab48b60baa9f6dba Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 13 May 2025 17:49:31 +0100
Subject: [PATCH 2/2] Update Directory.Build.targets

---
 Directory.Build.targets | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 33fb78ecfa17..4f791a9fbcf3 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -100,7 +100,7 @@
   <ItemGroup Condition="'$(IsPackable)' == 'true'">
     <None Include="$(LicenseFile)"
           PackagePath="$([System.IO.Path]::GetFileName('$(LicenseFile)'))"
-          Pack="true" />
+          Pack="true" Condition="'$(MSBuildProjectFile)' != 'msi.csproj'" />
     <None Include="$(PackageThirdPartyNoticesFile)"
           PackagePath="$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticesFile)'))"
           Pack="true" />
@@ -118,18 +118,4 @@
                      Pack="true" />
     </ItemGroup>
   </Target>
-
-  <!-- Packaging -->
-  <ItemGroup Condition="'$(IsPackable)' == 'true'">
-    <!-- The msi files add the license themselves. -->
-    <None Include="$(LicenseFile)"
-          PackagePath="$([System.IO.Path]::GetFileName('$(LicenseFile)'))"
-          Pack="true"
-          Condition="'$(MSBuildProjectFile)' != 'msi.csproj'" />
-    <None Include="$(PackageThirdPartyNoticesFile)"
-          PackagePath="$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticesFile)'))"
-          Pack="true" />
-  </ItemGroup>
-
-
 </Project>