From 27d43abbeed95e8d419eeeff5f12065c4ce9cb40 Mon Sep 17 00:00:00 2001
From: "Christoph Bergmeister [MVP]" <c.bergmeister@gmail.com>
Date: Tue, 4 Sep 2018 10:38:21 +0100
Subject: [PATCH 1/3] Fix issue whereby shortcut does not get uninstalled due
 to non-uniqueness of shortcut component

---
 assets/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index c6088b6975f..803badc31c4 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -223,7 +223,7 @@
       </Directory>
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)">
-          <Component Id="ApplicationProgramsMenuShortcut" Guid="{A77507A7-F970-4618-AC30-20AFE36EE2EB}">
+          <Component Id="ApplicationProgramsMenuShortcut" Guid="*">
             <Shortcut Id="PowerShell_ProgramsMenuShortcut" 
                       Name="$(var.ProductSimpleVersionWithNameAndOptionalArchitecture)" 
                       Description="$(var.ProductSimpleVersionWithNameAndOptionalArchitecture)" 

From 39b39fc4ddf183e164126fb29b2ba267a7d07f86 Mon Sep 17 00:00:00 2001
From: "Christoph Bergmeister [MVP]" <c.bergmeister@gmail.com>
Date: Tue, 4 Sep 2018 11:24:01 +0100
Subject: [PATCH 2/3] Make ExplorerContextMenu Guid unique as well

---
 assets/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index 803badc31c4..d61be06e47f 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -169,7 +169,7 @@
             </Component>
             <!-- Explorer context menu with 2 submenus to open PowerShell normally or as an Administator.
                  See https://blogs.msdn.microsoft.com/andrew_richards/2017/03/01/enhancing-the-open-command-prompt-here-shift-right-click-context-menu-experience/ for details -->
-            <Component Id="ExplorerContextMenu" Guid="{df82e941-fced-4de9-aef8-c81a2946dd68}" KeyPath="yes">
+            <Component Id="ExplorerContextMenu" Guid="*" KeyPath="yes">
               <Condition>ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL</Condition>
               <!-- When clicking on background in Explorer -->
               <RegistryKey Root="HKCR" Key="Directory\Background\shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">

From 5ee0a02d3ba870b325484216b213061f9669af60 Mon Sep 17 00:00:00 2001
From: "Christoph Bergmeister [MVP]" <c.bergmeister@gmail.com>
Date: Tue, 4 Sep 2018 12:21:57 +0100
Subject: [PATCH 3/3] Re-add Guid of ExplorerContextMenu due compilation error
 (LGHT0230 : The Component/@Guid attribute's value '*' is not valid for this
 component because it does not meet the criteria for having an automatically
 generated guid. Components using a Directory as a KeyPath or containing
 ODBCDataSource child elements cannot use an automatically generated guid.
 Make sure your component doesn't have a Directory as the KeyPath and move any
 ODBCDataSource child elements to components with explicit component guids)

---
 assets/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index d61be06e47f..803badc31c4 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -169,7 +169,7 @@
             </Component>
             <!-- Explorer context menu with 2 submenus to open PowerShell normally or as an Administator.
                  See https://blogs.msdn.microsoft.com/andrew_richards/2017/03/01/enhancing-the-open-command-prompt-here-shift-right-click-context-menu-experience/ for details -->
-            <Component Id="ExplorerContextMenu" Guid="*" KeyPath="yes">
+            <Component Id="ExplorerContextMenu" Guid="{df82e941-fced-4de9-aef8-c81a2946dd68}" KeyPath="yes">
               <Condition>ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL</Condition>
               <!-- When clicking on background in Explorer -->
               <RegistryKey Root="HKCR" Key="Directory\Background\shell\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)">