From cf2473a3d58fcad1a8568a959a11a82719e0f34a Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 19 Dec 2015 08:58:31 +0100 Subject: [PATCH] Revert "Get rid of ILMerge, use more friendly ILBundle" This reverts commit 43264e77b227a5a7daff4e9a67afe5bc4fd557da. Doesn't work on Mono, sigh... --- ArchiSteamFarm/ArchiSteamFarm.csproj | 6 +- ArchiSteamFarm/ILBundle.cs | 45 -------------- ArchiSteamFarm/ILBundle.targets | 9 --- ArchiSteamFarm/Program.cs | 2 +- ArchiSteamFarm/packages.config | 1 - .../ILBundle.1.0.0.14/Content/ILBundle.cs.pp | 56 ------------------ .../Content/ILBundle.targets | 9 --- .../ILBundle.1.0.0.14/ILBundle.1.0.0.14.nupkg | Bin 5251 -> 0 bytes .../Tools/Net40/Uninstall.ps1 | 11 ---- .../ILBundle.1.0.0.14/Tools/Net40/install.ps1 | 17 ------ tools/ILMerge.exe | Bin 0 -> 687104 bytes 11 files changed, 3 insertions(+), 153 deletions(-) delete mode 100644 ArchiSteamFarm/ILBundle.cs delete mode 100644 ArchiSteamFarm/ILBundle.targets delete mode 100644 packages/ILBundle.1.0.0.14/Content/ILBundle.cs.pp delete mode 100644 packages/ILBundle.1.0.0.14/Content/ILBundle.targets delete mode 100644 packages/ILBundle.1.0.0.14/ILBundle.1.0.0.14.nupkg delete mode 100644 packages/ILBundle.1.0.0.14/Tools/Net40/Uninstall.ps1 delete mode 100644 packages/ILBundle.1.0.0.14/Tools/Net40/install.ps1 create mode 100644 tools/ILMerge.exe diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index 93f0cf342..0a30f754c 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -93,7 +93,6 @@ - @@ -105,7 +104,6 @@ - @@ -143,12 +141,12 @@ if $(ConfigurationName) == Release ( mkdir "$(TargetDir)out" "$(TargetDir)out\config" - copy "$(TargetDir)$(TargetName).exe" "$(TargetDir)out\ASF.exe" copy "$(TargetDir)config\example.xml" "$(TargetDir)out\config" copy "$(TargetDir)config\minimal.xml" "$(TargetDir)out\config" + "$(SolutionDir)tools\ILMerge.exe" /out:"$(TargetDir)out\ASF.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" /target:exe /targetplatform:v4,C:\Windows\Microsoft.NET\Framework64\v4.0.30319 /wildcards + del "$(TargetDir)out\ASF.pdb" ) -