From d1a132c814cb6faa03c80e41276927f7ad4405a4 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <Stanzilla@users.noreply.github.com>
Date: Sat, 13 Jan 2018 00:29:51 +0100
Subject: [PATCH 1/2] Change start menu folder name

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

diff --git a/assets/Product.wxs b/assets/Product.wxs
index d6381cd0073..69df252f9c6 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -175,7 +175,7 @@
         </Directory>
       </Directory>
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductSemanticVersionWithName)">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductSemanticVersionWithNameAndOptionalArchitecture)">
           <Component Id="ApplicationProgramsMenuShortcut" Guid="{A77507A7-F970-4618-AC30-20AFE36EE2EB}">
             <Shortcut Id="PowerShell_ProgramsMenuShortcut" Name="$(var.ProductSemanticVersionWithNameAndOptionalArchitecture)" Description="$(var.ProductSemanticVersionWithNameAndOptionalArchitecture)" Target="[$(var.ProductVersionWithName)]pwsh.exe" WorkingDirectory="$(var.ProductVersionWithName)"
               Icon = "PowerShellExe.ico" />

From b6f3361484d06ccb3cbc0f8f04768b8d502600df Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <Stanzilla@users.noreply.github.com>
Date: Sat, 13 Jan 2018 15:45:50 +0100
Subject: [PATCH 2/2] Change start menu folder name to just PowerShell

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

diff --git a/assets/Product.wxs b/assets/Product.wxs
index 69df252f9c6..ba5c929d430 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -175,7 +175,7 @@
         </Directory>
       </Directory>
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductSemanticVersionWithNameAndOptionalArchitecture)">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)">
           <Component Id="ApplicationProgramsMenuShortcut" Guid="{A77507A7-F970-4618-AC30-20AFE36EE2EB}">
             <Shortcut Id="PowerShell_ProgramsMenuShortcut" Name="$(var.ProductSemanticVersionWithNameAndOptionalArchitecture)" Description="$(var.ProductSemanticVersionWithNameAndOptionalArchitecture)" Target="[$(var.ProductVersionWithName)]pwsh.exe" WorkingDirectory="$(var.ProductVersionWithName)"
               Icon = "PowerShellExe.ico" />