From 793b427b73cae0a80de4f86729da8be502270af2 Mon Sep 17 00:00:00 2001
From: SpecialFood <SpecialFood456@gmail.com>
Date: Mon, 30 Mar 2020 11:09:39 +0300
Subject: [PATCH 1/2] Update ILRepack.Lib.MSBuild.Task.targets

---
 .../ILRepack.Lib.MSBuild.Task.targets         | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets
index e3222f2..9aa0759 100644
--- a/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets
+++ b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets
@@ -11,26 +11,62 @@
   <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)ILRepack.Lib.MSBuild.Task.dll" TaskName="ILRepack" />
   <Import Project="$(ILRepackTargetsFile)" Condition="Exists('$(ILRepackTargetsFile)')" />
   <Target Name="ILRepack" AfterTargets="Build" Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)')">
+    <Message Text="Building ILRepacker's targets." Importance="High" />
+    <PropertyGroup>
+      <ILRepackProgramAssembly>$(OutputPath)$(TargetName)$(TargetExt)</ILRepackProgramAssembly>
+    </PropertyGroup>
     <ItemGroup>
-      <InputAssemblies Include="$(OutputPath)$(TargetName)$(TargetExt)"/>
-      <InputAssemblies Include="$(OutputPath)*.dll" Exclude="$(OutputPath)$(TargetName)$(TargetExt)"/>
+      <ILRepackPossibleAssemblyReferences Include="$(OutputPath)*.dll"/>
+      <ILRepackPossibleAssemblyReferences Include="$(OutputPath)*.exe"/>
+      <ILRepackImpossibleAssemblyReferences
+        Include="$(OutputPath)*.*"
+        Exclude="@(ILRepackPossibleAssemblyReferences)"/>
+      <ILRepackIncludedAssemblyReferences
+        Include="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')"
+        Exclude="@(ILRepackImpossibleAssemblyReferences)"/>
+      <ILRepackExcludedAssemblyReferences
+        Include="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')"
+        Exclude="@(ILRepackIncludedAssemblyReferences)"/>
     </ItemGroup>
+    <ItemGroup>
+      <ILRepackExcludedEmbeddedAssemblies Include="$(ILRepackProgramAssembly)"/>
+      <!--<ILRepackExcludedEmbeddedAssemblies Include="$(OutputPath)*SomeExcludedEmbeddedAssembly*"/>-->
+    </ItemGroup>
+    <ItemGroup>
+      <ILRepackIncludedEmbeddedAssemblies
+        Include="@(ILRepackIncludedAssemblyReferences)"
+        Exclude="@(ILRepackExcludedEmbeddedAssemblies)" />
+    </ItemGroup>
+    <ItemGroup>
+      <ILRepackInputAssemblies Include="$(ILRepackProgramAssembly)"/>
+      <ILRepackInputAssemblies Include="@(ILRepackIncludedEmbeddedAssemblies)"/>
+    </ItemGroup>
+    <PropertyGroup>
+      <ILRepackOutputFolder>$(OutputPath)</ILRepackOutputFolder>
+      <ILRepackOutputFile>$(ILRepackOutputFolder)$(TargetName)$(TargetExt)</ILRepackOutputFile>
+    </PropertyGroup>
 
     <ILRepack
       Parallel="true"
       DebugInfo="true"
       AllowDuplicateResources="false"
-      InputAssemblies="@(InputAssemblies)"
+      InputAssemblies="@(ILRepackInputAssemblies)"
       TargetKind="SameAsPrimaryAssembly"
       KeyFile="$(KeyFile)"
