|
@@ -14,8 +14,7 @@
|
|
|
<util:ProductSearch
|
|
|
Variable="InstalledLegacyWinFspVersion"
|
|
|
Result="version"
|
|
|
- UpgradeCode="82F812D9-4083-4EF1-8BC8-0F1EDA05B46B"
|
|
|
- />
|
|
|
+ UpgradeCode="82F812D9-4083-4EF1-8BC8-0F1EDA05B46B"/>
|
|
|
|
|
|
<!-- for definition of the standard themes, see https://github.com/wixtoolset/wix3/blob/master/src/ext/BalExtension/wixstdba/Resources/-->
|
|
|
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLargeLicense">
|
|
@@ -27,8 +26,7 @@
|
|
|
SuppressOptionsUI="yes"
|
|
|
ThemeFile="bundle\customBootstrapperTheme.xml"
|
|
|
LocalizationFile="bundle\customBootstrapperTheme.wxl"
|
|
|
- LogoFile="bundle\resources\logo.png"
|
|
|
- />
|
|
|
+ LogoFile="bundle\resources\logo.png"/>
|
|
|
<Payload SourceFile="bundle\resources\logoSide.png" />
|
|
|
</BootstrapperApplicationRef>
|
|
|
|
|
@@ -38,8 +36,7 @@
|
|
|
DisplayName="Removing outdated WinFsp Driver"
|
|
|
Description="Executable to remove old winfsp"
|
|
|
DetectCondition="false"
|
|
|
- InstallCondition="InstalledLegacyWinFspVersion <> v0.0.0.0"
|
|
|
- >
|
|
|
+ InstallCondition="InstalledLegacyWinFspVersion <> v0.0.0.0">
|
|
|
<CommandLine Condition="WixBundleUILevel <= 3" InstallArgument="-q" RepairArgument="-q" UninstallArgument="-s" />
|
|
|
<!-- XML allows line breaks in attributes, hence keep the line breaks here -->
|
|
|
<CommandLine Condition="WixBundleUILevel > 3" InstallArgument="-t "Cryptomator Installer" -m "Cryptomator requires a newer version of the WinFsp driver. The installer will now uninstall WinFsp, possibly reboot, and afterwards proceed with the installation.
|
|
@@ -57,15 +54,13 @@ Do you want to continue?"" RepairArgument="-q" UninstallArgument="-s" />
|
|
|
SourceFile="resources\Cryptomator.msi"
|
|
|
CacheId="cryptomator-bundle-cryptomator"
|
|
|
DisplayInternalUI="no"
|
|
|
- Visible="no"
|
|
|
- />
|
|
|
+ Visible="no"/>
|
|
|
<MsiPackage
|
|
|
SourceFile="resources\winfsp.msi"
|
|
|
CacheId="cryptomator-bundle-winfsp"
|
|
|
Visible="yes"
|
|
|
DisplayInternalUI="no"
|
|
|
- Permanent="yes"
|
|
|
- />
|
|
|
+ Permanent="yes"/>
|
|
|
</Chain>
|
|
|
</Bundle>
|
|
|
</Wix>
|