phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MM-20659] Fixing msi upgrade process (#1115)

Browse Source
This commit is contained in:
Guillermo Vayá
2019-12-15 23:16:43 +01:00
committed by William Gathoye
parent 2d8c7af089
commit 69af5a1f96
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/msi_installer.wxs
View File

@@ -53,8 +53,7 @@
<?if $(var.Platform) != x64 ?> <?if $(var.Platform) != x64 ?>
<Condition Message="!(loc.Requires32Bit)"><![CDATA[NOT VersionNT64]]></Condition> <Condition Message="!(loc.Requires32Bit)"><![CDATA[NOT VersionNT64]]></Condition>
<?endif ?> <?endif ?>
<!--<MajorUpgrade <MajorUpgrade AllowDowngrades="yes" />
DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />-->
<!-- Retrieve previous installation path --> <!-- Retrieve previous installation path -->
<Property Id="INSTALLDIR"> <Property Id="INSTALLDIR">
<RegistrySearch Id="DetermineInstallLocation" Type="raw" Root="HKLM" Key="Software\Mattermost\Desktop" Name="InstallLocation" Win64="$(var.Win64)" /> <RegistrySearch Id="DetermineInstallLocation" Type="raw" Root="HKLM" Key="Software\Mattermost\Desktop" Name="InstallLocation" Win64="$(var.Win64)" />
@@ -127,7 +126,6 @@
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action="KillApp" Before="InstallValidate" /> <Custom Action="KillApp" Before="InstallValidate" />
<Custom Action="LaunchApp" After="InstallFinalize">Installed</Custom> <Custom Action="LaunchApp" After="InstallFinalize">Installed</Custom>
<RemoveExistingProducts After="InstallFinalize" />
</InstallExecuteSequence> </InstallExecuteSequence>
<CustomAction Id="LaunchApp" FileKey="MattermostDesktopEXE" ExeCommand="" Return="asyncNoWait" /> <CustomAction Id="LaunchApp" FileKey="MattermostDesktopEXE" ExeCommand="" Return="asyncNoWait" />
<CustomAction Id="KillApp" Directory="INSTALLDIR" Return="ignore" ExeCommand="&quot;[SystemFolder]taskkill.exe&quot; /F /IM &quot;Mattermost.exe&quot;" /> <CustomAction Id="KillApp" Directory="INSTALLDIR" Return="ignore" ExeCommand="&quot;[SystemFolder]taskkill.exe&quot; /F /IM &quot;Mattermost.exe&quot;" />