From 1ffa7ab037ab31f186ae5d0c3578d756d9a22b71 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Mon, 8 May 2017 17:32:34 +0200 Subject: [PATCH] Revert "It seems Mono started working with Fody already" This reverts commit 3b7652d4a97ec37dbf52b73943aca6bd0a28b3a1. Nope, not yet, at least for my server. --- ArchiSteamFarm/ArchiSteamFarm.csproj | 2 +- ConfigGenerator/ConfigGenerator.csproj | 12 +++++++++++- GUI/GUI.csproj | 12 +++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index d6f583c99..70d6bddea 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -279,7 +279,7 @@ fi rm "$(SolutionDir)out/ASF-Service.exe.config" - cp "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out/ASF.exe" + cp "$(SolutionDir)out/ASF-Service.exe" "$(SolutionDir)out/ASF.exe" diff --git a/ConfigGenerator/ConfigGenerator.csproj b/ConfigGenerator/ConfigGenerator.csproj index f81f6c942..2ffbc0b84 100644 --- a/ConfigGenerator/ConfigGenerator.csproj +++ b/ConfigGenerator/ConfigGenerator.csproj @@ -183,7 +183,17 @@ set -e - cp "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out/ASF-ConfigGenerator.exe" + if [ -f "$(SolutionDir)mono_envsetup.sh" ]; then + . "$(SolutionDir)mono_envsetup.sh" + fi + + if [ -n "$MONO_FACADES" ]; then + mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:$MONO_FACADES" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-ConfigGenerator.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" + else + mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-ConfigGenerator.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" + fi + + rm "$(SolutionDir)out/ASF-ConfigGenerator.exe.config" diff --git a/GUI/GUI.csproj b/GUI/GUI.csproj index 9e38b17ac..fe817c7e0 100644 --- a/GUI/GUI.csproj +++ b/GUI/GUI.csproj @@ -379,7 +379,17 @@ set -e - cp "$(TargetDir)$(TargetName).exe" "$(SolutionDir)out/ASF-GUI.exe" + if [ -f "$(SolutionDir)mono_envsetup.sh" ]; then + . "$(SolutionDir)mono_envsetup.sh" + fi + + if [ -n "$MONO_FACADES" ]; then + mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" "/lib:$MONO_FACADES" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" + else + mono "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" + fi + + rm "$(SolutionDir)out/ASF-GUI.exe.config"