From e1945d9e545ad29c7f0cf71529b9cbc0157854b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?=
 <46607934+lwronski@users.noreply.github.com>
Date: Wed, 12 Oct 2022 14:58:28 +0200
Subject: [PATCH] Add support for passing UpgradeCodeGuideId into wix config
 (#89)

---
 .../main/scala/packager/cli/commands/WindowsOptions.scala | 8 ++++++--
 .../test/scala/packager/windows/WindowsPackageTests.scala | 3 ++-
 .../src/main/scala/packager/config/WindowsSettings.scala  | 3 ++-
 .../src/main/scala/packager/windows/WindowsPackage.scala  | 3 ++-
 .../main/scala/packager/windows/WindowsWixConfig.scala    | 5 +++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/cli/src/main/scala/packager/cli/commands/WindowsOptions.scala b/modules/cli/src/main/scala/packager/cli/commands/WindowsOptions.scala
index 66a970d..57d8378 100644
--- a/modules/cli/src/main/scala/packager/cli/commands/WindowsOptions.scala
+++ b/modules/cli/src/main/scala/packager/cli/commands/WindowsOptions.scala
@@ -30,7 +30,10 @@ final case class WindowsOptions(
     is64Bits: Boolean = true,
     @Group("Windows")
     @HelpMessage("WIX installer version")
-    installerVersion: Option[String] = None
+    installerVersion: Option[String] = None,
+    @Group("Windows")
+    @HelpMessage("The GUID to identify that the windows package can be upgraded.")
+    wixUpgradeCodeGuid: Option[String] = None
 ) {
 
   def toWindowsSettings(
@@ -53,7 +56,8 @@ final case class WindowsOptions(
       suppressValidation = suppressValidation,
       extraConfigs = extraConfigs,
       is64Bits = is64Bits,
-      installerVersion = installerVersion
+      installerVersion = installerVersion,
+      wixUpgradeCodeGuid = wixUpgradeCodeGuid
     )
 }
 
diff --git a/modules/image-resizer/src/test/scala/packager/windows/WindowsPackageTests.scala b/modules/image-resizer/src/test/scala/packager/windows/WindowsPackageTests.scala
index 99f0c43..1c2b25d 100644
--- a/modules/image-resizer/src/test/scala/packager/windows/WindowsPackageTests.scala
+++ b/modules/image-resizer/src/test/scala/packager/windows/WindowsPackageTests.scala
@@ -62,6 +62,7 @@ class WindowsPackageTests extends munit.FunSuite with NativePackageHelper {
       suppressValidation = true,
       extraConfigs = Nil,
       is64Bits = false,
-      installerVersion = None
+      installerVersion = None,
+      wixUpgradeCodeGuid = None,
     )
 }
diff --git a/modules/packager/src/main/scala/packager/config/WindowsSettings.scala b/modules/packager/src/main/scala/packager/config/WindowsSettings.scala
index 77216ba..4487f64 100644
--- a/modules/packager/src/main/scala/packager/config/WindowsSettings.scala
+++ b/modules/packager/src/main/scala/packager/config/WindowsSettings.scala
@@ -9,5 +9,6 @@ case class WindowsSettings(
     suppressValidation: Boolean,
     extraConfigs: List[String],
     is64Bits: Boolean,
-    installerVersion: Option[String]
+    installerVersion: Option[String],
+    wixUpgradeCodeGuid: Option[String]
 ) extends NativeSettings
diff --git a/modules/packager/src/main/scala/packager/windows/WindowsPackage.scala b/modules/packager/src/main/scala/packager/windows/WindowsPackage.scala
index 338f344..d90ef25 100644
--- a/modules/packager/src/main/scala/packager/windows/WindowsPackage.scala
+++ b/modules/packager/src/main/scala/packager/windows/WindowsPackage.scala
@@ -43,7 +43,8 @@ case class WindowsPackage(
       launcherAppName = launcherApp,
       extraConfigs = buildSettings.extraConfigs,
       is64Bits = buildSettings.is64Bits,
-      installerVersion = buildSettings.installerVersion
+      installerVersion = buildSettings.installerVersion,
+      wixUpgradeCodeGuid = buildSettings.wixUpgradeCodeGuid
     )
 
     createConfFile(wixConfig)
diff --git a/modules/packager/src/main/scala/packager/windows/WindowsWixConfig.scala b/modules/packager/src/main/scala/packager/windows/WindowsWixConfig.scala
index 0c91260..b38382f 100644
--- a/modules/packager/src/main/scala/packager/windows/WindowsWixConfig.scala
+++ b/modules/packager/src/main/scala/packager/windows/WindowsWixConfig.scala
@@ -19,7 +19,8 @@ case class WindowsWixConfig(
     launcherAppName: String,
     extraConfigs: List[String],
     is64Bits: Boolean,
-    installerVersion: Option[String]
+    installerVersion: Option[String],
+    wixUpgradeCodeGuid: Option[String]
 ) {
 
   lazy val extraConfig: Option[String] =
@@ -72,7 +73,7 @@ case class WindowsWixConfig(
   def generateContent(): String =
     s"""<?xml version="1.0"?>
     <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" UpgradeCode="$randomGuid"
+    <Product Id="*" UpgradeCode="${wixUpgradeCodeGuid.getOrElse(randomGuid)}"
              Name="$productName" Version="$version" Manufacturer="$maintainer" Language="1033">
       <Package $extraPackage InstallerVersion="${installerVersion.getOrElse(
       "200"