From 0958cdaa2d86cef6b7a5cebe2afee68ff1d48db8 Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Fri, 17 Mar 2017 16:13:12 -0600
Subject: [PATCH] ensure paths are quoted

---
 InstallerProjects/Installer/Installer.wixproj | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/InstallerProjects/Installer/Installer.wixproj b/InstallerProjects/Installer/Installer.wixproj
index f5f28af7f..d685da0c3 100644
--- a/InstallerProjects/Installer/Installer.wixproj
+++ b/InstallerProjects/Installer/Installer.wixproj
@@ -114,22 +114,6 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
     <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>set /p buildenv=&lt;buildenv.tmp
-
-REM Sign MSI
-IF EXIST C:\mRemoteNG_code_signing_cert.pfx (
-    IF %25buildenv: Portable=%25==Release (
-        powershell "&amp;""$(SolutionDir)Tools\signfiles.ps1""" %27%25cd%25%27
-    )
-)
-
-REM Rename MSI to include version number
-powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\rename_installer_with_version.ps1" $(SolutionDir)
-
-REM Copy MSI to Release folder
-IF %25buildenv: Portable=%25==Release (powershell -ExecutionPolicy Bypass -File  "$(SolutionDir)Tools\copy_release_installer.ps1" $(TargetDir) $(SolutionDir)Release)</PostBuildEvent>
-  </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>REM Clean the TargetDir
 rmdir /S /Q "$(TargetDir)"
@@ -142,4 +126,20 @@ call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag
 REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
 call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>set /p buildenv=&lt;buildenv.tmp
+
+REM Sign MSI
+IF EXIST C:\mRemoteNG_code_signing_cert.pfx (
+    IF %25buildenv: Portable=%25==Release (
+        powershell -File "$(SolutionDir)Tools\signfiles.ps1" -PathToSignableFiles %27%25cd%25%27
+    )
+)
+
+REM Rename MSI to include version number
+powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\rename_installer_with_version.ps1" "$(SolutionDir)"
+
+REM Copy MSI to Release folder
+IF %25buildenv: Portable=%25==Release (powershell -ExecutionPolicy Bypass -File  "$(SolutionDir)Tools\copy_release_installer.ps1" "$(TargetDir)" "$(SolutionDir)Release)"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file