From a46202b1b817ca687ac086c56a6c4339cf80a68c Mon Sep 17 00:00:00 2001 From: Matthias Cavigelli Date: Sat, 1 Jul 2017 12:52:18 +0200 Subject: [PATCH] Removed merging of libraries Allows to compile once into one directory. If still needed, merging can be added in the build script. --- FileHelpers.Demos/FileHelpers.Demos.csproj | 12 ------------ FileHelpers.Examples/FileHelpers.Examples.csproj | 10 ---------- .../FileHelpers.ExcelNPOIStorage.csproj | 11 ----------- .../FileHelpers.ExcelStorage.csproj | 12 ------------ FileHelpers.WizardApp/FileHelpers.WizardApp.csproj | 12 ------------ 5 files changed, 57 deletions(-) diff --git a/FileHelpers.Demos/FileHelpers.Demos.csproj b/FileHelpers.Demos/FileHelpers.Demos.csproj index 6489d8d97..f0a42c1da 100644 --- a/FileHelpers.Demos/FileHelpers.Demos.csproj +++ b/FileHelpers.Demos/FileHelpers.Demos.csproj @@ -282,16 +282,4 @@ - - - - if $(ConfigurationName) == Debug goto :exit -move "$(TargetDir)$(TargetName).exe" "$(TargetDir)$(TargetName).ToMerge.exe" -"$(SolutionDir)Libs\ILMerge\ilmerge" /ndebug /targetplatform:$(TargetFrameworkVersion.Substring(0, 2)) /out:"$(TargetDir)$(TargetName).exe" "$(TargetDir)$(TargetName).ToMerge.exe" "$(TargetDir)FileHelpers.dll" "$(TargetDir)Framework.Controls.ProgressBar.dll" -del "$(TargetDir)*.dll" -del "$(TargetDir)*.xml" -del "$(TargetDir)*.pdb" -del "$(TargetDir)$(TargetName).ToMerge.exe" -:exit - \ No newline at end of file diff --git a/FileHelpers.Examples/FileHelpers.Examples.csproj b/FileHelpers.Examples/FileHelpers.Examples.csproj index 464a9a6d6..f08a3f2e3 100644 --- a/FileHelpers.Examples/FileHelpers.Examples.csproj +++ b/FileHelpers.Examples/FileHelpers.Examples.csproj @@ -202,16 +202,6 @@ - - if $(ConfigurationName) == Debug goto :exit -move "$(TargetDir)$(TargetName).exe" "$(TargetDir)$(TargetName).ToMerge.exe" -"$(SolutionDir)Libs\ILMerge\ilmerge" /ndebug /allowDup /targetplatform:$(TargetFrameworkVersion.Substring(0, 2)) /out:"$(TargetDir)$(TargetName).exe" "$(TargetDir)$(TargetName).ToMerge.exe" "$(TargetDir)FileHelpers.dll" "$(TargetDir)ExamplesFx.dll" "$(TargetDir)Devoo.WinForms.dll" -del "$(TargetDir)*.dll" -del "$(TargetDir)*.xml" -del "$(TargetDir)*.pdb" -del "$(TargetDir)$(TargetName).ToMerge.exe" -:exit -