-      OutputFile="$(OutputPath)$(TargetName)$(TargetExt)"
-    />
+      OutputFile="$(ILRepackOutputFile)">
+      <!--Internalize="true"
+      RenameInternalized="true" />
+      internalize makes all the files that are getting embedded into the program executable as private sources, useful if we want to focus on the main source
+      , but also exposes it and ignoring public/private fields/methods/types in the other files-->
+    </ILRepack>
+
+    <Message Text="Successfully built ILRepacker's targets." Importance="High" />
   </Target>
   <Target
     AfterTargets="ILRepack"
     Name="CleanReferenceCopyLocalPaths"
     Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)') and '$(ClearOutputDirectory)' != 'False'">
-    <Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
+    <Delete Files="@(ILRepackIncludedEmbeddedAssemblies)" />
     <ItemGroup>
       <Directories Include="$([System.IO.Directory]::GetDirectories('$(OutDir)%(DestinationSubDirectory)', '*', System.IO.SearchOption.AllDirectories))" />
       <Directories>

From 525a64f4e074c79acf284dd57efa554f10675aee Mon Sep 17 00:00:00 2001
From: SpecialFood <SpecialFood456@gmail.com>
Date: Mon, 30 Mar 2020 13:45:32 +0300
Subject: [PATCH 2/2] Update ILRepack.Lib.MSBuild.Task.targets

---
 .../ILRepack.Lib.MSBuild.Task.targets          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets
index 9aa0759..88a6adf 100644
--- a/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets
+++ b/ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets
@@ -16,21 +16,21 @@
       <ILRepackProgramAssembly>$(OutputPath)$(TargetName)$(TargetExt)</ILRepackProgramAssembly>
     </PropertyGroup>
     <ItemGroup>
-      <ILRepackPossibleAssemblyReferences Include="$(OutputPath)*.dll"/>
-      <ILRepackPossibleAssemblyReferences Include="$(OutputPath)*.exe"/>
+      <ILRepackPossibleAssemblyReferences Include="$(OutputPath)*.dll" />
+      <ILRepackPossibleAssemblyReferences Include="$(OutputPath)*.exe" />
       <ILRepackImpossibleAssemblyReferences
         Include="$(OutputPath)*.*"
-        Exclude="@(ILRepackPossibleAssemblyReferences)"/>
+        Exclude="@(ILRepackPossibleAssemblyReferences)" />
       <ILRepackIncludedAssemblyReferences
         Include="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')"
-        Exclude="@(ILRepackImpossibleAssemblyReferences)"/>
+        Exclude="@(ILRepackImpossibleAssemblyReferences)" />
       <ILRepackExcludedAssemblyReferences
         Include="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')"
-        Exclude="@(ILRepackIncludedAssemblyReferences)"/>
+        Exclude="@(ILRepackIncludedAssemblyReferences)" />
     </ItemGroup>
     <ItemGroup>
-      <ILRepackExcludedEmbeddedAssemblies Include="$(ILRepackProgramAssembly)"/>
-      <!--<ILRepackExcludedEmbeddedAssemblies Include="$(OutputPath)*SomeExcludedEmbeddedAssembly*"/>-->
+      <ILRepackExcludedEmbeddedAssemblies Include="$(ILRepackProgramAssembly)" />
+      <!--<ILRepackExcludedEmbeddedAssemblies Include="$(OutputPath)*SomeExcludedEmbeddedAssembly*" />-->
     </ItemGroup>
     <ItemGroup>
       <ILRepackIncludedEmbeddedAssemblies
@@ -38,8 +38,8 @@
         Exclude="@(ILRepackExcludedEmbeddedAssemblies)" />
     </ItemGroup>
     <ItemGroup>
-      <ILRepackInputAssemblies Include="$(ILRepackProgramAssembly)"/>
-      <ILRepackInputAssemblies Include="@(ILRepackIncludedEmbeddedAssemblies)"/>
+      <ILRepackInputAssemblies Include="$(ILRepackProgramAssembly)" />
+      <ILRepackInputAssemblies Include="@(ILRepackIncludedEmbeddedAssemblies)" />
     </ItemGroup>
     <PropertyGroup>
       <ILRepackOutputFolder>$(OutputPath)</ILRepackOutputFolder>