From e35c12c1f22629764efc07196cc00979a54c3a3b Mon Sep 17 00:00:00 2001
From: Peter Van Dender <peter.van.dender@lansweeper.com>
Date: Wed, 24 Mar 2021 14:30:53 +0100
Subject: [PATCH] Remove ILRepack and use ILMerge instead

---
 Lansweeper.SMBLibrary.nuspec | 2 --
 SMBLibrary/SMBLibrary.csproj | 8 ++++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Lansweeper.SMBLibrary.nuspec b/Lansweeper.SMBLibrary.nuspec
index 18b20da..8ef2416 100644
--- a/Lansweeper.SMBLibrary.nuspec
+++ b/Lansweeper.SMBLibrary.nuspec
@@ -32,9 +32,7 @@
   <!--Needed for package-->
   <files>
     <file src="SMBLibrary\bin\Release\netstandard2.0\SMBLibrary.dll" target="lib\netstandard2.0" />
-    <file src="SMBLibrary\bin\Release\netstandard2.0\Utilities.dll" target="lib\netstandard2.0" />
     <file src="SMBLibrary\bin\Release\net40\SMBLibrary.dll" target="lib\net40" />
-    <file src="SMBLibrary\bin\Release\net40\Utilities.dll" target="lib\net40" />
   </files>
 
 </package>
diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index 8ee3b30..3b96a3b 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -16,12 +16,16 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="ILMerge" Version="3.0.41" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Utilities\Utilities.csproj" PrivateAssets="All" />
   </ItemGroup>
 
-  <Target Name="ILRepack" Condition="'$(Configuration)' == 'Release'" AfterTargets="AfterBuild">
-    <Exec Command="&quot;$(ProgramW6432)\ILRepack\ILRepack.exe&quot; /out=&quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\Utilities.dll&quot;"></Exec>
+  <Target Name="ILMerge" Condition="'$(Configuration)' == 'Release'" AfterTargets="AfterBuild">
+    <Exec Command="&quot;$(ILMergeConsolePath)&quot; /out:&quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\Utilities.dll&quot;"></Exec>
   </Target>
 
 </Project>