From 28dc14e739a00df9e7533c044cda691e464bdcac Mon Sep 17 00:00:00 2001
From: Faryan Rezagholi <faryan.rezagholi@siedle.de>
Date: Wed, 8 Dec 2021 23:06:56 +0100
Subject: [PATCH] improved feature tree in installer

---
 .../Installer/Fragments/FilesFragment.wxs     | 24 ++++++------
 mRemoteNGInstaller/Installer/mRemoteNG.wxs    | 37 ++++++++-----------
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
index e9d76b8a7..5a7c682cd 100644
--- a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
+++ b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
@@ -33,6 +33,12 @@
     </Fragment>
     <Fragment>
         <ComponentGroup Id="MandatoryComponents">
+            <Component Id="cmp0FFDB5713D4361B40AD821F8DA4DEE0B" Directory="INSTALLDIR" Guid="*">
+                <File Id="fil476630E8F9CF75F8A90F5A6BE104F314" KeyPath="yes" Source="$(var.HarvestPath)\AWSSDK.Core.dll" />
+            </Component>
+            <Component Id="cmpEB77DBE680AF298F880635C9CE9E4C0F" Directory="INSTALLDIR" Guid="*">
+                <File Id="fil27E42615D840C88A58DA9387A7D8E8C5" KeyPath="yes" Source="$(var.HarvestPath)\AWSSDK.EC2.dll" />
+            </Component>
             <Component Id="cmp35D96EA44AD8354ED2F995D3EBCCE1A7" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil19AFB7CDBA1EEFE8FFFF6028483B5EC8" KeyPath="yes" Source="$(var.HarvestPath)\AxInterop.MSTSCLib.dll" />
             </Component>
@@ -51,6 +57,12 @@
             <Component Id="cmpB33DF036D353C8FDD69458B2FE71E10B" Directory="INSTALLDIR" Guid="*">
                 <File Id="filDE15699EEB9D455A194CFECACB2D34CA" KeyPath="yes" Source="$(var.HarvestPath)\Cucumber.Messages.dll" />
             </Component>
+            <Component Id="cmpD846FD49FC176CEFBA3E8411896C6DEE" Directory="INSTALLDIR" Guid="*">
+                <File Id="fil86AC9D6CDBC2AE2AADFE752F1AD83685" KeyPath="yes" Source="$(var.HarvestPath)\ExternalConnectors.dll" />
+            </Component>
+            <Component Id="cmp0E22CC4281F53936AB57E54775E94F4C" Directory="INSTALLDIR" Guid="*">
+                <File Id="filEA870C5699E25304BC08ED0EFD930BC6" KeyPath="yes" Source="$(var.HarvestPath)\ExternalConnectors.pdb" />
+            </Component>
             <Component Id="cmp19EC39A721B3368567C267C98B3A70BF" Directory="INSTALLDIR" Guid="*">
                 <File Id="filF4F0A4E8F055AEBFE89D956290E642D9" KeyPath="yes" Source="$(var.HarvestPath)\Google.Protobuf.dll" />
             </Component>
@@ -111,18 +123,6 @@
             <Component Id="cmpEDFC52653A3A4D5C80AB3A0B7CE9AE35" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil9C1ED4726B58F1CD4C25AF29BDBE0F77" KeyPath="yes" Source="$(var.HarvestPath)\Renci.SshNet.dll" />
             </Component>
-            <Component Id="cmpA00CF5661042E8A2C92E994701940B20" Directory="INSTALLDIR" Guid="*">
-                <File Id="fil3C2ECCC2300D1A596FD61DE5BDA516B9" KeyPath="yes" Source="$(var.HarvestPath)\SecretServerInterface.dll" />
-            </Component>
-            <Component Id="cmp2E457E98C683BEF1517CF4A8D5657186" Directory="INSTALLDIR" Guid="*">
-                <File Id="filFE5CA1C47FA0D581BC8CDAB8F75D8D26" KeyPath="yes" Source="$(var.HarvestPath)\SecretServerInterface.dll.config" />
-            </Component>
-            <Component Id="cmpD6C3B20DC44B6168A4264C075091DD5C" Directory="INSTALLDIR" Guid="*">
-                <File Id="fil9C41752260F38BCD6AABB88D2382EF23" KeyPath="yes" Source="$(var.HarvestPath)\SecretServerInterface.pdb" />
-            </Component>
-            <Component Id="cmp350CD765CB2C99BEB476F5301E5FCA43" Directory="INSTALLDIR" Guid="*">
-                <File Id="filB15E8F1F97CB8BC09EBEE0923040AAAF" KeyPath="yes" Source="$(var.HarvestPath)\SecretServerInterface.XmlSerializers.dll" />
-            </Component>
             <Component Id="cmpEEF6A35F8A6BADDF0E1C90F92FE0D47E" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil0DAB9F548FB79BA6060656EC4E6D6E46" KeyPath="yes" Source="$(var.HarvestPath)\SparkleLibrary.dll" />
             </Component>
diff --git a/mRemoteNGInstaller/Installer/mRemoteNG.wxs b/mRemoteNGInstaller/Installer/mRemoteNG.wxs
index 773f3c703..1d6954857 100644
--- a/mRemoteNGInstaller/Installer/mRemoteNG.wxs
+++ b/mRemoteNGInstaller/Installer/mRemoteNG.wxs
@@ -70,30 +70,25 @@
     <Condition Message="!(loc.Install_RDP80Requirement)">
       <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND (MINIMUM_RDP_VERSION_INSTALLED = 1))]]>
     </Condition>
-    
-    
 
-    <Feature Id="F.Complete" Title="!(loc.Feature_Complete)" Display="expand" AllowAdvertise="no" Level="1">
-      <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Level="1">
-        <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
-        <ComponentRef Id="C.MainExe" Primary="yes" />
-        <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
-        <ComponentRef Id="C.RegistryEntries" Primary="yes" />
-      </Feature>
-
-      <Feature Id="F.PuttyNG" Title="PuTTYNG" Absent="allow" AllowAdvertise="no" Level="1">
-        <ComponentRef Id="C.PuttyNGFile" Primary="yes" />
-      </Feature>
-
-      <Feature Id="F.DesktopShortcut" Title="!(loc.Feature_DesktopShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
-        <ComponentRef Id="C.DesktopShortcut" Primary="yes" />
-      </Feature>
-
-      <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
-        <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
-      </Feature>
+    <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="expand" Level="1">
+      <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
+      <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">
+      <ComponentRef Id="C.DesktopShortcut" Primary="yes" />
+    </Feature>
+
+    <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
+      <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
+    </Feature>
+    
     <UI>
       <UIRef Id="WixUI_FeatureTree"/>
       <UIRef Id="WixUI_ErrorProgressText" />