From 005b2485f6eb6a80b29912636cd34940b9dfd8b8 Mon Sep 17 00:00:00 2001
From: "23439176+magriggs@users.noreply.github.com"
 <23439176+magriggs@users.noreply.github.com>
Date: Tue, 30 Jul 2024 09:07:55 +0800
Subject: [PATCH] issue-2622: mRemoteNGInstaller - remove explicit PuTTyNG
 fragment, as PuttyNG is copied implicitly by FilesFragment. Fixes #2622.

---
 .../Installer/Fragments/PuTTYNGFragment.wxs            | 10 ----------
 mRemoteNGInstaller/Installer/Installer.wixproj         |  1 -
 mRemoteNGInstaller/Installer/mRemoteNG.wxs             |  3 ---
 3 files changed, 14 deletions(-)
 delete mode 100644 mRemoteNGInstaller/Installer/Fragments/PuTTYNGFragment.wxs

diff --git a/mRemoteNGInstaller/Installer/Fragments/PuTTYNGFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/PuTTYNGFragment.wxs
deleted file mode 100644
index 62d10582..00000000
--- a/mRemoteNGInstaller/Installer/Fragments/PuTTYNGFragment.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment>
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="C.PuttyNGFile" Guid="86bc1cf4-4c51-40a1-a9fe-cf9669bb883a">
-        <File Id="PuttyNGFile" Name="PuTTYNG.exe" Source="$(var.HarvestPath)\PuTTYNG.exe" KeyPath="yes" />
-      </Component>
-    </DirectoryRef>
-	</Fragment>
-</Wix>
\ No newline at end of file
diff --git a/mRemoteNGInstaller/Installer/Installer.wixproj b/mRemoteNGInstaller/Installer/Installer.wixproj
index 7424278a..53f60eb8 100644
--- a/mRemoteNGInstaller/Installer/Installer.wixproj
+++ b/mRemoteNGInstaller/Installer/Installer.wixproj
@@ -23,7 +23,6 @@
     <Compile Include="Fragments\DirectoriesFragment.wxs" />
     <Compile Include="Fragments\MainExeFragment.wxs" />
     <Compile Include="Fragments\MiscTextFilesFragment.wxs" />
-    <Compile Include="Fragments\PuTTYNGFragment.wxs" />
     <Compile Include="Fragments\RegistryEntriesFragment.wxs" />
     <Compile Include="Fragments\ShortcutFragment.wxs" />
     <Compile Include="mRemoteNG.wxs" />
diff --git a/mRemoteNGInstaller/Installer/mRemoteNG.wxs b/mRemoteNGInstaller/Installer/mRemoteNG.wxs
index 5fe4837a..15e5f9a7 100644
--- a/mRemoteNGInstaller/Installer/mRemoteNG.wxs
+++ b/mRemoteNGInstaller/Installer/mRemoteNG.wxs
@@ -76,9 +76,6 @@
       <ComponentRef Id="C.MainExe" Primary="yes" />
       <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
       <ComponentRef Id="C.RegistryEntries" Primary="yes" />
-       <Feature Id="F.PuttyNG" Title="PuTTYNG" Absent="allow" AllowAdvertise="no" Level="1">
-         <ComponentRef Id="C.PuttyNGFile" Primary="yes" />
-        </Feature>
     </Feature>
 
     <Feature Id="F.DesktopShortcut" Title="!(loc.Feature_DesktopShortcut)" Absent="allow" AllowAdvertise="no" Level="1">