From 3d87f4a9cba1b21630003f9ee2bb5aca34d5416d Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Thu, 16 Oct 2025 23:56:40 -0300
Subject: [PATCH] Fix bug in ILRepack that caused wrong packing

---
 src/Directory.targets | 6 +++++-
 src/ILRepack.targets  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Directory.targets b/src/Directory.targets
index 20f2ecff..dc0a04cb 100644
--- a/src/Directory.targets
+++ b/src/Directory.targets
@@ -16,12 +16,16 @@
     <PackageFile Include="*.props;*.targets" PackagePath="build\$(TargetFramework)\%(Filename)%(Extension)" Visible="true" />
   </ItemGroup>
 
-  <Target Name="PackCopyLocalLockFileAssemblies" Condition="'$(IsAnalyzer)' == 'true' and '$(MergeAnalyzerAssemblies)' != 'true'" BeforeTargets="GetPackageContents" DependsOnTargets="ReferenceCopyLocalPathsOutputGroup">
+  <Target Name="PackCopyLocalLockFileAssemblies" Condition="'$(IsAnalyzer)' == 'true' and '$(ILRepack)' != 'true'" BeforeTargets="GetPackageContents" DependsOnTargets="ReferenceCopyLocalPathsOutputGroup">
+    <PropertyGroup>
+      <ILRepackExclude>;@(ILRepackExclude, ';');</ILRepackExclude>
+    </PropertyGroup>
     <ItemGroup>
       <ReferenceCopyLocalAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll' 
         And !$([MSBuild]::ValueOrDefault('%(FileName)', '').EndsWith('.resources', StringComparison.OrdinalIgnoreCase))
         And !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('ThisAssembly', StringComparison.OrdinalIgnoreCase))" />
       <PackCopyLocalAssemblies Include="@(ReferenceCopyLocalAssemblies)" Condition="
+        !$(ILRepackExclude.Contains(';%(FileName);')) And
         !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CodeAnalysis', StringComparison.OrdinalIgnoreCase)) And
         !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CSharp', StringComparison.OrdinalIgnoreCase)) And
         !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.', StringComparison.OrdinalIgnoreCase))"
diff --git a/src/ILRepack.targets b/src/ILRepack.targets
index 410b604b..b28751a1 100644
--- a/src/ILRepack.targets
+++ b/src/ILRepack.targets
@@ -43,7 +43,7 @@
       <ReferenceCopyLocalAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll' 
         And !$([MSBuild]::ValueOrDefault('%(FileName)', '').EndsWith('.resources', StringComparison.OrdinalIgnoreCase))" />
       
-      <!-- Default to never mergingmerging analyzer, C# or system assemblies -->
+      <!-- Default to never merging analyzer, C# or system assemblies -->
       <MergedAssemblies Include="@(ReferenceCopyLocalAssemblies)" Condition="
         !$(ILRepackExclude.Contains(';%(FileName);')) And
         !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CodeAnalysis', StringComparison.OrdinalIgnoreCase)) And