Removed merging of libraries

Allows to compile once into one directory. If still needed, merging can be added in the build script.
MarcosMeli · Jul 1, 2017 · a46202b · a46202b
1 parent d021a2b
commit a46202b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 57 deletions.
diff --git a/FileHelpers.Demos/FileHelpers.Demos.csproj b/FileHelpers.Demos/FileHelpers.Demos.csproj
@@ -282,16 +282,4 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">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</PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/FileHelpers.Examples/FileHelpers.Examples.csproj b/FileHelpers.Examples/FileHelpers.Examples.csproj
@@ -202,16 +202,6 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">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</PostBuildEvent>
-  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/FileHelpers.ExcelNPOIStorage/FileHelpers.ExcelNPOIStorage.csproj b/FileHelpers.ExcelNPOIStorage/FileHelpers.ExcelNPOIStorage.csproj
@@ -87,17 +87,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">if $(ConfigurationName) == Debug goto :exit
-move "$(TargetDir)$(TargetName).dll" "$(TargetDir)$(TargetName).ToMerge.dll"
-move "$(TargetDir)$(TargetName).pdb" "$(TargetDir)$(TargetName).ToMerge.pdb"
-"$(SolutionDir)Libs\ILMerge\ilmerge" /t:dll /internalize /ndebug /targetplatform:$(TargetFrameworkVersion.Substring(0, 2))  /out:"$(TargetDir)$(TargetName).dll" "$(TargetDir)$(TargetName).ToMerge.dll"  "$(TargetDir)NPOI.dll" "$(TargetDir)NPOI.OOXML.dll" "$(TargetDir)NPOI.OpenXML4Net.dll" "$(TargetDir)ICSharpCode.SharpZipLib.dll" "$(TargetDir)NPOI.OpenXmlFormats.dll" /keyfile:"$(SolutionDir)FileHelpers\FileHelpers.snk"
-del "$(TargetDir)NPOI.*"
-del "$(TargetDir)ICSharpCode.SharpZipLib.dll"
-del "$(TargetDir)$(TargetName).ToMerge.dll"
-del "$(TargetDir)$(TargetName).ToMerge.pdb"
-:exit</PostBuildEvent>
-  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/FileHelpers.ExcelStorage/FileHelpers.ExcelStorage.csproj b/FileHelpers.ExcelStorage/FileHelpers.ExcelStorage.csproj
@@ -133,16 +133,4 @@
     <None Include="StorageDiagrams.cd" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">if $(ConfigurationName) == Debug goto :exit
-move "$(TargetDir)$(TargetName).dll" "$(TargetDir)$(TargetName).ToMerge.dll"
-move "$(TargetDir)$(TargetName).pdb" "$(TargetDir)$(TargetName).ToMerge.pdb"
-"$(SolutionDir)Libs\ILMerge\ilmerge" /t:dll /internalize /ndebug /targetplatform:$(TargetFrameworkVersion.Substring(0, 2)) /out:"$(TargetDir)$(TargetName).dll" "$(TargetDir)$(TargetName).ToMerge.dll" "$(TargetDir)Microsoft.Office.Interop.Excel.dll" "$(TargetDir)Office.dll" "$(TargetDir)Microsoft.Vbe.Interop.dll" /keyfile:"$(SolutionDir)FileHelpers\FileHelpers.snk"
-del "$(TargetDir)Microsoft.Office.Interop.Excel.dll" 
-del "$(TargetDir)Office.dll" 
-del "$(TargetDir)Microsoft.Vbe.Interop.dll"
-del "$(TargetDir)$(TargetName).ToMerge.dll"
-del "$(TargetDir)$(TargetName).ToMerge.pdb"
-:exit</PostBuildEvent>
-  </PropertyGroup>
 </Project>
diff --git a/FileHelpers.WizardApp/FileHelpers.WizardApp.csproj b/FileHelpers.WizardApp/FileHelpers.WizardApp.csproj
@@ -339,16 +339,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">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"
-del "$(TargetDir)*.dll"
-del "$(TargetDir)*.xml"
-del "$(TargetDir)*.pdb"
-del "$(TargetDir)$(TargetName).ToMerge.exe"
-:exit</PostBuildEvent>
-  </PropertyGroup>
 </Project>