From c334781689de9156a8cc8060faf3929ff94a4460 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sun, 2 Aug 2026 14:16:58 +0100
Subject: [PATCH] Refactor Windows MSI installer sequence for improved action
 flow

- Adjusted the order of custom actions in the MSI wrapped configuration to streamline the installation process.
- Enhanced conditions for uninstalling previous versions and running the installer, improving clarity and maintainability of the script.
---
 packaging/windows/msi-wrapped.wxs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packaging/windows/msi-wrapped.wxs b/packaging/windows/msi-wrapped.wxs
index 2ec1026..3688f8b 100644
--- a/packaging/windows/msi-wrapped.wxs
+++ b/packaging/windows/msi-wrapped.wxs
@@ -102,9 +102,8 @@
       <Custom Action="KillFarmControl" After="InstallInitialize">NOT Installed</Custom>
       <Custom Action="SetUninstallPreviousFromRegistry" Before="UninstallPrevious">NOT Installed AND PREVIOUS_UNINSTALL_CMD</Custom>
       <Custom Action="SetUninstallPreviousFromInstallDir" Before="UninstallPrevious">NOT Installed AND NOT PREVIOUS_UNINSTALL_CMD AND PREVIOUS_INSTALL_DIR</Custom>
-      <Custom Action="UninstallPrevious" After="KillFarmControl">NOT Installed AND (PREVIOUS_UNINSTALL_CMD OR PREVIOUS_INSTALL_DIR)</Custom>
-      <Custom Action="RunInstaller" After="UninstallPrevious">NOT Installed AND (PREVIOUS_UNINSTALL_CMD OR PREVIOUS_INSTALL_DIR)</Custom>
-      <Custom Action="RunInstaller" After="KillFarmControl">NOT Installed AND NOT (PREVIOUS_UNINSTALL_CMD OR PREVIOUS_INSTALL_DIR)</Custom>
+      <Custom Action="UninstallPrevious" Before="RunInstaller">NOT Installed AND (PREVIOUS_UNINSTALL_CMD OR PREVIOUS_INSTALL_DIR)</Custom>
+      <Custom Action="RunInstaller" After="KillFarmControl">NOT Installed</Custom>
     </InstallExecuteSequence>
   </Product>
 </Wix>