Add support for passing UpgradeCodeGuideId into wix config (#89)

VirtusLab · Oct 12, 2022 · e1945d9 · e1945d9
1 parent 8551bfa
commit e1945d9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"