From df5e6193496c23337dbce545888c78bf811a05fa Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Thu, 23 Jun 2016 09:57:46 -0600
Subject: [PATCH] - Moved the PuTTYNG dependency file to
 $(SolutionDir)\Resources - Added postbuild task to mRemoteV1 project to copy
 PuTTYNG file to $(TargetDir) - Modified installer to point to the new PuTTYNG
 location

---
 .../Installer/Filters/Harvest_Filter.xslt           |   1 +
 .../Installer/Fragments/PuTTYNGFragment.wxs         |   4 ++--
 .../Resources}/PuTTYNG.exe                          | Bin
 mRemoteV1/mRemoteV1.csproj                          |   3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)
 rename {InstallerProjects/Installer/Dependencies => mRemoteV1/Resources}/PuTTYNG.exe (100%)

diff --git a/InstallerProjects/Installer/Filters/Harvest_Filter.xslt b/InstallerProjects/Installer/Filters/Harvest_Filter.xslt
index e3e0ed67..8f63dffb 100644
--- a/InstallerProjects/Installer/Filters/Harvest_Filter.xslt
+++ b/InstallerProjects/Installer/Filters/Harvest_Filter.xslt
@@ -14,6 +14,7 @@ xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
   <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, 'manifest')]" use="@Id" />
   <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, '.application')]" use="@Id" />
   <xsl:key name="service-search" match="wix:Component[wix:File/@Source = '$(var.HarvestPath)\mRemoteNG.exe']" use="@Id" />
+  <xsl:key name="service-search" match="wix:Component[wix:File/@Source = '$(var.HarvestPath)\PuTTYNG.exe']" use="@Id" />
   <xsl:template match="wix:Component[key('service-search', @Id)]" />
   <xsl:template match="wix:ComponentRef[key('service-search', @Id)]" />
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs b/InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs
index fd27e995..bd3384f5 100644
--- a/InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Fragment>
     <DirectoryRef Id="APPLICATIONROOTDIRECTORY">
       <Component Id="C.PuttyNGFile" Guid="*">
-        <File Id="PuttyNGFile" Name="PuTTYNG.exe" Source="Dependencies\PuTTYNG.exe" KeyPath="yes" />
+        <File Id="PuttyNGFile" Name="PuTTYNG.exe" Source="$(var.HarvestPath)\PuTTYNG.exe" KeyPath="yes" />
       </Component>
     </DirectoryRef>
 	</Fragment>
diff --git a/InstallerProjects/Installer/Dependencies/PuTTYNG.exe b/mRemoteV1/Resources/PuTTYNG.exe
similarity index 100%
rename from InstallerProjects/Installer/Dependencies/PuTTYNG.exe
rename to mRemoteV1/Resources/PuTTYNG.exe
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 83ed7cf4..f4786d2e 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -1195,6 +1195,9 @@
     <PostBuildEvent>call "$(DevEnvDir)..\tools\vsvars32.bat"
 set /p buildenv=&lt;buildenv.tmp
 
+echo Copy PUTTYNG to correct directory
+copy /Y "$(SolutionDir)mRemoteV1\Resources\PuTTYNG.exe" .\
+
 REM Move Help files to correct directory
 move /Y Resources\Help .\
 rmdir /s /q Resources