smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Add check for Visual C++ Redistributable installation in WiX patch

Browse source
This commit is contained in:
Nick Bolton 2025-03-07 15:27:15 +00:00
parent 836d9b9a2b
commit 80606ef040
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
deploy/windows/wix-patch.xml.in
View file

@ -18,15 +18,33 @@
</ServiceInstall>
<ServiceControl Id="ServiceControl" Name="Deskflow" Remove="uninstall" Start="install" Stop="both"/>
</CPackWiXFragment>
<CPackWiXFragment Id="CM_CP_deskflow_server.exe">
<firewall:FirewallException Id="ServerFirewallException" Name="Deskflow Server" Program="[INSTALL_ROOT]deskflow-server.exe" Scope="any"/>
</CPackWiXFragment>
<CPackWiXFragment Id="CM_CP_deskflow_client.exe">
<firewall:FirewallException Id="ClientFirewallException" Name="Deskflow Client" Program="[INSTALL_ROOT]deskflow-client.exe" Scope="any"/>
</CPackWiXFragment>
<CPackWiXFragment Id="#PRODUCT">
<Property Id="VC_REDIST_INSTALLED">
<RegistrySearch
Id="FindVCRedist"
Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64"
Name="Installed"
Type="raw" />
</Property>
<CustomAction Id="Run_Deskflow" ExeCommand="Deskflow" FileRef="CM_FP_deskflow.exe" Return="asyncNoWait"/>
<CustomAction
Id="ShowVCRedistError"
Error="Latest Microsoft Visual C++ Redistributable is required. Please install it before proceeding."/>
<InstallExecuteSequence>
<Custom Action="ShowVCRedistError" Before="InstallServices" Condition="NOT Installed AND NOT VC_REDIST_INSTALLED"/>
<Custom Action="Run_Deskflow" OnExit="success" Condition="NOT Installed"/>
</InstallExecuteSequence>
</CPackWiXFragment>