From 80960e47f82de385da959e29cc6674031a10f281 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Mon, 31 Jan 2022 16:09:59 -0800
Subject: [PATCH] Allow reinstallation of MSI packages (#3958)

Make the necessary changes to the WiX XML to allow the generated MSI
installers to be reinstalled.
---
 changes/reinstall-msi                    | 1 +
 orbit/pkg/packaging/windows_templates.go | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changes/reinstall-msi

diff --git a/changes/reinstall-msi b/changes/reinstall-msi
new file mode 100644
index 0000000000..7e6278bfd3
--- /dev/null
+++ b/changes/reinstall-msi
@@ -0,0 +1 @@
+* Allow MSI packages generated by `fleetctl package` to reinstall on Windows without uninstall.
diff --git a/orbit/pkg/packaging/windows_templates.go b/orbit/pkg/packaging/windows_templates.go
index fd246a3a14..69ac3fedb8 100644
--- a/orbit/pkg/packaging/windows_templates.go
+++ b/orbit/pkg/packaging/windows_templates.go
@@ -8,7 +8,7 @@ var windowsWixTemplate = template.Must(template.New("").Option("missingkey=error
 	`<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Product
-    Id="C2C2437D-0562-465E-A0BB-2C4484025BD6"
+    Id="*"
     Name="Fleet osquery"
     Language="1033"
     Version="{{.Version}}"
@@ -16,7 +16,6 @@ var windowsWixTemplate = template.Must(template.New("").Option("missingkey=error
     UpgradeCode="B681CB20-107E-428A-9B14-2D3C1AFED244" >
 
     <Package
-      Id="*"
       Keywords='Fleet osquery'
       Description="Fleet osquery"
       InstallerVersion="500"
@@ -25,6 +24,8 @@ var windowsWixTemplate = template.Must(template.New("").Option("missingkey=error
       InstallPrivileges="elevated"
       Languages="1033" />
 
+    <Property Id="REINSTALLMODE" Value="amus" />
+
     <MediaTemplate EmbedCab="yes" />
 
     <MajorUpgrade AllowDowngrades="yes" />