From 92c44aab498b7392fc15b8ecfed1d3eb6379d8af Mon Sep 17 00:00:00 2001
From: Virtuworks <devnull@localhost>
Date: Mon, 3 Sep 2012 03:05:26 -0400
Subject: [PATCH] Update Build.xml to build Main Setup MSI with new WIX Setup
 Project

---
 .../WebsitePanel.Installer/Updater.exe        | Bin 198144 -> 198144 bytes
 .../WebsitePanel.Updater.csproj               |   3 ++-
 WebsitePanel/build.xml                        |  17 ++++++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index 84a182c135c8a359ee7dfd85e9c814f9a3ee0345..10edbec6b195579f0f59f20602bf10dffce1857c 100644
GIT binary patch
delta 45
zcmV+|0Mh?}j0}K`43LNezX?Qvi-n5;wTlA5a1hU)$uSjSN<@K1)|M6L;Ig+|aRQ{2
Dt^O0@

delta 45
zcmV+|0Mh?}j0}K`43LNe3;RQXi-n5;wTlA5a1iti-LV?vm`Al;1@En6Q=qq8aRQ{2
Dz;G02

diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
index f14d2823..2aaba187 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
@@ -154,6 +154,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>"$(SolutionDir)..\Resources\ILMerge.exe" "$(TargetPath)" "$(SolutionDir)..\Lib\Ionic.Zip.Reduced.dll" /out:$(SolutionDir)WebsitePanel.Installer\Updater.exe /ndebug</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index 3ed65a9c..8ad55090 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -236,9 +236,20 @@
                 ItemName="LocalizationToolkitMsi" />	
 		</MSBuild>
 		<Copy SourceFiles="@(LocalizationToolkitMsi)" DestinationFolder="$(LocalizationToolkitBuild)\%(RecursiveDir)" />
-	</Target>	
-
-	<Target Name="Build" DependsOnTargets="CreateLocalizationToolkitBuild">
+	</Target>
+	
+	<Target Name="CreateSetupBuild" DependsOnTargets="CreateLocalizationToolkitBuild">
+		
+		<!-- build MSI package -->
+		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIX\Setup.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
+			<Output
+                TaskParameter="TargetOutputs"
+                ItemName="WebsitePanelInstallerMsi" />	
+		</MSBuild>
+		<Copy SourceFiles="@(WebsitePanelInstallerMsi)" DestinationFolder="$(DeployFolder)\%(RecursiveDir)" />
+	</Target>
+	
+	<Target Name="Build" DependsOnTargets="CreateSetupBuild">
 		<!-- Do nothing -->
 	</Target>