From f99aeb91825da688980889a8fe515db681279036 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Tue, 10 Jan 2023 17:00:09 +0100
Subject: [PATCH] Set product code based app_name and version

This might fix upgrading of alpha versions

Contribute to CURA-9157
---
 packaging/msi/UltiMaker-Cura.wxs.jinja | 6 ++++--
 packaging/msi/create_windows_msi.py    | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja
index 39ea521d8e..c41c8bc375 100644
--- a/packaging/msi/UltiMaker-Cura.wxs.jinja
+++ b/packaging/msi/UltiMaker-Cura.wxs.jinja
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:fw="http://schemas.microsoft.com/wix/FirewallExtension">
     <Product
-        Id="*"
+        Id="{{ product_code }}"
         Name="{{ app_name }}"
         Language="1033"
         Version="{{ version_major }}.{{ version_minor }}.{{ version_patch }}"
         Manufacturer="{{ company }}"
         UpgradeCode="{{ upgrade_code }}"
     >
-        <Package InstallerVersion="500"
+        <Package
+            Id="*"
+            InstallerVersion="500"
             Compressed="yes"
             InstallScope="perMachine"
             Manufacturer="{{ company }}"
diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py
index 1952584c54..3527c39392 100644
--- a/packaging/msi/create_windows_msi.py
+++ b/packaging/msi/create_windows_msi.py
@@ -40,6 +40,7 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s
         company="UltiMaker",
         web_site="https://ultimaker.com",
         year=datetime.now().year,
+        product_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name + os.environ.get("CURA_VERSION_MAJOR") + os.environ.get("CURA_VERSION_MINOR"))),
         upgrade_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name)),
         shortcut_uuid=str(uuid.uuid5(uuid.NAMESPACE_DNS, f"Shortcut {app_name}")),
         cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")),