From fa3305534ff58f1b6c38cea8333e56f2e12d9e50 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister <c.bergmeister@gmail.com>
Date: Wed, 25 Apr 2018 01:03:14 +0100
Subject: [PATCH] Use '-WorkingDirectory' parameter to handle context menu when
 path contains single quotes. (#6660)

Use new '-WorkingDirectory' parameter on pwsh.exe to be able to use context menu when path contains single quotes.
---
 assets/Product.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/Product.wxs b/assets/Product.wxs
index e8f080e6d9..1f402d4559 100644
--- a/assets/Product.wxs
+++ b/assets/Product.wxs
@@ -201,7 +201,7 @@
                 <RegistryValue Type="string" Name="Icon" Value="[$(var.ProductDirectoryName)]assets\Powershell_black.ico"/>
               </RegistryKey>
               <RegistryKey Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\open\command">
-                <RegistryValue Type="string" Value="[$(var.ProductDirectoryName)]pwsh.exe -NoExit -Command Set-Location -LiteralPath '%V'"/>
+                <RegistryValue Type="string" Value="[$(var.ProductDirectoryName)]pwsh.exe -NoExit -WorkingDirectory &quot;%V&quot; "/>
               </RegistryKey>
               <RegistryKey Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\runas">
                 <RegistryValue Type="string" Name="MUIVerb" Value="$(var.ExplorerContextSubMenuElevatedDialogText)"/>
@@ -209,7 +209,7 @@
                 <RegistryValue Type="string" Value="" Name="HasLUAShield"/>
               </RegistryKey>
               <RegistryKey Root="HKCR" Key="Directory\ContextMenus\$(var.ProductName)$(var.SimpleProductVersion)$(sys.BUILDARCH)\shell\runas\command">
-                <RegistryValue Type="string" Value="[$(var.ProductDirectoryName)]pwsh.exe -NoExit -Command Set-Location -LiteralPath '%V'"/>
+                <RegistryValue Type="string" Value="[$(var.ProductDirectoryName)]pwsh.exe -NoExit -WorkingDirectory &quot;%V&quot; "/>
               </RegistryKey>
             </Component>
           </Directory>