From 43264e77b227a5a7daff4e9a67afe5bc4fd557da Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 19 Dec 2015 08:22:17 +0100 Subject: [PATCH] Get rid of ILMerge, use more friendly ILBundle --- 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 0 -> 5251 bytes .../Tools/Net40/Uninstall.ps1 | 11 ++++ .../ILBundle.1.0.0.14/Tools/Net40/install.ps1 | 17 ++++++ tools/ILMerge.exe | Bin 687104 -> 0 bytes 11 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 ArchiSteamFarm/ILBundle.cs create mode 100644 ArchiSteamFarm/ILBundle.targets create mode 100644 packages/ILBundle.1.0.0.14/Content/ILBundle.cs.pp create mode 100644 packages/ILBundle.1.0.0.14/Content/ILBundle.targets create mode 100644 packages/ILBundle.1.0.0.14/ILBundle.1.0.0.14.nupkg create mode 100644 packages/ILBundle.1.0.0.14/Tools/Net40/Uninstall.ps1 create mode 100644 packages/ILBundle.1.0.0.14/Tools/Net40/install.ps1 delete mode 100644 tools/ILMerge.exe diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index 0a30f754c..93f0cf342 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -93,6 +93,7 @@ + @@ -104,6 +105,7 @@ + @@ -141,12 +143,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" ) +