Updater.exe added into the build.

This commit is contained in:
Feodor 2012-09-03 16:05:42 -07:00
parent fa5c7ce779
commit fc415453a4
5 changed files with 10 additions and 3 deletions

View file

@ -2,6 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{129305D5-A9E6-4DCE-BFF6-41809E13EEEE}"
ProjectSection(SolutionItems) = preProject
..\..\WebsitePanel\build.xml = ..\..\WebsitePanel\build.xml
..\..\LICENSE.txt = ..\..\LICENSE.txt
..\..\Readme.htm = ..\..\Readme.htm
..\..\ReleaseNotes.htm = ..\..\ReleaseNotes.htm

View file

@ -256,7 +256,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="application.ico" />
<Content Include="Updater.exe" />
<EmbeddedResource Include="Updater.exe" />
<Content Include="websitepanel.ico" />
</ItemGroup>
<ItemGroup>

View file

@ -150,9 +150,12 @@
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="AfterBuild">
<Exec Command="$(ProjectDir)..\..\Resources\ILMerge.exe &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Lib\Ionic.Zip.Reduced.dll&quot; /out:$(ProjectDir)..\WebsitePanel.Installer\Updater.exe /ndebug" />
</Target>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>

View file

@ -240,6 +240,9 @@
<Target Name="CreateSetupBuild" DependsOnTargets="CreateLocalizationToolkitBuild">
<!-- Compile updater.exe -->
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.Updater\WebsitePanel.Updater.csproj" Properties="Configuration=$(BuildConfiguration)" />
<!-- build MSI package -->
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIX\Setup.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
<Output