Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bundler/wix): Add AUTOLAUNCHAPP and LAUNCHAPPARGS public properties #10117

Merged
merged 3 commits into from
Jun 26, 2024
Merged

fix(bundler/wix): Add AUTOLAUNCHAPP and LAUNCHAPPARGS public properties #10117

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
026c5ed
fix(bundler/wix): Add `AUTOLAUNCHAPP` public property
FabianLars Jun 24, 2024
afb5b82
fix condition and add support for cli args
FabianLars Jun 25, 2024
6b7313e
Update tooling/bundler/src/bundle/windows/templates/main.wxs
amrbashir Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/fix-wix-autostart-after-update.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
tauri-bundler: patch:enhance
---

Added a public property to the msi to tell the installer to launch the app after installation. This was added for the updater plugin.
12 changes: 10 additions & 2 deletions tooling/bundler/src/bundle/windows/templates/main.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
<!-- reinstall all files; rewrite all registry entries; reinstall all shortcuts -->
<Property Id="REINSTALLMODE" Value="amus" />

<!-- Check if this is an update from tauri-plugin-update to autostart the app after install -->
amrbashir marked this conversation as resolved.
Show resolved Hide resolved
<Property Id="AUTOLAUNCHAPP" Secure="yes" />
<!-- Property to forward cli args to the launched app to not lose those of the pre-update instance -->
<Property Id="LAUNCHAPPARGS" Secure="yes" />

{{#if allow_downgrades}}
<MajorUpgrade Schedule="afterInstallInitialize" AllowDowngrades="yes" />
{{else}}
Expand Down Expand Up @@ -70,8 +75,7 @@
<!-- launch app checkbox -->
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.LaunchApp)" />
<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
<Property Id="WixShellExecTarget" Value="[!Path]" />
<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
<CustomAction Id="LaunchApplication" Impersonate="yes" FileKey="Path" ExeCommand="[LAUNCHAPPARGS]" Return="asyncNoWait" />

<UI>
<!-- launch app checkbox -->
Expand Down Expand Up @@ -334,6 +338,10 @@
</InstallExecuteSequence>
{{/if}}

<InstallExecuteSequence>
<Custom Action="LaunchApplication" After="InstallFinalize">AUTOLAUNCHAPP AND NOT Installed</Custom>
</InstallExecuteSequence>

<SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>
</Product>
</Wix>
Loading