From ef37d2cfa2b3378899f703ee3e5aeff798835a63 Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Thu, 14 Jun 2018 13:26:05 -0700
Subject: [PATCH 1/2] [package] set workingdirectory to user home on shortcut

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

diff --git a/assets/Product.wxs b/assets/Product.wxs
index 8ff6bb88eb4..ce3d18633db 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -227,7 +227,8 @@
             <Shortcut Id="PowerShell_ProgramsMenuShortcut" 
                       Name="$(var.ProductSimpleVersionWithNameAndOptionalArchitecture)" 
                       Description="$(var.ProductSimpleVersionWithNameAndOptionalArchitecture)" 
-                      Target="[$(var.ProductDirectoryName)]pwsh.exe" 
+                      Target="[$(var.ProductDirectoryName)]pwsh.exe"
+                      Arguments="-WorkingDirectory ~"
                       WorkingDirectory="$(var.ProductDirectoryName)"
                       Icon = "PowerShellExe.ico" />
             <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>

From aec4c4e9b4abd76ca9401a71993d24bdba1e9ed6 Mon Sep 17 00:00:00 2001
From: "Steve Lee (POWERSHELL)" <slee@ntdev.microsoft.com>
Date: Tue, 19 Jun 2018 14:47:09 -0700
Subject: [PATCH 2/2] remove redundant WorkingDirectory attribute

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

diff --git a/assets/Product.wxs b/assets/Product.wxs
index ce3d18633db..9f52500c380 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -229,7 +229,6 @@
                       Description="$(var.ProductSimpleVersionWithNameAndOptionalArchitecture)" 
                       Target="[$(var.ProductDirectoryName)]pwsh.exe"
                       Arguments="-WorkingDirectory ~"
-                      WorkingDirectory="$(var.ProductDirectoryName)"
                       Icon = "PowerShellExe.ico" />
             <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
             <!-- HKMU is HKLM when installing perMachine and HKCU when installing perUser-->