Upgraded the wix installed to use Wix 7
This commit is contained in:
+41
-38
@@ -1,48 +1,51 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
<?include $(sys.CURRENTDIR)\Config.wxi?>
|
||||
<Product Id="*"
|
||||
Name="$(var.InstallName)"
|
||||
Language="1033"
|
||||
Version="$(var.ProductVersion)"
|
||||
Manufacturer="$(var.Manufacturer)"
|
||||
UpgradeCode="$(var.UpgradeCode)">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
|
||||
<Package Name="$(var.InstallName)"
|
||||
Language="1033"
|
||||
Version="$(var.ProductVersion)"
|
||||
Manufacturer="$(var.Manufacturer)"
|
||||
UpgradeCode="$(var.UpgradeCode)"
|
||||
InstallerVersion="200"
|
||||
Compressed="yes"
|
||||
Scope="perMachine">
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
<Property Id="ASCOMPLATFORMVERSION">
|
||||
<RegistrySearch Id="AscomPlatformVersion"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\ASCOM\Platform"
|
||||
Name="Platform Version"
|
||||
Type="raw" />
|
||||
</Property>
|
||||
|
||||
<Property Id="ASCOMPLATFORMVERSION">
|
||||
<RegistrySearch Id="AscomPlatformVersion"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\ASCOM\Platform"
|
||||
Name="Platform Version"
|
||||
Type="raw" />
|
||||
</Property>
|
||||
<Launch Condition="Installed OR ASCOMPLATFORMVERSION >= "6.6.0""
|
||||
Message="This application requires Ascom Platform 6.6.0 or higher. Please install this before installing the driver." />
|
||||
|
||||
<Condition Message="This application requires Ascom Platform 6.6.0 or higher. Please install this before installing the driver.">
|
||||
<![CDATA[Installed OR ASCOMPLATFORMVERSION >= "6.6.0"]]>
|
||||
</Condition>
|
||||
<Property Id="NETFRAMEWORK48RELEASE">
|
||||
<RegistrySearch Id="NetFramework48Release"
|
||||
Root="HKLM"
|
||||
Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full"
|
||||
Name="Release"
|
||||
Type="raw" />
|
||||
</Property>
|
||||
<Launch Condition="Installed OR (NETFRAMEWORK48RELEASE >= "#528040")"
|
||||
Message="This application requires .NET Framework 4.8 or higher. Please install the .NET Framework then run this installer again." />
|
||||
|
||||
<PropertyRef Id='WIXNETFX4RELEASEINSTALLED'/>
|
||||
<Condition Message="This application requires .NET Framework 4.8 or higher. Please install the .NET Framework then run this installer again.">
|
||||
<![CDATA[Installed OR (WIXNETFX4RELEASEINSTALLED >= "#528040")]]>
|
||||
</Condition>
|
||||
<!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
|
||||
<?if $(var.Win64) = "yes" ?>
|
||||
VersionNT64
|
||||
<?else?>
|
||||
NOT VersionNT64
|
||||
<?endif?>
|
||||
</Condition> -->
|
||||
|
||||
<!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
|
||||
<?if $(var.Win64) = "yes" ?>
|
||||
VersionNT64
|
||||
<?else?>
|
||||
NOT VersionNT64
|
||||
<?endif?>
|
||||
</Condition> -->
|
||||
<UIRef Id="InstallationUI"/>
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
|
||||
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
|
||||
|
||||
|
||||
<UIRef Id="InstallationUI"/>
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
|
||||
<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
|
||||
|
||||
<FeatureGroupRef Id="fgRoot"/>
|
||||
</Product>
|
||||
<FeatureGroupRef Id="fgRoot"/>
|
||||
</Package>
|
||||
</Wix>
|
||||
|
||||
Reference in New Issue
Block a user