From 24cb9e16a84a8cb0fcd6a604b3d69867aad15975 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Fri, 13 Jan 2023 15:42:55 +0100
Subject: [PATCH] Use auto generated shortcut Guid

This should remove the short-cuts

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

diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja
index 1a62e0e6fd..a183a97d5f 100644
--- a/packaging/msi/UltiMaker-Cura.wxs.jinja
+++ b/packaging/msi/UltiMaker-Cura.wxs.jinja
@@ -122,7 +122,7 @@
 
         <!--Shortcuts-->
         <DirectoryRef Id="ShortCutDir">
-            <Component Id="CMP_Shortcuts" Guid="{{ shortcut_uuid }}">
+            <Component Id="CMP_Shortcuts" Guid="*">
                 <Shortcut Id="SHRT_Cura"
                           Name="{{ app_name }} {{ version }}"
                           Description="{{ app_name }} {{ version }}"
@@ -150,6 +150,6 @@
             <ComponentGroupRef Id="NewFilesGroup" />
             <ComponentRef Id="CMP_Shortcuts" />
         </Feature>
-        <Feature Id="UninstallOlderVersionFeature" Title="Uninstall previous versions" Level="{{ 1 if "Enterprise" in app_name else 2 }}" Description="..."/>
+        <Feature Id="UninstallOlderVersionFeature" Title="Uninstall previous versions" Level="{{ 1 if "Enterprise" in app_name else 0 }}" Description="..."/>
     </Product>
 </Wix>
\ No newline at end of file
diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py
index d57537a009..268fc670a2 100644
--- a/packaging/msi/create_windows_msi.py
+++ b/packaging/msi/create_windows_msi.py
@@ -41,7 +41,6 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s
         web_site="https://ultimaker.com",
         year=datetime.now().year,
         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")),
         cura_banner_top=str(source_loc.joinpath("packaging", "msi", "banner_top.bmp")),
         cura_banner_side=str(source_loc.joinpath("packaging", "msi", "banner_side.bmp")),