Fix up our WiX template a bit

This commit is contained in:
Paul Betts
2015-10-14 15:43:02 -07:00
parent fe4188e079
commit fe338eb842

View File

@@ -1,11 +1,15 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="*" Name="{{Title}} Machine-Wide Installer" Language="1033" Version="1.2.4" UpgradeCode="{{RandomGuid}}" Manufacturer="{{Author}}"> <Product Id="*" Name="{{Title}} Machine-Wide Installer" Language="1033" Version="1.2.4" UpgradeCode="{{RandomGuid}}" Manufacturer="{{Author}}">
<PropertyRef Id="NETFRAMEWORK45" />
<Package Description="#Description" Comments="Comments" InstallerVersion="200" Compressed="yes"/> <Package Description="#Description" Comments="Comments" InstallerVersion="200" Compressed="yes"/>
<Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/> <Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
<PropertyRef Id="NETFRAMEWORK45" />
<Condition Message="This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.">
<![CDATA[Installed OR NETFRAMEWORK45]]>
</Condition>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder"> <Directory Id="ProgramFilesFolder">
<Directory Id="APPLICATIONROOTDIRECTORY" Name="{{Title}} Installer" /> <Directory Id="APPLICATIONROOTDIRECTORY" Name="{{Title}} Installer" />
@@ -13,26 +17,22 @@
</Directory> </Directory>
<DirectoryRef Id="APPLICATIONROOTDIRECTORY"> <DirectoryRef Id="APPLICATIONROOTDIRECTORY">
<Component Id="Setup.exe" Guid="08AD3BE1-EDA8-4182-BF8F-F47F805E28B8"> <Component Id="{{Id}}.exe" Guid="08AD3BE1-EDA8-4182-BF8F-F47F805E28B8">
<File Id="Setup.exe" Source="./Setup.exe" KeyPath="yes" /> <File Id="{{Id}}.exe" Source="./{{Id}}.exe" KeyPath="yes" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="TARGETDIR"> <DirectoryRef Id="TARGETDIR">
<Component Id="RegistryEntries" Guid="4438A0C1-7F86-4737-B929-8476305E1183"> <Component Id="RegistryEntries" Guid="4438A0C1-7F86-4737-B929-8476305E1183">
<RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Run"> <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Run">
<RegistryValue Type="expandable" Name="{{Id}}MachineInstaller" Value="%ProgramFiles%\{{Title}} Installer\Setup.exe --checkInstall" /> <RegistryValue Type="expandable" Name="{{Id}}MachineInstaller" Value="%ProgramFiles%\{{Title}} Installer\{{Id}}.exe --checkInstall" />
</RegistryKey> </RegistryKey>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<Feature Id="MainApplication" Title="Main Application" Level="1"> <Feature Id="MainApplication" Title="Main Application" Level="1">
<ComponentRef Id="Setup.exe" /> <ComponentRef Id="{{Id}}.exe" />
<ComponentRef Id="RegistryEntries" /> <ComponentRef Id="RegistryEntries" />
<Condition Message="This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.">
<![CDATA[Installed OR NETFRAMEWORK45]]>
</Condition>
</Feature> </Feature>
</Product> </Product>
</Wix> </Wix>