Merge pull request #1446 from lwronski/fix-msi

Update scala-packager to 0.1.29 and hardcode upgradeCodeGuid

Author: lwronski

.github/scripts/generate-os-packages.sh

@@ -93,7 +93,8 @@ generate_msi() {
     --exit-dialog "To run Scala CLI, open a Command window, and type scala-cli + Enter. If scala-cli cannot be found, ensure that the Command window was opened after Scala CLI was installed." \
     --logo-path "./logo.png" \
     --suppress-validation \
-    --extra-configs wix-visual-cpp-redist.xml
+    --extra-configs wix-visual-cpp-redist.xml \
+    --wix-upgrade-code-guid "C74FC9A1-9381-40A6-882F-9044C603ABD9"
   rm -f "$ARTIFACTS_DIR/"*.wixpdb || true
 }
 

modules/cli-options/src/main/scala/scala/cli/commands/PackagerOptions.scala

@@ -82,6 +82,9 @@ final case class PackagerOptions(
   @Group("Windows")
   @HelpMessage("WIX installer version")
     installerVersion: Option[String] = None,
+  @Group("Windows")
+  @HelpMessage("The GUID to identify that the windows package can be upgraded.")
+    wixUpgradeCodeGuid: Option[String] = None,
   @Group("Docker")
   @HelpMessage(
     "Building the container from base image"

modules/cli/src/main/scala/scala/cli/commands/Package.scala

@@ -450,7 +450,8 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
               packageOptions.windowsOptions.suppressValidation.getOrElse(false),
             extraConfigs = packageOptions.windowsOptions.extraConfig,
             is64Bits = packageOptions.windowsOptions.is64Bits.getOrElse(true),
-            installerVersion = packageOptions.windowsOptions.installerVersion
+            installerVersion = packageOptions.windowsOptions.installerVersion,
+            wixUpgradeCodeGuid = packageOptions.windowsOptions.wixUpgradeCodeGuid
           )
 
           nativePackagerType match {

modules/cli/src/main/scala/scala/cli/commands/util/PackageOptionsUtil.scala

@@ -81,7 +81,8 @@ object PackageOptionsUtil {
               suppressValidation = packager.suppressValidation,
               extraConfig = packager.extraConfig,
               is64Bits = Some(packager.is64Bits),
-              installerVersion = packager.installerVersion
+              installerVersion = packager.installerVersion,
+              wixUpgradeCodeGuid = packager.wixUpgradeCodeGuid
             ),
             dockerOptions = DockerOptions(
               from = packager.dockerFrom,

modules/options/src/main/scala/scala/build/options/packaging/WindowsOptions.scala

@@ -9,7 +9,8 @@ final case class WindowsOptions(
   suppressValidation: Option[Boolean] = None,
   extraConfig: List[String] = Nil,
   is64Bits: Option[Boolean] = None,
-  installerVersion: Option[String] = None
+  installerVersion: Option[String] = None,
+  wixUpgradeCodeGuid: Option[String] = None
 )
 
 object WindowsOptions {

project/deps.sc

@@ -66,7 +66,7 @@ object Deps {
     def jsoniterScalaJava8 = "2.13.5"
     def scalaMeta          = "4.5.13"
     def scalaNative        = "0.4.7"
-    def scalaPackager      = "0.1.28"
+    def scalaPackager      = "0.1.29"
     def signingCli         = "0.1.10"
   }
   // DO NOT hardcode a Scala version in this dependency string

website/docs/reference/cli-options.md

@@ -713,6 +713,10 @@ Whether a 64-bit executable is being packaged
 
 WIX installer version
 
+### `--wix-upgrade-code-guid`
+
+The GUID to identify that the windows package can be upgraded.
+
 ### `--docker-from`
 
 Building the container from base image