Update Build.xml to build Main Setup MSI with new WIX Setup Project

This commit is contained in:
Virtuworks 2012-09-03 03:05:26 -04:00
parent a4f5dcdae6
commit 92c44aab49
3 changed files with 16 additions and 4 deletions

View file

@ -154,6 +154,7 @@
</Target> </Target>
--> -->
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>"$(SolutionDir)..\Resources\ILMerge.exe" "$(TargetPath)" "$(SolutionDir)..\Lib\Ionic.Zip.Reduced.dll" /out:$(SolutionDir)WebsitePanel.Installer\Updater.exe /ndebug</PostBuildEvent> <PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View file

@ -236,9 +236,20 @@
ItemName="LocalizationToolkitMsi" /> ItemName="LocalizationToolkitMsi" />
</MSBuild> </MSBuild>
<Copy SourceFiles="@(LocalizationToolkitMsi)" DestinationFolder="$(LocalizationToolkitBuild)\%(RecursiveDir)" /> <Copy SourceFiles="@(LocalizationToolkitMsi)" DestinationFolder="$(LocalizationToolkitBuild)\%(RecursiveDir)" />
</Target> </Target>
<Target Name="Build" DependsOnTargets="CreateLocalizationToolkitBuild"> <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 --> <!-- Do nothing -->
</Target> </Target>