re-added a few more missing menu icons

Processing COM reference "" from path "". At least one of the arguments
for '' cannot be marshaled by the runtime marshaler.  Such arguments
will therefore be passed as a pointer and may require unsafe code to
manipulate.

.github/CONTRIBUTING.md

@@ -0,0 +1 @@
+Please see the [Wiki](https://github.com/mRemoteNG/mRemoteNG/wiki/Development) for contributing information.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+<!--
+Only file GitHub issues for bugs and feature requests.  All other topics will be closed.
+
+Before opening an issue, please search for a duplicate or closed issue.
+Please provide as much detail as possible for us to fix your issue.
+-->
+
+<!-- Bug -->
+|||
+|--:|---|
+|Operating system | Windows 7 x64 |
+|mRemoteNG version| 1.75 aplha 3  |
+
+
+<!-- Feature Request -->
+<!-- If you file a feature request, please delete the bug section -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+<!--
+Please provide as much detail as possible with what your pull request does.
+Include a reference to a filed issue if it exists.
+-->

.gitignore

@@ -279,3 +279,13 @@ Installer/Resources/License.rtf
 Installer/Fragments/FilesFragment.wxs
 Installer Projects/Installer/Resources/License.rtf
 Installer Projects/Installer/Fragments/FilesFragment.wxs
+Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
+InstallerProjects/Installer/Fragments/FilesFragment.wxs
+InstallerProjects/Installer/Resources/License.rtf
+
+# user preference: .editorconfig - http://editorconfig.org/
+.editorconfig
+
+# gh-pages info
+runlocal.bat
+/_site

CREDITS.TXT

@@ -1,20 +1,32 @@
 Contributors
 ============
 
+Current mRemoteNG dev team:
+David Sparer (github.com/sparerd)
+Sean Kaim (github.com/kmscode)
+
+Thanks for the awesome new website!
+Bennett Blodinger (github.com/benwa)
+
+
+Past Contributors
+=================
+
+Felix Deimel - mRemote original developer
+Riley McArdle - mRemoteNG original developer
+
+Hayato Iriumi (github.com/hiriumi)
 Jason Barbier
 Wiktor Beryt
 Lionel Caignec
 Ruben d'Arco
-Felix Deimel
 Holger Henke
 Tom Hiller
-Riley McArdle
 Apisitt Rattana
 Andreas Rehm
 David Vidmar
-David Sparer
-Hayato Iriumi
-Sean Kaim
+github.com/Brandhor
+github.com/Kvarkas
 
 
 Translators
@@ -24,6 +36,8 @@ Eugenio "Ryo567" Mart
 Mathieu Pape
 Emanuel Silva
 Robert Siwiec
+Hayato Iriumi
+Sebastien Thieury (github.com/SebThieu)
 
 
 Included Source Code
@@ -34,15 +48,18 @@ Copyright
 MIT License
 http://www.codeproject.com/KB/recipes/command_line.aspx
 
-DotNetVer
-Copyright <20> 2010 David Grinberg
-Copyright <20> 2010-2011 Brandon Hansen
-http://nsis.sourceforge.net/DotNetVer
+FilteredPropertyGrid
+Copyright <20> 2006 Azuria
+http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
 
 Hotkey Selection Control for .NET
 Copyright <20> 2006 Thomas Backman
 http://www.codeproject.com/Articles/15085/A-simple-hotkey-selection-control-for-NET
 
+InputBox
+Copyright <20> 2016 Jan Slama
+http://www.csharp-examples.net/inputbox/
+
 IP TextBox
 Copyright <20> 2005 mawnkay
 http://www.codeproject.com/Articles/11576/IP-TextBox
@@ -56,24 +73,15 @@ Copyright
 Copyright <20> 2008 Felix Deimel
 http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
 
-DiffieHellman 1.0
-Copyright <20> 2003 The Mentalis.org Team
-Modified New BSD License
-http://www.mentalis.org/
-
-DockPanel Suite 2.3.1
-Copyright <20> 2007 Weifen Luo
+DockPanel Suite 2.10.0
+Copyright <20> 2016 @roken and @lextm (formerly Weifen Luo)
 MIT License
-http://sourceforge.net/projects/dockpanelsuite/
+https://github.com/dockpanelsuite/dockpanelsuite
 
-FilteredPropertyGrid 1.0.0.0
-Copyright <20> 2006 Azuria
-http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
-
-GeckoFX 1.8.1.4
-Copyright <20> 2008 Skybound Software
-Mozilla Public License 1.1
-http://www.geckofx.org/
+GeckoFX 45
+Copyright <20> 2016 Tom Hindle
+Mozilla Public License
+https://bitbucket.org/geckofx/
 
 log4net 1.2.15.0
 Copyright <20> 2001-2015 The Apache Software Foundation
@@ -85,32 +93,22 @@ Copyright
 Freely redistributable with attribution
 http://www.dotnetmagic.com/magic_download.html
 
-Mentalis.org Security Library 1.0.13.715
-Copyright <20> 2002-2005 The Mentalis.org Team
-Modified New BSD License
-http://www.mentalis.org/
-
-MiniGeckoBrowser 1.0
-Copyright <20> 2008 Felix Deimel
-http://www.appjuice.org/
-
 PuTTY 0.67
 Copyright <20> 1997-2016 Simon Tatham
 MIT License
 http://www.chiark.greenend.org.uk/~sgtatham/putty/
 
-SharpSSH 1.1.1.13
-Copyright <20> 2002-2008 Atsuhiko Yamanaka, JCraft, Inc.
-Copyright <20> 2007 Tamir Gal
-BSD Style License
-http://www.tamirgal.com/blog/page/SharpSSH.aspx
-
 Silk Icon Set
 Copyright <20> 2005-2008 FAMFAMFAM
 Creative Commons Attribution 2.5 License
 http://www.famfamfam.com/
 
-VncSharp 1.0
+SSH.NET v2016.0.0
+Copyright <20> 2016
+MIT License
+https://github.com/sshnet/SSH.NET
+
+VncSharp 1.1
 Copyright <20> 2004-2009 David Humphrey
 GNU General Public License (GPL) Version 2
-http://cdot.senecac.on.ca/projects/vncsharp/
+https://github.com/humphd/VncSharp

Installer Projects/CustomActions/CustomActions.cs

@@ -1,60 +0,0 @@
-using Microsoft.Deployment.WindowsInstaller;
-
-namespace CustomActions
-{
-    public class CustomActions
-    {
-        [CustomAction]
-        public static ActionResult IsKBInstalled(Session session)
-        {
-            session.Log("Begin IsKBInstalled");
-            string kb = session["KB"];
-            session.Log("Checking if '{0}' is installed", kb);
-            InstalledWindowsUpdateGatherer updateGatherer = new InstalledWindowsUpdateGatherer();
-            bool isUpdateInstalled = updateGatherer.IsUpdateInstalled(kb);
-            session.Log("KB is installed = '{0}'", isUpdateInstalled);
-            if (isUpdateInstalled)
-            {
-                session[kb] = "1";
-                session.Log("Set property '{0}' to '1'", kb);
-            }
-            else
-            {
-                session[kb] = "0";
-                session.Log("Set property '{0}' to '0'", kb);
-            }
-
-            session.Log("End IsKBInstalled");
-            return ActionResult.Success;
-        }
-
-        [CustomAction]
-        public static ActionResult IsLegacyVersionInstalled(Session session)
-        {
-            session.Log("Begin IsLegacyVersionInstalled");
-            UninstallNSISVersions uninstaller = new UninstallNSISVersions();
-            if (uninstaller.IsLegacymRemoteNGInstalled())
-            {
-                session["LEGACYVERSIONINSTALLED"] = "1";
-            }
-            else
-            {
-                session["LEGACYVERSIONINSTALLED"] = "0";
-            }
-
-            session.Log("End IsLegacyVersionInstalled");
-            return ActionResult.Success;
-        }
-
-        [CustomAction]
-        public static ActionResult UninstallLegacyVersion(Session session)
-        {
-            session.Log("Begin UninstallLegacyVersion");
-            UninstallNSISVersions uninstaller = new UninstallNSISVersions();
-            string uninstallString = uninstaller.GetLegacyUninstallString();
-            uninstaller.UninstallLegacyVersion(true);
-            session.Log("End UninstallLegacyVersion");
-            return ActionResult.Success;
-        }
-    }
-}

Installer Projects/CustomActions/InstalledWindowsUpdateGatherer.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Management;
-using System.Collections;
-
-namespace CustomActions
-{
-    public class InstalledWindowsUpdateGatherer
-    {
-        private ManagementScope _managementScope;
-        private ManagementClass _managementClass;
-
-        public InstalledWindowsUpdateGatherer()
-        {
-            _managementScope = Connect();
-            _managementClass = new ManagementClass("Win32_QuickFixEngineering");
-        }
-
-
-        public ManagementScope Connect()
-        {
-            try
-            {
-                return new ManagementScope(@"root\cimv2");
-            }
-            catch (ManagementException e)
-            {
-                Console.WriteLine("Failed to connect", e.Message);
-                throw;
-            }
-        }
-
-        public ArrayList GetInstalledUpdates()
-        {
-            string query = "SELECT * FROM Win32_QuickFixEngineering";
-            ArrayList installedUpdates = new ArrayList();
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher(_managementScope, new ObjectQuery(query));
-            foreach(ManagementObject queryObj in searcher.Get())
-            {
-                installedUpdates.Add(queryObj["HotFixID"]);
-            }
-            return installedUpdates;
-        }
-
-        public bool IsUpdateInstalled(string KB)
-        {
-            bool updateIsInstalled = false;
-            string query = string.Format("SELECT HotFixID FROM Win32_QuickFixEngineering WHERE HotFixID='{0}'", KB);
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher(_managementScope, new ObjectQuery(query));
-            if (searcher.Get().Count > 0)
-                updateIsInstalled = true;
-            return updateIsInstalled;
-        }
-    }
-}

Installer Projects/CustomActions/UninstallNSISVersions.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Win32;
-using System.Diagnostics;
-using System.IO;
-
-namespace CustomActions
-{
-    public class UninstallNSISVersions
-    {
-        private const string REGISTRY_PATH = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
-        private const string REGISTRY_PATH_Wow6432 = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
-        private RegistryKey _activeRegistryPath;
-
-
-        public UninstallNSISVersions()
-        {
-            GetLegacymRemoteNGRegistryKeyPath();
-        }
-
-        public void UninstallLegacyVersion(bool Silent = false)
-        {
-            if (!IsLegacymRemoteNGInstalled())
-                return;
-            string uninstallString = GetLegacyUninstallString();
-            string forceNonTempUninstaller = string.Format("_?={0}", uninstallString.Replace("Uninstall.exe", "").Replace(@"""", ""));
-            string silentUninstall = "";
-            if (Silent)
-            {
-                silentUninstall = "/S";
-            }
-            ProcessStartInfo processStartInfo = new ProcessStartInfo(uninstallString);
-            processStartInfo.UseShellExecute = true;
-            processStartInfo.Arguments = string.Format("{0} {1}", forceNonTempUninstaller, silentUninstall);
-            Process uninstallProcess = Process.Start(processStartInfo);
-            while (uninstallProcess.HasExited == false)
-            {
-                Debug.WriteLine("Waiting for uninstaller to exit");
-            }
-        }
-
-        public bool IsLegacymRemoteNGInstalled()
-        {
-            return (_activeRegistryPath != null);
-        }
-
-        public string GetLegacyUninstallString()
-        {
-            if (IsLegacymRemoteNGInstalled())
-                return _activeRegistryPath.GetValue("UninstallString").ToString();
-            return "";
-        }
-
-        private void GetLegacymRemoteNGRegistryKeyPath()
-        {
-            GetUninstallKeyPath();
-            GetUninstallKeyPath6432();
-        }
-
-        private void GetUninstallKeyPath()
-        {
-            try
-            {
-                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(REGISTRY_PATH);
-            }
-            catch (Exception ex)
-            { }
-        }
-
-        private void GetUninstallKeyPath6432()
-        {
-            try
-            {
-                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(REGISTRY_PATH_Wow6432);
-            }
-            catch (Exception ex)
-            { }
-        }
-    }
-}

Installer Projects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
-	<Fragment>
-    <CustomAction Id="SetRDP80KBValue" Return="check" Execute="immediate" Property="KB" Value="$(var.RDP80KB)" />
-    <CustomAction Id="CheckIfRDP80Installed" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsKBInstalled" />
-  </Fragment>
-  <Fragment>
-    <CustomAction Id="SetRDP81KBValue" Return="check" Execute="immediate" Property="KB" Value="$(var.RDP81KB)" />
-    <CustomAction Id="CheckIfRDP81Installed" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsKBInstalled" />
-  </Fragment>
-</Wix>

InstallerProjects/CustomActions/CustomActions.cs

@@ -0,0 +1,56 @@
+using Microsoft.Deployment.WindowsInstaller;
+
+namespace CustomActions
+{
+    public class CustomActions
+    {
+        [CustomAction]
+        public static ActionResult IsMinimumRdpVersionInstalled(Session session)
+        {
+            var acceptedRdpKbVariables = new[] { session["RDP80_KB"], session["RDP81_KB"] };
+            var returnVariable = "MINIMUM_RDP_VERSION_INSTALLED";
+            var kbInstalledChecker = new KbInstalledChecker(session);
+            kbInstalledChecker.Execute(acceptedRdpKbVariables, returnVariable);
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult IsRdpDtlsUpdateInstalled(Session session)
+        {
+            var kb = session["RDP_DTLS_KB"];
+            var returnVar = "RDP_DTLS_UPDATE_INSTALLED";
+            var kbInstalledChecker = new KbInstalledChecker(session);
+            kbInstalledChecker.Execute(kb, returnVar);
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult IsLegacyVersionInstalled(Session session)
+        {
+            session.Log("Begin IsLegacyVersionInstalled");
+            var uninstaller = new UninstallNsisVersions();
+            if (uninstaller.IsLegacymRemoteNgInstalled())
+            {
+                session["LEGACYVERSIONINSTALLED"] = "1";
+            }
+            else
+            {
+                session["LEGACYVERSIONINSTALLED"] = "0";
+            }
+
+            session.Log("End IsLegacyVersionInstalled");
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult UninstallLegacyVersion(Session session)
+        {
+            session.Log("Begin UninstallLegacyVersion");
+            var uninstaller = new UninstallNsisVersions();
+            uninstaller.GetLegacyUninstallString();
+            uninstaller.UninstallLegacyVersion(true);
+            session.Log("End UninstallLegacyVersion");
+            return ActionResult.Success;
+        }
+    }
+}

InstallerProjects/CustomActions/CustomActions.csproj

@@ -45,9 +45,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CustomActions.cs" />
+    <Compile Include="KbInstalledChecker.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="InstalledWindowsUpdateGatherer.cs" />
-    <Compile Include="UninstallNSISVersions.cs" />
+    <Compile Include="InstalledWindowsUpdateChecker.cs" />
+    <Compile Include="UninstallNsisVersions.cs" />
     <Content Include="CustomAction.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

InstallerProjects/CustomActions/InstalledWindowsUpdateChecker.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Management;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace CustomActions
+{
+    public class InstalledWindowsUpdateChecker
+    {
+        private readonly ManagementScope _managementScope;
+
+        public InstalledWindowsUpdateChecker()
+        {
+            _managementScope = Connect();
+        }
+
+
+        public ManagementScope Connect()
+        {
+            try
+            {
+                return new ManagementScope(@"root\cimv2");
+            }
+            catch (ManagementException e)
+            {
+                Console.WriteLine($"Failed to connect: {e.Message}");
+                throw;
+            }
+        }
+
+        public ArrayList GetInstalledUpdates()
+        {
+            const string query = "SELECT * FROM Win32_QuickFixEngineering";
+            var installedUpdates = new ArrayList();
+            var searcher = new ManagementObjectSearcher(_managementScope, new ObjectQuery(query));
+            foreach(var o in searcher.Get())
+            {
+                var queryObj = (ManagementObject) o;
+                installedUpdates.Add(queryObj["HotFixID"]);
+            }
+            return installedUpdates;
+        }
+
+        public bool IsUpdateInstalled(string kb) => IsUpdateInstalled(new[] {kb});
+
+        public bool IsUpdateInstalled(IEnumerable<string> kbList)
+        {
+            var updateIsInstalled = false;
+            var whereClause = BuildWhereClauseFromKbList(kbList);
+            if (whereClause == "") return false;
+            var query = $"SELECT HotFixID FROM Win32_QuickFixEngineering WHERE {whereClause}";
+            var searcher = new ManagementObjectSearcher(_managementScope, new ObjectQuery(query));
+            if (searcher.Get().Count > 0)
+                updateIsInstalled = true;
+            return updateIsInstalled;
+        }
+
+        private string BuildWhereClauseFromKbList(IEnumerable<string> kbList)
+        {
+            var whereClause = "";
+            var counter = 0;
+            foreach (var kb in kbList)
+            {
+                if (counter > 0)
+                    whereClause += " OR ";
+                whereClause += $"HotFixID='{kb}'";
+                counter++;
+            }
+            return whereClause;
+        }
+    }
+}

InstallerProjects/CustomActions/KbInstalledChecker.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Deployment.WindowsInstaller;
+
+namespace CustomActions
+{
+    public class KbInstalledChecker
+    {
+        private readonly Session _session;
+        private readonly InstalledWindowsUpdateChecker _installedUpdateChecker;
+
+        public KbInstalledChecker(Session session)
+        {
+            _installedUpdateChecker = new InstalledWindowsUpdateChecker();
+            _session = session;
+        }
+
+        public bool Execute(string acceptedKb, string returnVar) => Execute(new[] {acceptedKb}, returnVar);
+
+        public bool Execute(IEnumerable<string> acceptedKbs, string returnVar)
+        {
+            try
+            {
+                _session.Log("Begin KbInstalledChecker");
+                var isUpdateInstalled = _installedUpdateChecker.IsUpdateInstalled(acceptedKbs);
+                SetReturnValue(isUpdateInstalled, returnVar);
+                _session.Log("End KbInstalledChecker");
+                return true;
+            }
+            catch (Exception e)
+            {
+                _session.Log($"There was an issue executing the KbInstalledChecker. Exception: {e}");
+                return false;
+            }
+        }
+
+        private void SetReturnValue(bool isUpdateInstalled, string returnVar)
+        {
+            var updateInstalledVal = isUpdateInstalled ? "1" : "0";
+            _session[returnVar] = updateInstalledVal;
+            _session.Log($"Set property '{returnVar}' to '{updateInstalledVal}'");
+        }
+    }
+}

InstallerProjects/CustomActions/UninstallNSISVersions.cs

@@ -0,0 +1,83 @@
+using System;
+using Microsoft.Win32;
+using System.Diagnostics;
+
+
+namespace CustomActions
+{
+    public class UninstallNsisVersions
+    {
+        private const string RegistryPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
+        private const string RegistryPathWow6432 = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
+        private RegistryKey _activeRegistryPath;
+
+
+        public UninstallNsisVersions()
+        {
+            GetLegacymRemoteNgRegistryKeyPath();
+        }
+
+        public void UninstallLegacyVersion(bool silent = false)
+        {
+            if (!IsLegacymRemoteNgInstalled())
+                return;
+            var uninstallString = GetLegacyUninstallString();
+            var forceNonTempUninstaller = $"_?={uninstallString.Replace("Uninstall.exe", "").Replace(@"""", "")}";
+            var silentUninstall = "";
+            if (silent)
+            {
+                silentUninstall = "/S";
+            }
+            var processStartInfo = new ProcessStartInfo(uninstallString)
+            {
+                UseShellExecute = true,
+                Arguments = $"{forceNonTempUninstaller} {silentUninstall}"
+            };
+            var uninstallProcess = Process.Start(processStartInfo);
+            while (uninstallProcess != null && uninstallProcess.HasExited == false)
+            {
+                Debug.WriteLine("Waiting for uninstaller to exit");
+            }
+        }
+
+        public bool IsLegacymRemoteNgInstalled()
+        {
+            return (_activeRegistryPath != null);
+        }
+
+        public string GetLegacyUninstallString()
+        {
+            return IsLegacymRemoteNgInstalled() ? _activeRegistryPath.GetValue("UninstallString").ToString() : "";
+        }
+
+        private void GetLegacymRemoteNgRegistryKeyPath()
+        {
+            GetUninstallKeyPath();
+            GetUninstallKeyPath6432();
+        }
+
+        private void GetUninstallKeyPath()
+        {
+            try
+            {
+                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(RegistryPath);
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+        }
+
+        private void GetUninstallKeyPath6432()
+        {
+            try
+            {
+                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(RegistryPathWow6432);
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+        }
+    }
+}

InstallerProjects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment>
+    <CustomAction Id="CheckIfMinimumRdpInstalled" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsMinimumRdpVersionInstalled" />
+  </Fragment>
+  <Fragment>
+    <CustomAction Id="CheckIfRdpDtlsUpdateInstalled" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsRdpDtlsUpdateInstalled" />
+  </Fragment>
+</Wix>

InstallerProjects/Installer/Filters/Harvest_Filter.xslt

@@ -8,13 +8,13 @@ xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
       <xsl:apply-templates select="@*|node()"/>
     </xsl:copy>
   </xsl:template>
-  <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, '.pdb')]" use="@Id" />
   <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, '.xml')]" use="@Id" />
   <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, 'app.config')]" use="@Id" />
   <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, 'vshost')]" use="@Id" />
   <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>

InstallerProjects/Installer/Fragments/DirectoriesFragment.wxs

@@ -4,7 +4,8 @@
 	<Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.PlatformProgramFilesFolder)">
-        <Directory Id="APPLICATIONROOTDIRECTORY" Name="$(var.ProductName)" />
+        <Directory Id="APPLICATIONROOTDIRECTORY" Name="$(var.ProductName)">
+        </Directory>
       </Directory>
 
       <Directory Id="DesktopFolder" Name="!(loc.Folders_Desktop)" />

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>

InstallerProjects/Installer/Includes/Config.wxi

@@ -16,8 +16,11 @@
   <?define RequiredDotNetFrameworkMinorVersion = "0" ?>
   <?define RequiredDotNetFrameworkServicePackLevel = "" ?>
   <?define RequiredDotNetFrameworkVersion = "$(var.RequiredDotNetFrameworkMajorVersion).$(var.RequiredDotNetFrameworkMinorVersion)" ?>
-  <?define RDP80KB = "KB2592687" ?>
-  <?define RDP81KB = "KB2923545" ?>
+  <?define Rdp80Kb = "KB2592687" ?>
+  <?define Rdp81Kb = "KB2923545" ?>
+  <?define MinimumRdpKb = $(var.Rdp80Kb) ?>
+  <?define RdpDtlsKb = "KB2574819" ?>
+  <?define IGNOREPREREQUISITES = 0 ?>
   
   <?if $(var.Platform) = x64 ?>
     <?define ProductNameWithPlatform = "$(var.ProductName) (64 bit)" ?>

InstallerProjects/Installer/Installer.wixproj

@@ -98,22 +98,46 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <LinkerAdditionalOptions>
     </LinkerAdditionalOptions>
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PreBuildEvent>REM Harvest bin directory of the mRemoteV1 project
-call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -dr APPLICATIONROOTDIRECTORY -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" -v
-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>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+    <Cultures>en-US</Cultures>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <Cultures>en-US</Cultures>
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug;</DefineConstants>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|x86' ">
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug Portable;</DefineConstants>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;</DefineConstants>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>REM Clean the TargetDir
+rmdir /S /Q "$(TargetDir)"
+
+echo $(ConfigurationName) &gt; buildenv.tmp
+
+REM Harvest bin directory of the mRemoteV1 project
+call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -dr APPLICATIONROOTDIRECTORY -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" -v
+
+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 "&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>
 </Project>

InstallerProjects/Installer/Localizations/en-US.wxl

@@ -7,6 +7,7 @@
   <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework [REQUIREDDOTNETFRAMEWORKVERSION] or higher.</String>
   <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
   <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
+  <String Id="Install_RDPDtlsRequirement">mRemoteNG requires KB2574819 in order to create RDP connections. Windows 7 users will need to install this KB.</String>
   <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
   
   <!-- Directories and File names -->

InstallerProjects/Installer/mRemoteNGV1.wxs

@@ -9,22 +9,28 @@
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="!(loc.Upgrade_NewerVersionInstalled)" Schedule="afterInstallExecute" />
     <MediaTemplate EmbedCab="yes" />
-    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)Installer Projects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
+    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)InstallerProjects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
     <Property Id="ARPPRODUCTICON" Value="mRemoteNG.ico" />
     <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
     <Property Id="MAINEXE" Value="$(var.ExeProcessName)" />
     <Property Id="APPLICATIONROOTDIRECTORY">
       <RegistrySearch Id='mRemoteNGRegistry' Type='raw' Root='HKLM' Key='Software\mRemoteNG' Name='InstallDir' />
     </Property>
+    <Property Id='RDP_DTLS_KB' Value='$(var.RdpDtlsKb)' />
+    <Property Id='RDP_DTLS_UPDATE_INSTALLED' Value='0' Secure='yes' />
+    <Property Id='RDP80_KB' Value='$(var.Rdp80Kb)' />
+    <Property Id='RDP81_KB' Value='$(var.Rdp81Kb)' />
+    <Property Id='MINIMUM_RDP_VERSION_INSTALLED' Value='0' Secure='yes' />
     <Property Id='REQUIREDDOTNETFRAMEWORKVERSION' Value='$(var.RequiredDotNetFrameworkVersion)' />
     <Property Id='LEGACYVERSIONINSTALLED' Value='0' />
     <PropertyRef Id="NETFRAMEWORK40FULL" />
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
     <Icon Id="mRemoteNG.ico" SourceFile="Resources\mRemoteNG.ico" />
 
+
     <InstallUISequence>
-      <Custom Action="SetRDP80KBValue" After="AppSearch" />
-      <Custom Action="CheckIfRDP80Installed" After="SetRDP80KBValue">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
+      <Custom Action="CheckIfRdpDtlsUpdateInstalled" After="AppSearch">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
+      <Custom Action="CheckIfMinimumRdpInstalled" After="CheckIfRdpDtlsUpdateInstalled">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
       <LaunchConditions After="SetWIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
       <Custom Action="CheckIfLegacyVersionInstalled" After="LaunchConditions" />
       <Custom Action="UninstallLegacyVersion" After="CheckIfLegacyVersionInstalled">(NOT Installed) AND (LEGACYVERSIONINSTALLED = 1)</Custom>
@@ -37,19 +43,23 @@
     </Condition>
     <!-- Windows 7 or higher required -->
     <Condition Message="!(loc.Install_OSVersionRequirement)">
-      <![CDATA[Installed OR (VersionNT >= 601) OR (VersionNT64 >= 601)]]>
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 601) OR (VersionNT64 >= 601)]]>
     </Condition>
     <!-- If Windows 7, SP 1 is required -->
     <Condition Message="!(loc.Install_Win7RequiresSP1)">
-      <![CDATA[Installed OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND ServicePackLevel >= 1)]]>
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND ServicePackLevel >= 1)]]>
     </Condition>
     <!-- .Net Framework Version Condition -->
     <Condition Message="!(loc.Install_NeedDotNetFrameworkVersion)">
-      <![CDATA[Installed OR WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED = 1]]>
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED = 1]]>
+    </Condition>
+    <!-- If Win7, require RDP DTLS update (KB2574819) -->
+    <Condition Message="!(loc.Install_RDPDtlsRequirement)">
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND (RDP_DTLS_UPDATE_INSTALLED = 1))]]>
     </Condition>
     <!-- If Win7, require RDP 8.0 update (KB2592687) -->
     <Condition Message="!(loc.Install_RDP80Requirement)">
-      <![CDATA[Installed OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) ]]>AND ($(var.RDP80KB) = 1 OR $(var.RDP81KB) = 1))
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND (MINIMUM_RDP_VERSION_INSTALLED = 1))]]>
     </Condition>
     
     
@@ -71,7 +81,6 @@
 
       <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
         <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
-        
       </Feature>
     </Feature>
 

Jenkinsfile

@@ -1,44 +1,27 @@
 node('windows') {
 	def jobDir = pwd()
+	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
 	def vsToolsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools"
 	def vsExtensionsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow"
 	
 	stage 'Checkout Branch'
-	def gitUrl = "https://github.com/mRemoteNG/mRemoteNG.git"
-	def branchName = GetBranchName()
-	echo "BranchName: ${branchName}"
-	git([url: gitUrl, branch: branchName])
+	checkout([
+		$class: 'GitSCM',
+		branches: scm.branches,
+		userRemoteConfigs: scm.userRemoteConfigs
+	])
+
+	stage 'Restore NuGet Packages'
+	def nugetPath = "C:\\nuget.exe"
+	bat "${nugetPath} restore ${solutionFilePath}"
 
 	stage 'Build mRemoteNG (Normal)'
-	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo \"${jobDir}\\mRemoteV1.sln\""
+	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
 
 	stage 'Build mRemoteNG (Portable)'
-	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Debug Portable\" \"${jobDir}\\mRemoteV1.sln\""
+	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
 
 	stage 'Run Unit Tests'
 	def nunitTestAdapterPath = "C:\\Users\\Administrator\\AppData\\Local\\Microsoft\\VisualStudio\\14.0\\Extensions"
 	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\""
 }
-def GetBranchName() {
-	def jobDir = pwd()
-	echo "JobDir: ${jobDir}"
-	def patternToUse = GetPatternToMatchBranchNameFromDirectory()
-	echo "PatternToUse: ${patternToUse}"
-	java.util.regex.Matcher matcher = jobDir =~ patternToUse
-	echo "Ran the matcher"
-	matcher ? matcher[0][1] : null
-}
-def GetPatternToMatchBranchNameFromDirectory() {
-	def patternToUse = ""
-	def folderSeparator = ""
-	def branchNamePattern = "[a-zA-Z0-9\\-_]*"
-	def jenkinsJobInfoTag = "@*[0-9]*"
-	echo "isUnix: ${isUnix()}"
-	if (isUnix()) {
-		folderSeparator = "/"
-	} else {
-		folderSeparator =  "\\\\"
-	}
-	patternToUse = "${folderSeparator}(${branchNamePattern})(${jenkinsJobInfoTag})\$"
-	patternToUse
-}

Old_Installer/DotNetVer.nsh

@@ -1,296 +0,0 @@
-; ---------------------
-;      DotNetVer.nsh
-;      Written by: David Grinberg
-;      Homepage: http://ontheperiphery.veraida.com/
-;      Updated By: Brandon Hansen (http://www.remotehams.com/)
-; ---------------------
-;
-; LogicLib extensions for checking Microsoft .NET Framework versions and service packs.
-;
-; Latests Updates by Brandon Hansen, KG6YPI (RemoteHams.com)
-; Dec 26, 2011 - .NET Framework 4.0 detection fixes - client profile not being found
-; Dec 07, 2010 - .NET Framework 4.0 detection added by Brandon Hansen (KG6YPI)
-;
-; Usage examples:
-;
-; ${If} ${HasDotNet4.0}
-;    DetailPrint "Microsoft .NET Framework 4.0 installed."
-;    ${If} ${DOTNETVER_4_0} AtLeastDotNetServicePack 1
-;        DetailPrint "Microsoft .NET Framework 4.0 is at least SP1."
-;    ${Else}
-;        DetailPrint "Microsoft .NET Framework 4.0 SP1 not installed."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
-;        DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 1
-;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) available."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 0
-;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) not available."
-;    ${EndIf}
-; ${EndIf}
- 
- 
-!verbose push
-!verbose 3
- 
-!ifndef ___DOTNETVER__NSH___
-!define ___DOTNETVER__NSH___
- 
-!include LogicLib.nsh
-!include Util.nsh
- 
-# constants
- 
-!define DOTNETVER_1_0  "1.0"
-!define DOTNETVER_1_1  "1.1"
-!define DOTNETVER_2_0  "2.0"
-!define DOTNETVER_3_0  "3.0"
-!define DOTNETVER_3_5  "3.5"
-!define DOTNETVER_4_0  "4.0"
- 
-# variable declaration
- 
-Var /GLOBAL __DONTNET_FOUNDVER
- 
-!macro __DotNetVer_DeclareVars
-    !ifndef __DOTNETVER_VARS_DECLARED
-        !define __DOTNETVER_VARS_DECLARED
-        Var /GLOBAL __DOTNET_1.0
-        Var /GLOBAL __DOTNET_1.1
-        Var /GLOBAL __DOTNET_2.0
-        Var /GLOBAL __DOTNET_3.0
-        Var /GLOBAL __DOTNET_3.5
-        Var /GLOBAL __DOTNET_4.0
- 
-        Var /GLOBAL __DOTNETVER_1.0_SP
-        Var /GLOBAL __DOTNETVER_1.1_SP
-        Var /GLOBAL __DOTNETVER_2.0_SP
-        Var /GLOBAL __DOTNETVER_3.0_SP
-        Var /GLOBAL __DOTNETVER_3.5_SP
-        Var /GLOBAL __DOTNETVER_4.0_SP
- 
-        Var /GLOBAL __DOTNET_1.0_CLIENT
-        Var /GLOBAL __DOTNET_1.1_CLIENT
-        Var /GLOBAL __DOTNET_2.0_CLIENT
-        Var /GLOBAL __DOTNET_3.0_CLIENT
-        Var /GLOBAL __DOTNET_3.5_CLIENT
-        Var /GLOBAL __DOTNET_4.0_CLIENT
- 
-        Var /GLOBAL __DOTNET_1.0_FULL
-        Var /GLOBAL __DOTNET_1.1_FULL
-        Var /GLOBAL __DOTNET_2.0_FULL
-        Var /GLOBAL __DOTNET_3.0_FULL
-        Var /GLOBAL __DOTNET_3.5_FULL
-        Var /GLOBAL __DOTNET_4.0_FULL
- 
-        StrCpy $__DOTNET_1.0 0
-        StrCpy $__DOTNET_1.1 0
-        StrCpy $__DOTNET_2.0 0
-        StrCpy $__DOTNET_3.0 0
-        StrCpy $__DOTNET_3.5 0
-        StrCpy $__DOTNET_4.0 0
- 
-        StrCpy $__DOTNETVER_1.0_SP 0
-        StrCpy $__DOTNETVER_1.1_SP 0
-        StrCpy $__DOTNETVER_2.0_SP 0
-        StrCpy $__DOTNETVER_3.0_SP 0
-        StrCpy $__DOTNETVER_3.5_SP 0
-        StrCpy $__DOTNETVER_4.0_SP 0
- 
-        StrCpy $__DOTNET_1.0_CLIENT 0
-        StrCpy $__DOTNET_1.1_CLIENT 0
-        StrCpy $__DOTNET_2.0_CLIENT 0
-        StrCpy $__DOTNET_3.0_CLIENT 0
-        StrCpy $__DOTNET_3.5_CLIENT 0
-        StrCpy $__DOTNET_4.0_CLIENT 0
- 
-        StrCpy $__DOTNET_1.0_FULL 0
-        StrCpy $__DOTNET_1.1_FULL 0
-        StrCpy $__DOTNET_2.0_FULL 0
-        StrCpy $__DOTNET_3.0_FULL 0
-        StrCpy $__DOTNET_3.5_FULL 0
-        StrCpy $__DOTNET_4.0_FULL 0
- 
-  !endif
-!macroend
- 
- 
-# lazy initialization macro
- 
-!macro __DotNetVer_InitVars
-    # only calculate version once
-    StrCmp $__DONTNET_FOUNDVER "" dotnetver.noveryet
-        Return
- 
-    dotnetver.noveryet:
-    !insertmacro __DotNetVer_DeclareVars
- 
-    Push $0    ;registry count
-    Push $1    ;registry key
-    Push $2    ;version number
-    Push $3    ;installed
-    Push $4    ;service pack number
-    Push $8    ;strLen helper var
- 
-    StrCpy $0 0
- 
-    dotnetver.startenum:
- 
-    EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
-    StrCmp $1 "" dotnetver.done
- 
-    IntOp $0 $0 + 1
- 
-    StrCpy $2 $1 1 0
-    StrCmp $2 "v" +1 dotnetver.startenum
-    StrCpy $2 $1 3 1
- 
-    ; Check for .NET 1.0 to 3.5
-    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "Install"
-    ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "SP"
-    IntCmp $3 1 dotnetcheck.skipalt
-    ; Alternate check for versions that don't set the Install key
-    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1\Setup" "InstallSuccess"
-    dotnetcheck.skipalt:
-    ; This is a sanity check that works on .NET 1.0 to 3.5
-    ; if it fails check for dotnet 4
-    IntCmp $3 0 dotnetcheck.40
-    StrCmp $2 ${DOTNETVER_1_0} dotnetver.10
-    StrCmp $2 ${DOTNETVER_1_1} dotnetver.11
-    StrCmp $2 ${DOTNETVER_2_0} dotnetver.20
-    StrCmp $2 ${DOTNETVER_3_0} dotnetver.30
-    StrCmp $2 ${DOTNETVER_3_5} dotnetver.35
-    dotnetcheck.40:
-    StrCmp $2 ${DOTNETVER_4_0} dotnetver.40
-    StrCmp $2 "4" dotnetver.40
- 
-    Goto dotnetver.startenum
- 
-    dotnetver.10:
-        StrCpy $__DOTNET_1.0 1
-        StrCpy $__DOTNETVER_1.0_SP $4
-        StrCpy $__DOTNET_1.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.11:
-        StrCpy $__DOTNET_1.1 1
-        StrCpy $__DOTNETVER_1.1_SP $4
-        StrCpy $__DOTNET_1.1_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.20:
-        StrCpy $__DOTNET_2.0 1
-        StrCpy $__DOTNETVER_2.0_SP $4
-        StrCpy $__DOTNET_2.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.30:
-        StrCpy $__DOTNET_3.0 1
-        StrCpy $__DOTNETVER_3.0_SP $4
-        StrCpy $__DOTNET_3.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.35:
-        StrCpy $__DOTNET_3.5 1
-        StrCpy $__DOTNETVER_3.5_SP $4
-        StrCpy $__DOTNET_3.5_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.40:
-        ; Check for .NET 4.0 (Full Profile)
-        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Install"
-        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "SP"
-	StrLen $8 $3
-        IntCmp $8 0 dotnetcheck.40c
-        IntCmp $3 0 dotnetcheck.40c
-        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Full
-        StrCmp $2 "4" dotnetver.40_Full
-        dotnetcheck.40c:
-        ; Check for .NET 4.0 (Client Profile)
-        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "Install"
-        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "SP"
-	StrLen $8 $3
-        IntCmp $8 0 dotnetver.startenum
-        IntCmp $3 0 dotnetver.startenum
-        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Client
-        StrCmp $2 "4" dotnetver.40_Client
-        Goto dotnetver.startenum
-    dotnetver.40_Full:
-        StrCpy $__DOTNET_4.0 1
-        StrCpy $__DOTNETVER_4.0_SP $4
-        StrCpy $__DOTNET_4.0_FULL 1
-        Goto dotnetcheck.40c ; continue looking for other profiles
-    dotnetver.40_Client:
-        StrCpy $__DOTNET_4.0 1
-        StrCpy $__DOTNETVER_4.0_SP $4
-        StrCpy $__DOTNET_4.0_CLIENT 1
-        Goto dotnetver.startenum
- 
-    dotnetver.done:
- 
-    StrCpy $__DONTNET_FOUNDVER "1"
- 
-    Pop $8
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-!macroend
- 
-!macro _HasDotNet _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-   !insertmacro _= `$__DOTNET_${_b}` `1` `${_t}` `${_f}`
-!macroend
- 
-!macro __DotNetVer_DefineTest Ver
-  !define HasDotNet${Ver} `"" HasDotNet ${Ver}`
-!macroend
- 
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_1}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_2_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_5}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_4_0}
- 
-!macro _AtLeastDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _>= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define AtLeastDotNetServicePack `AtLeastDotNetServicePack`
- 
- 
-!macro _AtMostDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _<= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define AtMostDotNetServicePack `AtMostDotNetServicePack`
- 
- 
-!macro _IsDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define IsDotNetServicePack `IsDotNetServicePack`
- 
-!macro _HasDotNetClientProfile _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNET_${_a}_CLIENT` `${_b}` `${_t}` `${_f}`
-!macroend
-!define HasDotNetClientProfile `HasDotNetClientProfile`
- 
-!macro _HasDotNetFullProfile _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNET_${_a}_FULL` `${_b}` `${_t}` `${_f}`
-!macroend
-!define HasDotNetFullProfile `HasDotNetFullProfile`
- 
-# done
- 
-!endif # !___DOTNETVER__NSH___
- 
-!verbose pop

Old_Installer/Language/czech.nsi

@@ -1,22 +0,0 @@
-; Czech installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_CZECH} "mRemoteNG run CZECH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_CZECH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_CZECH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_CZECH} "Credits"
-LangString CopyingLinkName ${LANG_CZECH} "License"
-LangString UninstallLinkName ${LANG_CZECH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_CZECH} "Version History"

Old_Installer/Language/dutch.nsi

@@ -1,22 +0,0 @@
-; Dutch installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_DUTCH} "mRemoteNG run DUTCH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_DUTCH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_DUTCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_DUTCH} "Credits"
-LangString CopyingLinkName ${LANG_DUTCH} "License"
-LangString UninstallLinkName ${LANG_DUTCH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_DUTCH} "Version History"

Old_Installer/Language/english.nsi

@@ -1,22 +0,0 @@
-; English installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_ENGLISH} "Launch mRemoteNG Now"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_ENGLISH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_ENGLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_ENGLISH} "Credits"
-LangString CopyingLinkName ${LANG_ENGLISH} "License"
-LangString UninstallLinkName ${LANG_ENGLISH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_ENGLISH} "Version History"

Old_Installer/Language/french.nsi

@@ -1,22 +0,0 @@
-; French installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_FRENCH} "mRemoteNG run FRENCH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_FRENCH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_FRENCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_FRENCH} "Credits"
-LangString CopyingLinkName ${LANG_FRENCH} "License"
-LangString UninstallLinkName ${LANG_FRENCH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_FRENCH} "Version History"

Old_Installer/Language/german.nsi

@@ -1,22 +0,0 @@
-; German installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_GERMAN} "mRemoteNG jetzt Starten"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_GERMAN} "Installationsprogamm Sprache"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte w<>hlen Sie die Sprache f<>r das Installationsprogramm"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG ben<65>tigt das Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_GERMAN} "Sie m<>ssen Mitglied der Grupper 'Power Users' or 'Administratoren' sein, damit Sie mRemoteNG installieren k<>nnen."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_GERMAN} "Credits"
-LangString CopyingLinkName ${LANG_GERMAN} "License"
-LangString UninstallLinkName ${LANG_GERMAN} "Uninstall"
-LangString ChangeLogLinkName ${LANG_GERMAN} "Version History"

Old_Installer/Language/languages.nsi

@@ -1,31 +0,0 @@
-!define LanguageNameEnglish "English"
-!insertmacro MUI_LANGUAGE "English"
-!include "Language\english.nsi"
-
-!define LanguageNameCzech "Čeština"
-!insertmacro MUI_LANGUAGE "Czech"
-!include "Language\czech.nsi"
-
-!define LanguageNameGerman "Deutsch"
-!insertmacro MUI_LANGUAGE "German"
-!include "Language\german.nsi"
-
-!define LanguageNameSpanish "Español"
-!insertmacro MUI_LANGUAGE "Spanish"
-!include "Language\spanish.nsi"
-
-!define LanguageNameFrench "Français"
-!insertmacro MUI_LANGUAGE "French"
-!include "Language\french.nsi"
-
-!define LanguageNameDutch "Nederlands"
-!insertmacro MUI_LANGUAGE "Dutch"
-!include "Language\dutch.nsi"
-
-!define LanguageNamePolish "Polski"
-!insertmacro MUI_LANGUAGE "Polish"
-!include "Language\polish.nsi"
-
-!define LanguageNameThai "ภาษาไทย"
-!insertmacro MUI_LANGUAGE "Thai"
-!include "Language\thai.nsi"

Old_Installer/Language/polish.nsi

@@ -1,22 +0,0 @@
-; Polish installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_POLISH} "mRemoteNG run POLISH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_POLISH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_POLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_POLISH} "Credits"
-LangString CopyingLinkName ${LANG_POLISH} "License"
-LangString UninstallLinkName ${LANG_POLISH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_POLISH} "Version History"

Old_Installer/Language/spanish.nsi

@@ -1,22 +0,0 @@
-; Spanish installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_SPANISH} "Iniciando de mRemoteNG"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_SPANISH} "Lenguaje de Instalación"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_SPANISH} "Seleccione el lenguaje de instalación"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requiere Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_SPANISH} "Debe ser miembro del grupo 'Administradores' para poder instalar mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_SPANISH} "Créditos"
-LangString CopyingLinkName ${LANG_SPANISH} "Licencia"
-LangString UninstallLinkName ${LANG_SPANISH} "Desinstalar"
-LangString ChangeLogLinkName ${LANG_SPANISH} "Historial de Versiones"

Old_Installer/Language/thai.nsi

@@ -1,23 +0,0 @@
-; Thai installer translation
-; Contributed by Apisitt Rattana
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_THAI} "ขณะนี้กำลังติดตั้ง mRemoteNG"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_THAI} "ภาษาสำหรับการติดตั้ง"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_THAI} "กรุณาเลือกภาษาสำหรับการติดตั้ง"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG มีความต้องการ  Microsoft .NET Framework 3.0. เป็นพื้นฐาน"
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_THAI} "คุณต้องเป็นสมาชิกในกลุ่มของ 'Power Users' หรือ 'Administrators' เพื่อการติดตั้ง mRemoteNG"
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_THAI} "Credits"
-LangString CopyingLinkName ${LANG_THAI} "License"
-LangString UninstallLinkName ${LANG_THAI} "Uninstall"
-LangString ChangeLogLinkName ${LANG_THAI} "Version History"

Old_Installer/mRemote.nsi

@@ -1,197 +0,0 @@
-!include "MUI.nsh"
-!include "WordFunc.nsh"
-!insertmacro VersionCompare
-
-!include "DotNetVer.nsh"
-!include "..\Release\Version.nsh"
-
-; This will be passed in using the /D switch by BUILD.CMD
-!ifdef PRODUCT_VERSION_TAG
-	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
-	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}-${PRODUCT_VERSION_TAG}"
-!else
-	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
-	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}"
-!endif
-
-; Basic Config
-Name "mRemoteNG ${PRODUCT_VERSION_FRIENDLY}"
-OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION_TAGGED}.exe"
-SetCompressor /SOLID lzma
-InstallDir "$PROGRAMFILES\mRemoteNG"
-InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
-RequestExecutionLevel admin
-
-; Version Information
-VIProductVersion ${PRODUCT_VERSION}
-VIAddVersionKey "CompanyName" "Next Generation Software"
-VIAddVersionKey "ProductName" "mRemoteNG"
-VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION}
-VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2013 Riley McArdle"
-VIAddVersionKey "FileDescription" "mRemoteNG ${PRODUCT_VERSION_FRIENDLY} Installer"
-VIAddVersionKey "FileVersion" ${PRODUCT_VERSION}
-
-; Design
-!define MUI_ICON "Setup_Install.ico"
-!define MUI_UNICON "RecycleBin.ico"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "header.bmp" ; optional
-!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
-!define MUI_HEADERIMAGE_UNBITMAP "header.bmp" ; optional
-!define MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH
-!define MUI_HEADER_TRANSPARENT_TEXT
-!define MUI_WELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
-!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-
-; Install Pages
-!insertmacro MUI_PAGE_LICENSE "..\COPYING.TXT"
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-
-; Finish Page
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_RUN "$INSTDIR\mRemoteNG.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstall Pages
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Get Languages
-!include "Language\languages.nsi"
-
-; Set finish page text
-!define MUI_FINISHPAGE_RUN_Text "$(LaunchMremoteNow)"
-
-Function .onInit
-	ClearErrors
-	UserInfo::GetName
-	IfErrors Win9x
-	Pop $0
-	UserInfo::GetAccountType
-	Pop $1
-	# GetOriginalAccountType will check the tokens of the original user of the
-	# current thread/process. If the user tokens were elevated or limited for
-	# this process, GetOriginalAccountType will return the non-restricted
-	# account type.
-	# On Vista with UAC, for example, this is not the same value when running
-	# with `RequestExecutionLevel user`. GetOriginalAccountType will return
-	# "admin" while GetAccountType will return "user".
-	StrCmp $1 "Admin" 0 +3
-		Goto doit
-	StrCmp $1 "Power" 0 +3
-		Goto doit
-	StrCmp $1 "User" 0 +3
-		Goto noop
-	StrCmp $1 "Guest" 0 +3
-		Goto noop
-	MessageBox MB_OK "Unknown error"
-	Goto doit
-
-	Win9x:
-	doit:
-		# We can install
-		IfSilent +2
-			Call SelectLanguage
-		Goto end
-	noop:
-		MessageBox MB_OK "$(RequiresAdminUser)"
-		Quit
-	end:
-FunctionEnd
-
-Function SelectLanguage
-	;Language selection dialog
-	Push ""
-	Push ${LANG_ENGLISH}
-	Push ${LanguageNameEnglish}
-	Push ${LANG_GERMAN}
-	Push ${LanguageNameGerman}
-	Push ${LANG_DUTCH}
-	Push ${LanguageNameDutch}
-	Push ${LANG_FRENCH}
-	Push ${LanguageNameFrench}
-	Push ${LANG_POLISH}
-	Push ${LanguageNamePolish}
-	Push ${LANG_SPANISH}
-	Push ${LanguageNameSpanish}
-	Push ${LANG_CZECH}
-	Push ${LanguageNameCzech}
-	Push ${LANG_THAI}
-	Push ${LanguageNameThai}
-	Push A ; A means auto count languages
-	       ; for the auto count to work the first empty push (Push "") must remain
-	LangDLL::LangDialog  "$(InstallerLanguage)" "$(SelectInstallerLanguage)"
-
-	Pop $LANGUAGE
-	StrCmp $LANGUAGE "cancel" 0 +2
-		Abort
-
-	; Check .NET version
-	${IfNot} ${HasDotNet3.0}
-		MessageBox MB_OK|MB_ICONEXCLAMATION "$(RequiresNetFramework)"
-		Quit
-	${EndIf}
-FunctionEnd
-
-Section "" ; Install
-	SetOutPath $INSTDIR
-	SetShellVarContext all
-	
-	; AddFiles
-	File /r /x "mRemoteNG.vshost.*" "..\mRemoteV1\bin\Release\*.*"
-	File /r "Dependencies\*.*"
-	File "..\*.txt"
-
-	; Uninstaller
-	WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-	; Register ActiveX components
-	RegDLL "$INSTDIR\eolwtscom.dll"
- 
-	; Start Menu
-	CreateDirectory "$SMPROGRAMS\mRemoteNG"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CreditsLinkName).lnk" "$INSTDIR\CREDITS.TXT"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CopyingLinkName).lnk" "$INSTDIR\COPYING.TXT"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(UninstallLinkName).lnk" "$INSTDIR\Uninstall.exe"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(ChangeLogLinkName).lnk" "$INSTDIR\CHANGELOG.TXT"
-
-	; Registry
-	WriteRegStr HKLM "Software\mRemoteNG" "InstallPath" $INSTDIR
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "mRemoteNG"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "Publisher" "Next Generation Software"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 7080
-
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION}
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMinor" ${PRODUCT_VERSION_MINOR}
-
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "NoModify" 1
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "NoRepair" 1
-SectionEnd
-
-Section "un.Uninstall"
-	; Unregister ActiveX components
-	UnregDLL "$INSTDIR\eolwtscom.dll"
-
-	; Delete Files
-	RMDIR /r $INSTDIR
-
-	; Start Menu
-	SetShellVarContext all
-	RMDir /r "$SMPROGRAMS\mRemoteNG"
-	SetShellVarContext current
-	RMDir /r "$SMPROGRAMS\mRemoteNG"
-
-	; Registry
-	DeleteRegValue HKLM "Software\mRemoteNG" "InstallPath"
-	DeleteRegKey /ifempty HKLM "Software\mRemoteNG"
-	DeleteRegKey /ifempty HKCU "Software\mRemoteNG"
-	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG"
-SectionEnd

README.MD

@@ -0,0 +1,37 @@
+[![Twitter Follow](https://img.shields.io/twitter/follow/mRemoteNG.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=mRemoteNG)
+
+
+[![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat)
+
+[![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer)
+
+[![Build Status](http://ec2-52-39-111-114.us-west-2.compute.amazonaws.com:8080/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](http://ec2-52-39-111-114.us-west-2.compute.amazonaws.com:8080/job/mRemoteNG/job/mRemoteNG/job/develop/)
+[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](http://waffle.io/mRemoteNG/mRemoteNG)
+[![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.74/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.74)
+
+
+mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
+
+It allows you to store all your remote connections in a simple yet powerful interface.
+
+Currently these protocols are supported:
+
+ * RDP (Remote Desktop)
+ * VNC (Virtual Network Computing)
+ * ICA (Independent Computing Architecture)
+ * SSH (Secure Shell)
+ * Telnet (TELecommunication NETwork)
+ * HTTP/S (Hypertext Transfer Protocol)
+ * Rlogin (Rlogin)
+ * RAW
+
+mRemoteNG can be installed on Windows 7 or later.
+
+Windows 7 systems require RDP version 8:   
+https://support.microsoft.com/en-us/kb/2592687   
+OR   
+https://support.microsoft.com/en-us/kb/2923545   
+
+Windows 8+ support RDP version 8+ out of the box.
+
+RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).

Readme.txt

@@ -11,4 +11,15 @@ Currently these protocols are supported:
  * Telnet (TELecommunication NETwork)
  * HTTP/S (Hypertext Transfer Protocol)
  * Rlogin (Rlogin)
- * RAW
+ * RAW
+
+mRemoteNG can be installed on Windows 7 or later.
+
+Windows 7 systems require RDP version 8:   
+https://support.microsoft.com/en-us/kb/2592687   
+OR   
+https://support.microsoft.com/en-us/kb/2923545   
+
+Windows 8+ support RDP version 8+ out of the box.
+
+RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).

Tools/7zip/License.txt

@@ -0,0 +1,31 @@
+      7-Zip Extra
+      ~~~~~~~~~~~
+      License for use and distribution
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+      Copyright (C) 1999-2016 Igor Pavlov.
+
+      7-Zip Extra files are under the GNU LGPL license.
+
+      
+      Notes: 
+        You can use 7-Zip Extra on any computer, including a computer in a commercial 
+        organization. You don't need to register or pay for 7-Zip.
+
+
+      GNU LGPL information
+      --------------------
+
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public
+        License as published by the Free Software Foundation; either
+        version 2.1 of the License, or (at your option) any later version.
+
+        This library is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+        Lesser General Public License for more details.
+
+        You can receive a copy of the GNU Lesser General Public License from 
+        http://www.gnu.org/
+

Tools/7zip/history.txt

@@ -0,0 +1,77 @@
+7-Zip Extra history
+-------------------
+
+9.35 beta           2014-12-07
+------------------------------
+  - SFX modules were moved to LZMA SDK package.
+
+
+9.34 alpha          2014-06-22
+------------------------------
+  - Minimum supported system now is Windows 2000 for EXE and DLL files.
+  - all EXE and DLL files use msvcrt.dll.
+  - 7zr.exe now support AES encryption.
+
+
+9.18                2010-11-02
+------------------------------
+  - New small SFX module for installers.
+
+
+9.17                2010-10-04
+------------------------------
+  - New 7-Zip plugin for FAR Manager x64.
+
+
+9.10                2009-12-30
+------------------------------
+  - 7-Zip for installers now supports LZMA2.
+
+
+9.09                2009-12-12
+------------------------------
+  - LZMA2 compression method support.
+  - Some bugs were fixed.
+
+
+4.65                2009-02-03
+------------------------------
+  - Some bugs were fixed.
+
+
+4.38 beta           2006-04-13
+------------------------------
+  - SFX for installers now supports new properties in config file:
+    Progress, Directory, ExecuteFile, ExecuteParameters.
+
+
+4.34 beta           2006-02-27
+------------------------------
+  - ISetProperties::SetProperties:
+      it's possible to specify desirable number of CPU threads: 
+           PROPVARIANT: name=L"mt", vt = VT_UI4, ulVal = NumberOfThreads
+      If "mt" is not defined, 7za.dll will check number of processors in system to set 
+      number of desirable threads. 
+      Now 7za.dll can use:
+        2 threads for LZMA compressing
+        N threads for BZip2 compressing
+        4 threads for BZip2 decompressing
+      Other codecs use only one thread. 
+      Note: 7za.dll can use additional "small" threads with low CPU load.
+  - It's possible to call ISetProperties::SetProperties to specify "mt" property for decoder.
+
+
+4.33 beta           2006-02-05
+------------------------------
+  - Compressing speed and Memory requirements were increased.
+    Default dictionary size was increased: Fastest: 64 KB, Fast: 1 MB, 
+    Normal: 4 MB, Max: 16 MB, Ultra: 64 MB.
+  - 7z/LZMA now can use only these match finders: HC4, BT2, BT3, BT4
+
+
+4.27                2005-09-21
+------------------------------
+ - Some GUIDs/interfaces were changed.
+   IStream.h:
+     ISequentialInStream::Read now works as old ReadPart
+     ISequentialOutStream::Write now works as old WritePart

Tools/7zip/readme.txt

@@ -0,0 +1,124 @@
+7-Zip Extra 16.02
+-----------------
+
+7-Zip Extra is package of extra modules of 7-Zip. 
+
+7-Zip Copyright (C) 1999-2016 Igor Pavlov.
+
+7-Zip is free software. Read License.txt for more information about license.
+
+Source code of binaries can be found at:
+  http://www.7-zip.org/
+
+This package contains the following files:
+
+7za.exe     - standalone console version of 7-Zip with reduced formats support.
+7za.dll     - library for working with 7z archives
+7zxa.dll    - library for extracting from 7z archives
+License.txt - license information
+readme.txt  - this file
+
+Far\        - plugin for Far Manager
+x64\        - binaries for x64
+
+
+All 32-bit binaries can work in:
+  Windows 2000 / 2003 / 2008 / XP / Vista / 7 / 8 / 10
+  and  in any Windows x64 version with WoW64 support.
+All x64 binaries can work in any Windows x64 version. 
+
+All binaries use msvcrt.dll.
+
+7za.exe 
+-------
+
+7za.exe - is a standalone console version of 7-Zip with reduced formats support.
+
+  Extra: 7za.exe             : support for only some formats of 7-Zip.
+  7-Zip: 7z.exe with 7z.dll  : support for all formats of 7-Zip.
+
+7za.exe and 7z.exe from 7-Zip have same command line interface.
+7za.exe doesn't use external DLL files.
+
+You can read Help File (7-zip.chm) from 7-Zip package for description 
+of all commands and switches for 7za.exe and 7z.exe.
+
+7za.exe features:
+
+  - High compression ratio in 7z format
+  - Supported formats:
+      - Packing / unpacking: 7z, xz, ZIP, GZIP, BZIP2 and TAR 
+      - Unpacking only: Z, lzma, CAB.
+  - Highest compression ratio for ZIP and GZIP formats.
+  - Fast compression and decompression
+  - Strong AES-256 encryption in 7z and ZIP formats.
+
+Note: LZMA SDK contains 7zr.exe - more reduced version of 7za.exe.
+But you can use 7zr.exe as "public domain" code.
+
+
+
+DLL files
+---------
+
+7za.dll and 7zxa.dll are reduced versions of 7z.dll from 7-Zip.
+7za.dll and 7zxa.dll support only 7z format.
+Note: 7z.dll is main DLL file that works with all archive types in 7-Zip.
+
+7za.dll and 7zxa.dll support the following decoding methods:
+    - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES, BZip2, Deflate.
+
+7za.dll also supports 7z encoding with the following encoding methods:
+    - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES.
+
+7za.dll and 7zxa.dll work via COM interfaces.
+But these DLLs don't use standard COM interfaces for objects creating.
+
+Look also example code that calls DLL functions (in source code of 7-Zip):
+ 
+ 7zip\UI\Client7z
+
+Another example of binary that uses these interface is 7-Zip itself.
+The following binaries from 7-Zip use 7z.dll:
+  - 7z.exe (console version)
+  - 7zG.exe (GUI version)
+  - 7zFM.exe (7-Zip File Manager)
+
+Note: The source code of LZMA SDK also contains the code for similar DLLs
+(DLLs without BZip2, Deflate support). And these files from LZMA SDK can be 
+used as "public domain" code. If you use LZMA SDK files, you don't need to 
+follow GNU LGPL rules, if you want to change the code.
+
+
+
+
+License FAQ
+-----------
+
+Can I use the EXE or DLL files from 7-Zip in a commercial application?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Yes, but you are required to specify in documentation for your application:
+  (1) that you used parts of the 7-Zip program, 
+  (2) that 7-Zip is licensed under the GNU LGPL license and 
+  (3) you must give a link to www.7-zip.org, where the source code can be found.
+
+
+Can I use the source code of 7-Zip in a commercial application?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Since 7-Zip is licensed under the GNU LGPL you must follow the rules of that license. 
+In brief, it means that any LGPL'ed code must remain licensed under the LGPL. 
+For instance, you can change the code from 7-Zip or write a wrapper for some 
+code from 7-Zip and compile it into a DLL; but, the source code of that DLL 
+(including your modifications / additions / wrapper) must be licensed under 
+the LGPL or GPL. 
+Any other code in your application can be licensed as you wish. This scheme allows 
+users and developers to change LGPL'ed code and recompile that DLL. That is the 
+idea of free software. Read more here: http://www.gnu.org/. 
+
+
+
+Note: You can look also LZMA SDK, which is available under a more liberal license.
+
+
+---
+End of document

Tools/build-relport.cmd

@@ -0,0 +1,45 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+set SOLUTIONDIR=%~dp0..
+
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%SOLUTIONDIR%\Tools\sigcheck.exe"
+set SEVENZIP="%SOLUTIONDIR%\Tools\7zip\7za.exe"
+
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+call %VCVARSALL% x86
+
+IF NOT "%~1"=="build" goto skipbuild
+echo Building...
+"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" "%SOLUTIONDIR%\mRemoteV1.sln" /Rebuild "Release Portable"
+
+:skipbuild
+IF NOT EXIST "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe" echo Did you forget to build? && goto end
+set SIGCHECK=!SIGCHECK:"=^"!
+set SIGCHECK=!SIGCHECK: =^^ !
+set SIGCHECK=!SIGCHECK:(=^^(!
+set SIGCHECK=!SIGCHECK:)=^^)!
+for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   set PRODUCT_VERSION=%%i.%%j.%%k.%%l
+)
+echo Version is %PRODUCT_VERSION%
+
+set PORTABLEZIP="%SOLUTIONDIR%\Release\mRemoteNG-Portable-%PRODUCT_VERSION%.zip"
+
+rmdir /S /Q "%SOLUTIONDIR%\mRemoteV1\bin\package"
+mkdir "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\*.txt" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\Installer Projects\Installer\Dependencies\PuTTYNG.exe" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+xcopy /S /Y "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+echo Creating portable ZIP file...
+echo %PORTABLEZIP% 
+del /f /q %PORTABLEZIP% > nul 2>&1
+%SEVENZIP% a -bt -mx=9 -tzip -y -r %PORTABLEZIP% "%SOLUTIONDIR%\mRemoteV1\bin\package\*.*"
+%SEVENZIP% a -bt -mx=9 -tzip -y %PORTABLEZIP% "%SOLUTIONDIR%\*.TXT"
+
+:end

Tools/copy_release_installer.ps1

@@ -0,0 +1,16 @@
+$sourcePath = $args[0]
+$destinationDir = $args[1]
+
+Write-Host $sourcePath
+Write-Host $destinationDir
+
+if (!(Test-Path -Path $destinationDir))
+{
+    New-Item -Path $destinationDir -ItemType "directory"
+}
+
+$sourceFiles = Get-ChildItem -Path $sourcePath -Recurse | ?{$_.Extension -match "exe|msi"}
+foreach ($item in $sourceFiles)
+{
+    Copy-Item -Path $item.FullName -Destination $destinationDir -Force
+}

Tools/create_upg_chk_files.ps1

@@ -0,0 +1,12 @@
+#Requires -Version 4.0
+
+$file = gci ..\Release | sort LastWriteTime | select -last 1 | % { $_.FullName }
+
+$version = $file.tostring().Split("-")[2].trim(".zip")
+Write-Host Version: $version
+
+Write-Host dURL:
+Write-Host clURL:
+
+$hash = Get-FileHash -Algorithm MD5 $file | % { $_.Hash }
+Write-Host CertificateThumbprint: $hash

Tools/rename_installer_with_version.ps1

@@ -0,0 +1,25 @@
+$solutionDir = $args[0]
+$renameTarget = $solutionDir + "InstallerProjects\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
+
+Write-Host $solutionDir
+Write-Host $renameTarget
+
+$targetVersionedFile = "$solutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
+$version = &"$solutionDir\Tools\sigcheck.exe" /accepteula -q -n $targetVersionedFile
+
+
+$renameTargetFileObject = Get-Item -Path $renameTarget -ErrorAction SilentlyContinue
+if ($renameTargetFileObject)
+{
+    # Build the new file name
+    $oldFileName = $renameTargetFileObject.Name
+    $newFileName = $oldFileName -replace "$("\"+$renameTargetFileObject.Extension)",$("-"+$version+$renameTargetFileObject.Extension)
+    Write-Host $oldFileName
+    Write-Host $newFileName
+
+    # Delete any items that already exist with the new name (effectively an overwrite)
+    Remove-Item -Path "$($renameTargetFileObject.Directory.FullName)\$newFileName" -ErrorAction SilentlyContinue
+
+    # Rename file
+    Rename-Item -Path $renameTarget -NewName $newFileName -ErrorAction SilentlyContinue
+}

Tools/signfiles.ps1

@@ -0,0 +1,13 @@
+$timeserver = "http://timestamp.verisign.com/scripts/timstamp.dll"
+$certPath = "C:\mRemoteNG_code_signing_cert.pfx"
+$certPassword = (Get-Credential -Message "Enter the password for the certificate" -UserName "USERNAME NOT NEEDED").Password
+$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($certPath, $certPassword)
+$targetPath = $args[0]
+
+
+Write-Output "Getting files from path: $targetPath"
+$signableFiles = Get-ChildItem -Path $targetPath -Recurse | ?{$_.Extension -match "dll|exe|msi"}
+Write-Output "Signable files count: $($signableFiles.Count)"
+foreach ($file in $signableFiles) {
+    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
+}

mRemoteNGTests/BinaryFileTests.cs

@@ -0,0 +1,68 @@
+using NUnit.Framework;
+using System.IO;
+
+namespace mRemoteNGTests
+{
+    [TestFixture]
+    public class BinaryFileTests
+    {
+        [Test]
+        public void LargeAddressAwareFlagIsSet()
+        {
+            var exePath = GetTargetPath();
+            Assert.That(IsLargeAware(exePath), Is.True);
+        }
+
+        static string GetTargetPath([System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "")
+        {
+            string debugOrRelease = "";
+            string normalOrPortable = "";
+#if DEBUG
+            debugOrRelease = "Debug";
+#else
+            debugOrRelease = "Release";
+#endif
+#if PORTABLE
+            normalOrPortable = " Portable";
+#else
+            normalOrPortable = "";
+#endif
+            var path = Path.GetDirectoryName(sourceFilePath);
+            string FilePath = $"{path}\\..\\mRemoteV1\\bin\\{debugOrRelease}{normalOrPortable}\\mRemoteNG.exe";
+            return FilePath;
+        }
+
+        static bool IsLargeAware(string file)
+        {
+            using (var fs = File.OpenRead(file))
+            {
+                return IsLargeAware(fs);
+            }
+        }
+        /// <summary>
+        /// Checks if the stream is a MZ header and if it is large address aware
+        /// </summary>
+        /// <param name="stream">Stream to check, make sure its at the start of the MZ header</param>
+        /// <exception cref=""></exception>
+        /// <returns></returns>
+        static bool IsLargeAware(Stream stream)
+        {
+            const int IMAGE_FILE_LARGE_ADDRESS_AWARE = 0x20;
+
+            var br = new BinaryReader(stream);
+
+            if (br.ReadInt16() != 0x5A4D)       //No MZ Header
+                return false;
+
+            br.BaseStream.Position = 0x3C;
+            var peloc = br.ReadInt32();         //Get the PE header location.
+
+            br.BaseStream.Position = peloc;
+            if (br.ReadInt32() != 0x4550)       //No PE header
+                return false;
+
+            br.BaseStream.Position += 0x12;
+            return (br.ReadInt16() & IMAGE_FILE_LARGE_ADDRESS_AWARE) == IMAGE_FILE_LARGE_ADDRESS_AWARE;
+        }
+    }
+}

mRemoteNGTests/Config/Connections/SqlConnectionUpdateCheckerTests.cs

@@ -1,27 +0,0 @@
-using System;
-using NUnit.Framework;
-using mRemoteNG.Config;
-using mRemoteNG.Config.Connections;
-using NSubstitute;
-
-namespace mRemoteNGTests.Config.Connections
-{
-    [TestFixture]
-    public class SqlConnectionUpdateCheckerTests
-    {
-        SqlConnectionsUpdateChecker _updateChecker;
-
-        [SetUp]
-        public void Setup()
-        {
-            _updateChecker = new SqlConnectionsUpdateChecker();
-        }
-
-        [TearDown]
-        public void Teardown()
-        {
-            _updateChecker.Dispose();
-            _updateChecker = null;
-        }
-    }
-}

mRemoteNGTests/Config/Connections/SqlUpdateQueryBuilderTest.cs

@@ -1,32 +0,0 @@
-using System;
-using NUnit.Framework;
-using mRemoteNG.Config.Connections;
-using System.Data.SqlClient;
-
-namespace mRemoteNGTests.Config.Connections
-{
-    [TestFixture]
-    public class SqlUpdateQueryBuilderTest
-    {
-        private SqlUpdateQueryBuilder _sqlUpdateQueryBuilder;
-
-        [SetUp]
-        public void Setup()
-        {
-            _sqlUpdateQueryBuilder = new SqlUpdateQueryBuilder();
-        }
-
-        [TearDown]
-        public void Teardown()
-        {
-            _sqlUpdateQueryBuilder = null;
-        }
-
-        [Test]
-        public void SqlUpdateQueryBuilderReturnsSomeCommand()
-        {
-            SqlCommand command = _sqlUpdateQueryBuilder.BuildCommand();
-            Assert.AreNotEqual(command.CommandText, "");
-        }
-    }
-}

mRemoteNGTests/Config/Connections/SqlUpdateTimerTests.cs

@@ -1,40 +0,0 @@
-using mRemoteNG.Config.Connections;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.Config.Connections
-{
-    [TestFixture]
-    public class SqlUpdateTimerTests
-    {
-        private SqlUpdateTimer sqlUpdateChecker;
-
-        [SetUp]
-        public void SetupSqlUpdateChecker()
-        {
-            sqlUpdateChecker = new SqlUpdateTimer();
-        }
-
-        [TearDown]
-        public void TearDownSqlUpdateChecker()
-        {
-            sqlUpdateChecker.Dispose();
-            sqlUpdateChecker = null;
-        }
-
-        [Test]
-        public void EnableSQLUpdating()
-        {
-            sqlUpdateChecker.Enable();
-            Assert.AreEqual(true, sqlUpdateChecker.IsUpdateCheckingEnabled());
-        }
-
-        [Test]
-        public void DisableSQLUpdating()
-        {
-            sqlUpdateChecker.Enable();
-            Assert.AreEqual(true, sqlUpdateChecker.IsUpdateCheckingEnabled());
-            sqlUpdateChecker.Disable();
-            Assert.AreEqual(false, sqlUpdateChecker.IsUpdateCheckingEnabled());
-        }
-    }
-}

mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs

@@ -0,0 +1,128 @@
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class DataTableSerializerTests
+    {
+        private DataTableSerializer _dataTableSerializer;
+        private SaveFilter _saveFilter;
+
+        [SetUp]
+        public void Setup()
+        {
+            _saveFilter = new SaveFilter();
+            _dataTableSerializer = new DataTableSerializer(_saveFilter);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _saveFilter = null;
+            _dataTableSerializer = null;
+        }
+
+        [Test]
+        public void AllItemsSerialized()
+        {
+            var model = CreateConnectionTreeModel();
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows.Count, Is.EqualTo(3));
+        }
+
+        [Test]
+        public void UsernameSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveUsername = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Username"], Is.Not.EqualTo(""));
+        }
+
+        [Test]
+        public void DomainSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveDomain = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["DomainName"], Is.Not.EqualTo(""));
+        }
+
+        [Test]
+        public void PasswordSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SavePassword = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Password"], Is.Not.EqualTo(""));
+        }
+
+        [Test]
+        public void InheritanceSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveInheritance = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["InheritUsername"], Is.Not.EqualTo(""));
+        }
+
+
+
+        [Test]
+        public void UsernameNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveUsername = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Username"], Is.EqualTo(""));
+        }
+
+        [Test]
+        public void DomainNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveDomain = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["DomainName"], Is.EqualTo(""));
+        }
+
+        [Test]
+        public void PasswordNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SavePassword = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Password"], Is.EqualTo(""));
+        }
+
+        [Test]
+        public void InheritanceNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveInheritance = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["InheritUsername"], Is.False);
+        }
+
+
+        private ConnectionTreeModel CreateConnectionTreeModel()
+        {
+            var model = new ConnectionTreeModel();
+            var root = new RootNodeInfo(RootNodeType.Connection);
+            var folder1 = new ContainerInfo {Name = "folder1", Username = "user1", Domain = "domain1", Password = "password1"};
+            var con1 = new ConnectionInfo {Name = "Con1", Username = "user1", Domain = "domain1", Password = "password1" };
+            var con2 = new ConnectionInfo {Name = "Con2", Username = "user2", Domain = "domain2", Password = "password2" };
+
+            root.AddChild(folder1);
+            root.AddChild(con2);
+            folder1.AddChild(con1);
+            model.AddRootNode(root);
+            return model;
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/PortScanDeserializerTests.cs

@@ -0,0 +1,61 @@
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Tools;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class PortScanDeserializerTests
+    {
+        private PortScanDeserializer _deserializer;
+        private ConnectionInfo _importedConnectionInfo;
+        private const string ExpectedHostName = "server1.domain.com";
+        private const string ExpectedDisplayName = "server1";
+        private const ProtocolType ExpectedProtocolType = ProtocolType.SSH2;
+
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            var host = new ScanHost("10.20.30.40")
+            {
+                HostName = "server1.domain.com",
+                SSH = true
+            };
+            _deserializer = new PortScanDeserializer(new [] {host}, ProtocolType.SSH2);
+            _deserializer.Deserialize();
+            var connectionTreeModel = _deserializer.Deserialize();
+            var root = connectionTreeModel.RootNodes.First();
+            _importedConnectionInfo = root.Children.First();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+            _importedConnectionInfo = null;
+        }
+
+        [Test]
+        public void DisplayNameImported()
+        {
+            Assert.That(_importedConnectionInfo.Name, Is.EqualTo(ExpectedDisplayName));
+        }
+
+        [Test]
+        public void HostNameImported()
+        {
+            Assert.That(_importedConnectionInfo.Hostname, Is.EqualTo(ExpectedHostName));
+        }
+
+        [Test]
+        public void ProtocolImported()
+        {
+            Assert.That(_importedConnectionInfo.Protocol, Is.EqualTo(ExpectedProtocolType));
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/PuttyConnectionManagerDeserializerTests.cs

@@ -0,0 +1,112 @@
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Container;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class PuttyConnectionManagerDeserializerTests
+    {
+        private PuttyConnectionManagerDeserializer _deserializer;
+        private ContainerInfo _rootImportedFolder;
+        private const string ExpectedRootFolderName = "test_puttyConnectionManager_database";
+        private const string ExpectedConnectionDisplayName = "my ssh connection";
+        private const string ExpectedConnectionHostname = "server1.mydomain.com";
+        private const string ExpectedConnectionDescription = "My Description Here";
+        private const int ExpectedConnectionPort = 22;
+        private const ProtocolType ExpectedProtocolType = ProtocolType.SSH2;
+        private const string ExpectedPuttySession = "MyCustomPuttySession";
+        private const string ExpectedConnectionUsername = "mysshusername";
+        private const string ExpectedConnectionPassword = "password123";
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            var fileContents = Resources.test_puttyConnectionManager_database;
+            _deserializer = new PuttyConnectionManagerDeserializer(fileContents);
+            var connectionTreeModel = _deserializer.Deserialize();
+            var rootNode = connectionTreeModel.RootNodes.First();
+            _rootImportedFolder = rootNode.Children.Cast<ContainerInfo>().First();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+            _rootImportedFolder = null;
+        }
+
+        [Test]
+        public void RootFolderImportedWithCorrectName()
+        {
+            Assert.That(_rootImportedFolder.Name, Is.EqualTo(ExpectedRootFolderName));
+        }
+
+        [Test]
+        public void ConnectionDisplayNameImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Name, Is.EqualTo(ExpectedConnectionDisplayName));
+        }
+
+        [Test]
+        public void ConnectionHostNameImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Hostname, Is.EqualTo(ExpectedConnectionHostname));
+        }
+
+        [Test]
+        public void ConnectionDescriptionImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Description, Is.EqualTo(ExpectedConnectionDescription));
+        }
+
+        [Test]
+        public void ConnectionPortImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Port, Is.EqualTo(ExpectedConnectionPort));
+        }
+
+        [Test]
+        public void ConnectionProtocolTypeImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Protocol, Is.EqualTo(ExpectedProtocolType));
+        }
+
+        [Test]
+        public void ConnectionPuttySessionImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.PuttySession, Is.EqualTo(ExpectedPuttySession));
+        }
+
+        [Test]
+        public void ConnectionUsernameImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Username, Is.EqualTo(ExpectedConnectionUsername));
+        }
+
+        [Test]
+        public void ConnectionPasswordImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Password, Is.EqualTo(ExpectedConnectionPassword));
+        }
+
+        private ConnectionInfo GetSshConnection()
+        {
+            var sshFolder = _rootImportedFolder.Children.OfType<ContainerInfo>().First(node => node.Name == "SSHFolder");
+            return sshFolder.Children.First();
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionDeserializerTests.cs

@@ -0,0 +1,185 @@
+using System;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Tree;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class RemoteDesktopConnectionDeserializerTests
+    {
+        // .rdp file schema: https://technet.microsoft.com/en-us/library/ff393699(v=ws.10).aspx
+        private string[] _connectionFileContents;
+        private RemoteDesktopConnectionDeserializer _deserializer;
+        private ConnectionTreeModel _connectionTreeModel;
+        private const string ExpectedHostname = "testhostname.domain.com";
+        private const string ExpectedUserName = "myusernamehere";
+        private const string ExpectedDomain = "myspecialdomain";
+        private const string ExpectedGatewayHostname = "gatewayhostname.domain.com";
+        private const int ExpectedPort = 9933;
+        private const ProtocolRDP.RDPColors ExpectedColors = ProtocolRDP.RDPColors.Colors24Bit;
+        private const bool ExpectedBitmapCaching = false;
+        private const ProtocolRDP.RDPResolutions ExpectedResolutionMode = ProtocolRDP.RDPResolutions.FitToWindow;
+        private const bool ExpectedWallpaperDisplay = true;
+        private const bool ExpectedThemesDisplay = true;
+        private const bool ExpectedFontSmoothing = true;
+        private const bool ExpectedDesktopComposition = true;
+        private const bool ExpectedSmartcardRedirection = true;
+        private const bool ExpectedDriveRedirection = true;
+        private const bool ExpectedPortRedirection = true;
+        private const bool ExpectedPrinterRedirection = true;
+        private const ProtocolRDP.RDPSounds ExpectedSoundRedirection = ProtocolRDP.RDPSounds.BringToThisComputer;
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            _connectionFileContents = Resources.test_remotedesktopconnection_rdp.Split(Environment.NewLine.ToCharArray());
+            _deserializer = new RemoteDesktopConnectionDeserializer(_connectionFileContents);
+            _connectionTreeModel = _deserializer.Deserialize();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+        }
+
+        [Test]
+        public void ConnectionTreeModelHasARootNode()
+        {
+            var numberOfRootNodes = _connectionTreeModel.RootNodes.Count;
+            Assert.That(numberOfRootNodes, Is.GreaterThan(0));
+        }
+
+        [Test]
+        public void RootNodeHasConnectionInfo()
+        {
+            var rootNodeContents = _connectionTreeModel.RootNodes.First().Children.OfType<ConnectionInfo>();
+            Assert.That(rootNodeContents, Is.Not.Empty);
+        }
+
+        [Test]
+        public void HostnameImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Hostname, Is.EqualTo(ExpectedHostname));
+        }
+
+        [Test]
+        public void PortImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Port, Is.EqualTo(ExpectedPort));
+        }
+
+        [Test]
+        public void UsernameImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Username, Is.EqualTo(ExpectedUserName));
+        }
+
+        [Test]
+        public void DomainImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Domain, Is.EqualTo(ExpectedDomain));
+        }
+
+        [Test]
+        public void RdpColorsImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Colors, Is.EqualTo(ExpectedColors));
+        }
+
+        [Test]
+        public void BitmapCachingImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.CacheBitmaps, Is.EqualTo(ExpectedBitmapCaching));
+        }
+
+        [Test]
+        public void ResolutionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Resolution, Is.EqualTo(ExpectedResolutionMode));
+        }
+
+        [Test]
+        public void DisplayWallpaperImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.DisplayWallpaper, Is.EqualTo(ExpectedWallpaperDisplay));
+        }
+
+        [Test]
+        public void DisplayThemesImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.DisplayThemes, Is.EqualTo(ExpectedThemesDisplay));
+        }
+
+        [Test]
+        public void FontSmoothingImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.EnableFontSmoothing, Is.EqualTo(ExpectedFontSmoothing));
+        }
+
+        [Test]
+        public void DesktopCompositionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.EnableDesktopComposition, Is.EqualTo(ExpectedDesktopComposition));
+        }
+
+        [Test]
+        public void SmartcardRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectSmartCards, Is.EqualTo(ExpectedSmartcardRedirection));
+        }
+
+        [Test]
+        public void DriveRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectDiskDrives, Is.EqualTo(ExpectedDriveRedirection));
+        }
+
+        [Test]
+        public void PortRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectPorts, Is.EqualTo(ExpectedPortRedirection));
+        }
+
+        [Test]
+        public void PrinterRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectPrinters, Is.EqualTo(ExpectedPrinterRedirection));
+        }
+
+        [Test]
+        public void SoundRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectSound, Is.EqualTo(ExpectedSoundRedirection));
+        }
+
+        //[Test]
+        //public void GatewayHostnameImportedCorrectly()
+        //{
+        //    var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+        //    Assert.That(connectionInfo.RDGatewayHostname, Is.EqualTo(_expectedGatewayHostname));
+        //}
+    }
+}

mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionManagerDeserializerTests.cs

@@ -0,0 +1,335 @@
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Container;
+using mRemoteNG.Tree;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+using System.IO;
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class RemoteDesktopConnectionManagerDeserializerTests
+    {
+        private string _connectionFileContents;
+        private RemoteDesktopConnectionManagerDeserializer _deserializer;
+        private ConnectionTreeModel _connectionTreeModel;
+        private const string ExpectedName = "server1_displayname";
+        private const string ExpectedHostname = "server1";
+        private const string ExpectedDescription = "Comment text here";
+        private const string ExpectedUsername = "myusername1";
+        private const string ExpectedDomain = "mydomain";
+        private const string ExpectedPassword = "passwordHere!";
+        private const bool ExpectedUseConsoleSession = true;
+        private const int ExpectedPort = 9933;
+        private const ProtocolRDP.RDGatewayUsageMethod ExpectedGatewayUsageMethod = ProtocolRDP.RDGatewayUsageMethod.Always;
+        private const string ExpectedGatewayHostname = "gatewayserverhost.innerdomain.net";
+        private const string ExpectedGatewayUsername = "gatewayusername";
+        private const string ExpectedGatewayDomain = "innerdomain";
+        private const string ExpectedGatewayPassword = "gatewayPassword123";
+        private const ProtocolRDP.RDPResolutions ExpectedRdpResolution = ProtocolRDP.RDPResolutions.FitToWindow;
+        private const ProtocolRDP.RDPColors ExpectedRdpColorDepth = ProtocolRDP.RDPColors.Colors24Bit;
+        private const ProtocolRDP.RDPSounds ExpectedAudioRedirection = ProtocolRDP.RDPSounds.DoNotPlay;
+        private const bool ExpectedKeyRedirection = true;
+        private const bool ExpectedSmartcardRedirection = true;
+        private const bool ExpectedDriveRedirection = true;
+        private const bool ExpectedPortRedirection = true;
+        private const bool ExpectedPrinterRedirection = true;
+        private const ProtocolRDP.AuthenticationLevel ExpectedAuthLevel = ProtocolRDP.AuthenticationLevel.AuthRequired;
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            _connectionFileContents = Resources.test_rdcman_v2_2_schema1;
+            _deserializer = new RemoteDesktopConnectionManagerDeserializer(_connectionFileContents);
+            _connectionTreeModel = _deserializer.Deserialize();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+        }
+
+        [Test]
+        public void ConnectionTreeModelHasARootNode()
+        {
+            var numberOfRootNodes = _connectionTreeModel.RootNodes.Count;
+            Assert.That(numberOfRootNodes, Is.GreaterThan(0));
+        }
+
+        [Test]
+        public void RootNodeHasContents()
+        {
+            var rootNodeContents = _connectionTreeModel.RootNodes.First().Children;
+            Assert.That(rootNodeContents, Is.Not.Empty);
+        }
+
+        [Test]
+        public void AllSubRootFoldersImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var rootNodeContents = importedRdcmanRootNode.Children.Count(node => node.Name == "Group1" || node.Name == "Group2");
+            Assert.That(rootNodeContents, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void ConnectionDisplayNameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Name, Is.EqualTo(ExpectedName));
+        }
+
+        [Test]
+        public void ConnectionHostnameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Hostname, Is.EqualTo(ExpectedHostname));
+        }
+
+        [Test]
+        public void ConnectionDescriptionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Description, Is.EqualTo(ExpectedDescription));
+        }
+
+        [Test]
+        public void ConnectionUsernameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Username, Is.EqualTo(ExpectedUsername));
+        }
+
+        [Test]
+        public void ConnectionDomainImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Domain, Is.EqualTo(ExpectedDomain));
+        }
+
+        // Since password is encrypted with a machine key, cant test decryption on another machine
+        //[Test]
+        //public void ConnectionPasswordImported()
+        //{
+        //    var rootNode = _connectionTreeModel.RootNodes.First();
+        //    var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+        //    var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+        //    var connection = group1.Children.First();
+        //    Assert.That(connection.Password, Is.EqualTo(ExpectedPassword));
+        //}
+
+        [Test]
+        public void ConnectionProtocolSetToRdp()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Protocol, Is.EqualTo(ProtocolType.RDP));
+        }
+
+        [Test]
+        public void ConnectionUseConsoleSessionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.UseConsoleSession, Is.EqualTo(ExpectedUseConsoleSession));
+        }
+
+        [Test]
+        public void ConnectionPortImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Port, Is.EqualTo(ExpectedPort));
+        }
+
+        [Test]
+        public void ConnectionGatewayUsageMethodImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayUsageMethod, Is.EqualTo(ExpectedGatewayUsageMethod));
+        }
+
+        [Test]
+        public void ConnectionGatewayHostnameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayHostname, Is.EqualTo(ExpectedGatewayHostname));
+        }
+
+        [Test]
+        public void ConnectionGatewayUsernameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayUsername, Is.EqualTo(ExpectedGatewayUsername));
+        }
+
+        // Since password is encrypted with a machine key, cant test decryption on another machine
+        //[Test]
+        //public void ConnectionGatewayPasswordImported()
+        //{
+        //    var rootNode = _connectionTreeModel.RootNodes.First();
+        //    var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+        //    var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+        //    var connection = group1.Children.First();
+        //    Assert.That(connection.RDGatewayPassword, Is.EqualTo(ExpectedGatewayPassword));
+        //}
+
+        [Test]
+        public void ConnectionGatewayDomainImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayDomain, Is.EqualTo(ExpectedGatewayDomain));
+        }
+
+        [Test]
+        public void ConnectionResolutionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Resolution, Is.EqualTo(ExpectedRdpResolution));
+        }
+
+        [Test]
+        public void ConnectionColorDepthImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Colors, Is.EqualTo(ExpectedRdpColorDepth));
+        }
+
+        [Test]
+        public void ConnectionAudioRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectSound, Is.EqualTo(ExpectedAudioRedirection));
+        }
+
+        [Test]
+        public void ConnectionKeyRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectKeys, Is.EqualTo(ExpectedKeyRedirection));
+        }
+
+        [Test]
+        public void ConnectionDriveRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectDiskDrives, Is.EqualTo(ExpectedDriveRedirection));
+        }
+
+        [Test]
+        public void ConnectionPortRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectPorts, Is.EqualTo(ExpectedPortRedirection));
+        }
+
+        [Test]
+        public void ConnectionPrinterRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectPrinters, Is.EqualTo(ExpectedPrinterRedirection));
+        }
+
+        [Test]
+        public void ConnectionSmartcardRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectSmartCards, Is.EqualTo(ExpectedSmartcardRedirection));
+        }
+
+        [Test]
+        public void ConnectionauthenticationLevelImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDPAuthenticationLevel, Is.EqualTo(ExpectedAuthLevel));
+        }
+
+        [Test]
+        public void ExceptionThrownOnBadSchemaVersion()
+        {
+            var badFileContents = Resources.test_rdcman_v2_2_badschemaversion;
+            var deserializer = new RemoteDesktopConnectionManagerDeserializer(badFileContents);
+            Assert.That(() => deserializer.Deserialize(), Throws.TypeOf<FileFormatException>());
+        }
+
+        [Test]
+        public void ExceptionThrownOnUnsupportedVersion()
+        {
+            var badFileContents = Resources.test_rdcman_badVersionNumber;
+            var deserializer = new RemoteDesktopConnectionManagerDeserializer(badFileContents);
+            Assert.That(() => deserializer.Deserialize(), Throws.TypeOf<FileFormatException>());
+        }
+
+        [Test]
+        public void ExceptionThrownOnNoVersion()
+        {
+            var badFileContents = Resources.test_rdcman_noversion;
+            var deserializer = new RemoteDesktopConnectionManagerDeserializer(badFileContents);
+            Assert.That(() => deserializer.Deserialize(), Throws.TypeOf<FileFormatException>());
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializerTests.cs

@@ -0,0 +1,255 @@
+using System.Collections;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionNodeSerializerTests
+    {
+        private XmlConnectionNodeSerializer _connectionNodeSerializer;
+
+        [SetUp]
+        public void Setup()
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(
+                BlockCipherEngines.AES, BlockCipherModes.GCM);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(cryptoProvider, "myPassword1".ConvertToSecureString());
+        }
+
+        [Test]
+        public void ReturnsXElement()
+        {
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(new ConnectionInfo());
+            Assert.That(returnVal, Is.TypeOf<XElement>());
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.AttributesAndExpectedValues))]
+        public void XmlElementContainsSerializedAttribute(string attributeName, string expectedValue, ConnectionInfo connectionInfo)
+        {
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.EqualTo(expectedValue));
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.PasswordAttributes))]
+        public void PasswordFieldsAreSerialized(string attributeName, ConnectionInfo connectionInfo)
+        {
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.Not.Empty);
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.SaveFilterTests))]
+        public void AttributesNotSerializedWhenFiltered(string attributeName, ConnectionInfo connectionInfo)
+        {
+            var saveFilter = new SaveFilter(true);
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(cryptoProvider, "myPassword1".ConvertToSecureString(), saveFilter);
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.EqualTo(string.Empty));
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.InheritanceFilterTests))]
+        public void InheritanceNotSerialiedWhenFiltered(string attributeName, ConnectionInfo connectionInfo)
+        {
+            var saveFilter = new SaveFilter(true);
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(cryptoProvider, "myPassword1".ConvertToSecureString(), saveFilter);
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.EqualTo(false.ToString()));
+        }
+
+        private class TestCaseDataSource
+        {
+            private static readonly ConnectionInfo ConnectionInfo = new ConnectionInfo
+            {
+                Name = "HeresACustomName",
+                Description = "myDescription",
+                Username = "myuser",
+                Domain = "superdomain",
+                Password = "pass",
+                Hostname = "somehost",
+                ExtApp = "myextapp",
+                PreExtApp = "preext1",
+                PostExtApp = "postext1",
+                MacAddress = "asdf-asdf-asdf-asdf23423",
+                LoadBalanceInfo = "loadbalanceinfohere",
+                RDGatewayUsername = "gatewayuser",
+                RDGatewayDomain = "somegatewaydomain",
+                RDGatewayHostname = "somegatewayhost",
+                RDGatewayPassword = "gatewaypass",
+                UserField = "userfield data here",
+                VNCProxyIP = "192.168.1.1",
+                VNCProxyUsername = "vncproxyuser",
+                VNCProxyPassword = "vncproxypass",
+            };
+
+            private static readonly ConnectionInfo ConnectionInfoWithInheritance = new ConnectionInfo
+            {
+                Inheritance = {EverythingInherited = true}
+            };
+
+            private static readonly ContainerInfo ContainerInfo = new ContainerInfo();
+
+            public static IEnumerable SaveFilterTests
+            {
+                get
+                {
+                    yield return new TestCaseData("Username", ConnectionInfo);
+                    yield return new TestCaseData("Domain", ConnectionInfo);
+                    yield return new TestCaseData("Password", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUsername", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayDomain", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayPassword", ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyUsername", ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyPassword", ConnectionInfo);
+                }
+            }
+
+            public static IEnumerable InheritanceFilterTests
+            {
+                get
+                {
+                    yield return new TestCaseData("InheritUsername", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritDomain", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritPassword", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritRDGatewayUsername", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritRDGatewayDomain", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritRDGatewayPassword", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritVNCProxyUsername", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritVNCProxyPassword", ConnectionInfoWithInheritance);
+                }
+            }
+
+            public static IEnumerable PasswordAttributes
+            {
+                get
+                {
+                    yield return new TestCaseData("Password", ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyPassword", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayPassword", ConnectionInfo);
+                }
+            }
+
+            public static IEnumerable AttributesAndExpectedValues
+            {
+                get
+                {
+                    yield return new TestCaseData("Name", ConnectionInfo.Name, ConnectionInfo);
+                    yield return new TestCaseData("Type", "Connection", ConnectionInfo);
+                    yield return new TestCaseData("Type", "Container", ContainerInfo);
+                    yield return new TestCaseData("Expanded", ContainerInfo.IsExpanded.ToString(), ContainerInfo);
+                    yield return new TestCaseData("Descr", ConnectionInfo.Description, ConnectionInfo);
+                    yield return new TestCaseData("Icon", ConnectionInfo.Icon, ConnectionInfo);
+                    yield return new TestCaseData("Panel", "General", ConnectionInfo);
+                    yield return new TestCaseData("Username", ConnectionInfo.Username, ConnectionInfo);
+                    yield return new TestCaseData("Domain", ConnectionInfo.Domain, ConnectionInfo);
+                    yield return new TestCaseData("Hostname", ConnectionInfo.Hostname, ConnectionInfo);
+                    yield return new TestCaseData("Protocol", "RDP", ConnectionInfo);
+                    yield return new TestCaseData("PuttySession", ConnectionInfo.PuttySession, ConnectionInfo);
+                    yield return new TestCaseData("Port", ConnectionInfo.Port.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("ConnectToConsole", ConnectionInfo.UseConsoleSession.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("UseCredSsp", ConnectionInfo.UseCredSsp.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RenderingEngine", ConnectionInfo.RenderingEngine.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("ICAEncryptionStrength", ConnectionInfo.ICAEncryptionStrength.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDPAuthenticationLevel", ConnectionInfo.RDPAuthenticationLevel.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("LoadBalanceInfo", ConnectionInfo.LoadBalanceInfo, ConnectionInfo);
+                    yield return new TestCaseData("Colors", ConnectionInfo.Colors.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("Resolution", ConnectionInfo.Resolution.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("AutomaticResize", ConnectionInfo.AutomaticResize.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("DisplayWallpaper", ConnectionInfo.DisplayWallpaper.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("DisplayThemes", ConnectionInfo.DisplayThemes.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("EnableFontSmoothing", ConnectionInfo.EnableFontSmoothing.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("EnableDesktopComposition", ConnectionInfo.EnableDesktopComposition.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("CacheBitmaps", ConnectionInfo.CacheBitmaps.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectDiskDrives", ConnectionInfo.RedirectDiskDrives.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectPorts", ConnectionInfo.RedirectPorts.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectPrinters", ConnectionInfo.RedirectPrinters.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectSmartCards", ConnectionInfo.RedirectSmartCards.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectSound", ConnectionInfo.RedirectSound.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectKeys", ConnectionInfo.RedirectKeys.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("Connected", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("PreExtApp", ConnectionInfo.PreExtApp, ConnectionInfo);
+                    yield return new TestCaseData("PostExtApp", ConnectionInfo.PostExtApp, ConnectionInfo);
+                    yield return new TestCaseData("MacAddress", ConnectionInfo.MacAddress, ConnectionInfo);
+                    yield return new TestCaseData("UserField", ConnectionInfo.UserField, ConnectionInfo);
+                    yield return new TestCaseData("ExtApp", ConnectionInfo.ExtApp, ConnectionInfo);
+                    yield return new TestCaseData("VNCCompression", ConnectionInfo.VNCCompression.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCEncoding", ConnectionInfo.VNCEncoding.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCAuthMode", ConnectionInfo.VNCAuthMode.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyType", ConnectionInfo.VNCProxyType.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyIP", ConnectionInfo.VNCProxyIP, ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyPort", ConnectionInfo.VNCProxyPort.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyUsername", ConnectionInfo.VNCProxyUsername, ConnectionInfo);
+                    yield return new TestCaseData("VNCColors", ConnectionInfo.VNCColors.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCSmartSizeMode", ConnectionInfo.VNCSmartSizeMode.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCViewOnly", ConnectionInfo.VNCViewOnly.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUsageMethod", ConnectionInfo.RDGatewayUsageMethod.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayHostname", ConnectionInfo.RDGatewayHostname, ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUseConnectionCredentials", ConnectionInfo.RDGatewayUseConnectionCredentials.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUsername", ConnectionInfo.RDGatewayUsername, ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayDomain", ConnectionInfo.RDGatewayDomain, ConnectionInfo);
+                    yield return new TestCaseData("InheritCacheBitmaps", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritColors", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDescription", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDisplayThemes", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDisplayWallpaper", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritEnableFontSmoothing", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritEnableDesktopComposition", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDomain", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritIcon", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPanel", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPassword", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPort", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritProtocol", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPuttySession", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectDiskDrives", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectKeys", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectPorts", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectPrinters", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectSmartCards", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectSound", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritSoundQuality", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritResolution", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritAutomaticResize", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUseConsoleSession", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUseCredSsp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRenderingEngine", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUsername", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritICAEncryptionStrength", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDPAuthenticationLevel", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritLoadBalanceInfo", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPreExtApp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPostExtApp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritMacAddress", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUserField", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritExtApp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCCompression", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCEncoding", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCAuthMode", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyType", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyIP", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyPort", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyUsername", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyPassword", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCColors", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCSmartSizeMode", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCViewOnly", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayUsageMethod", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayHostname", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayUseConnectionCredentials", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayUsername", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayPassword", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayDomain", false.ToString(), ConnectionInfo);
+                }
+            }
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsDeserializerTests.cs

@@ -0,0 +1,157 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsDeserializerTests
+    {
+        private XmlConnectionsDeserializer _xmlConnectionsDeserializer;
+        private ConnectionTreeModel _connectionTreeModel;
+
+        public void Setup(string confCons, string password)
+        {
+            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(confCons)
+            {
+                AuthenticationRequestor = password.ConvertToSecureString
+            };
+            _connectionTreeModel = _xmlConnectionsDeserializer.Deserialize();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _xmlConnectionsDeserializer = null;
+            _connectionTreeModel = null;
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void DeserializingCreatesRootNode(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            Assert.That(_connectionTreeModel.RootNodes, Is.Not.Empty);
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void RootNodeHasThreeChildren(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            Assert.That(connectionRoot.Children.Count, Is.EqualTo(3));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void RootContainsFolder1(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            Assert.That(ContainsNodeNamed("Folder1", connectionRoot.Children), Is.True);
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder1ContainsThreeConnections(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder1 = GetFolderNamed("Folder1", connectionRoot.Children);
+            var folder1ConnectionCount = folder1?.Children.Count(node => !(node is ContainerInfo));
+            Assert.That(folder1ConnectionCount, Is.EqualTo(3));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder2ContainsThreeNodes(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder1Count = folder2?.Children.Count();
+            Assert.That(folder1Count, Is.EqualTo(3));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder21HasTwoNodes(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder21 = GetFolderNamed("Folder2.1", folder2.Children);
+            Assert.That(folder21.Children.Count, Is.EqualTo(2));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder211HasOneConnection(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder21 = GetFolderNamed("Folder2.1", folder2.Children);
+            var folder211 = GetFolderNamed("Folder2.1.1", folder21.Children);
+            var connectionCount = folder211.Children.Count(node => !(node is ContainerInfo));
+            Assert.That(connectionCount, Is.EqualTo(1));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder22InheritsUsername(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder22 = GetFolderNamed("Folder2.2", folder2.Children);
+            Assert.That(folder22.Inheritance.Username, Is.True);
+        }
+
+        private bool ContainsNodeNamed(string name, IEnumerable<ConnectionInfo> list)
+        {
+            return list.Any(node => node.Name == name);
+        }
+
+        private ContainerInfo GetFolderNamed(string name, IEnumerable<ConnectionInfo> list)
+        {
+            var folder = list.First(node => (node is ContainerInfo && node.Name == name)) as ContainerInfo;
+            return folder;
+        }
+    }
+
+    public class XmlConnectionsDeserializerFixtureData
+    {
+        public static IEnumerable FixtureParams
+        {
+            get
+            {
+                yield return new TestCaseData(new Datagram("confCons v2.5", Resources.confCons_v2_5, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.6", Resources.confCons_v2_6, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 5k Iterations", Resources.confCons_v2_6_5k_iterations, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 fullencryption", Resources.confCons_v2_6_fullencryption, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 custompassword", Resources.confCons_v2_6_passwordis_Password, "Password"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 custompassword,fullencryption", Resources.confCons_v2_6_passwordis_Password_fullencryption, "Password"));
+            }
+        }
+    }
+
+    public class Datagram
+    {
+        private readonly string _testName;
+
+        public string ConfCons { get; set; }
+        public string Password { get; set; }
+
+        public Datagram(string testName, string confCons, string password)
+        {
+            _testName = testName;
+            ConfCons = confCons;
+            Password = password;
+        }
+
+        public override string ToString()
+        {
+            return _testName;
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs

@@ -0,0 +1,107 @@
+using System.Xml.XPath;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsDocumentCompilerTests
+    {
+        private XmlConnectionsDocumentCompiler _documentCompiler;
+        private ConnectionTreeModel _connectionTreeModel;
+        private ICryptographyProvider _cryptographyProvider;
+        private ContainerInfo _folder1;
+        private ContainerInfo _folder2;
+        private ContainerInfo _folder3;
+        private ConnectionInfo _con0;
+        private ConnectionInfo _con1;
+        private ConnectionInfo _con2;
+        private ConnectionInfo _con3;
+        private ConnectionInfo _con4;
+
+        [SetUp]
+        public void Setup()
+        {
+            _cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider);
+            _connectionTreeModel = SetupConnectionTreeModel();
+        }
+
+        [Test]
+        public void XDocumentHasXmlDeclaration()
+        {
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            Assert.That(xdoc.Declaration, Is.Not.Null);
+        }
+
+        [Test]
+        public void DocumentHasRootConnectionElement()
+        {
+            var xdoc =_documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            var rootElementName = xdoc.Root?.Name.LocalName;
+            Assert.That(rootElementName, Is.EqualTo("Connections"));
+        }
+
+        [Test]
+        public void ConnectionNodesSerializedRecursively()
+        {
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            var con4 = xdoc.Root?.XPathSelectElement("Node[@Name='folder2']/Node[@Name='folder3']/Node[@Name='con4']");
+            Assert.That(con4, Is.Not.Null);
+        }
+
+        [Test]
+        public void XmlContentEncryptedWhenFullFileEncryptionTurnedOn()
+        {
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, true, false);
+            var rootElementValue = xdoc.Root?.Value;
+            Assert.That(rootElementValue, Is.Not.EqualTo(string.Empty));
+        }
+
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Root
+             * |--- con0
+             * |--- folder1
+             * |    L--- con1
+             * L--- folder2
+             *      |--- con2
+             *      L--- folder3
+             *           |--- con3
+             *           L--- con4
+             */
+            BuildTreeNodes();
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            rootNode.AddChild(_folder1);
+            rootNode.AddChild(_folder2);
+            rootNode.AddChild(_con0);
+            _folder1.AddChild(_con1);
+            _folder2.AddChild(_con2);
+            _folder2.AddChild(_folder3);
+            _folder3.AddChild(_con3);
+            _folder3.AddChild(_con4);
+            connectionTreeModel.AddRootNode(rootNode);
+            return connectionTreeModel;
+        }
+
+        private void BuildTreeNodes()
+        {
+            _folder1 = new ContainerInfo { Name = "folder1" };
+            _folder2 = new ContainerInfo { Name = "folder2" };
+            _folder3 = new ContainerInfo { Name = "folder3" };
+            _con0 = new ConnectionInfo { Name = "con0" };
+            _con1 = new ConnectionInfo { Name = "con1" };
+            _con2 = new ConnectionInfo { Name = "con2" };
+            _con3 = new ConnectionInfo { Name = "con3" };
+            _con4 = new ConnectionInfo { Name = "con4" };
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs

@@ -0,0 +1,70 @@
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsDocumentEncryptorTests
+    {
+        private XmlConnectionsDocumentEncryptor _documentEncryptor;
+        private XDocument _originalDocument;
+
+        [SetUp]
+        public void Setup()
+        {
+            var connectionTreeModel = SetupConnectionTreeModel();
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider).CompileDocument(connectionTreeModel, false, false);
+            _documentEncryptor = new XmlConnectionsDocumentEncryptor(cryptoProvider);
+        }
+
+        [Test]
+        public void RootNodeValueIsEncrypted()
+        {
+            var encryptedDocument = _documentEncryptor.EncryptDocument(_originalDocument, "mR3m".ConvertToSecureString());
+            var encryptedContent = encryptedDocument.Root?.Value;
+            Assert.That(encryptedContent, Is.Not.EqualTo(string.Empty));
+        }
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Root
+             * |--- con0
+             * |--- folder1
+             * |    L--- con1
+             * L--- folder2
+             *      |--- con2
+             *      L--- folder3
+             *           |--- con3
+             *           L--- con4
+             */
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            var folder1 = new ContainerInfo { Name = "folder1" };
+            var folder2 = new ContainerInfo { Name = "folder2" };
+            var folder3 = new ContainerInfo { Name = "folder3" };
+            var con0 = new ConnectionInfo { Name = "con0" };
+            var con1 = new ConnectionInfo { Name = "con1" };
+            var con2 = new ConnectionInfo { Name = "con2" };
+            var con3 = new ConnectionInfo { Name = "con3" };
+            var con4 = new ConnectionInfo { Name = "con4" };
+            rootNode.AddChild(folder1);
+            rootNode.AddChild(folder2);
+            rootNode.AddChild(con0);
+            folder1.AddChild(con1);
+            folder2.AddChild(con2);
+            folder2.AddChild(folder3);
+            folder3.AddChild(con3);
+            folder3.AddChild(con4);
+            connectionTreeModel.AddRootNode(rootNode);
+            return connectionTreeModel;
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsSerializerTests.cs

@@ -0,0 +1,83 @@
+using System.Xml;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsSerializerTests
+    {
+        private XmlConnectionsSerializer _serializer;
+        private ConnectionTreeModel _connectionTreeModel;
+        
+
+        [SetUp]
+        public void Setup()
+        {
+            var encryptor = new AeadCryptographyProvider();
+            _serializer = new XmlConnectionsSerializer(encryptor);
+            _connectionTreeModel = SetupConnectionTreeModel();
+        }
+
+        [Test]
+        public void ChildNestingSerializedCorrectly()
+        {
+            var serializedConnections = _serializer.Serialize(_connectionTreeModel);
+            var xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(serializedConnections);
+            var nodeCon4 = xmlDoc.DocumentElement?.SelectSingleNode("Node[@Name='folder2']/Node[@Name='folder3']/Node[@Name='con4']");
+            Assert.That(nodeCon4, Is.Not.Null);
+        }
+
+        [Test]
+        public void SingleConnectionSerializedCorrectly()
+        {
+            var connectionInfo = new ConnectionInfo {Name = "myConnection"};
+            var serializedConnections = _serializer.Serialize(connectionInfo);
+            var xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(serializedConnections);
+            var connectionNode = xmlDoc.DocumentElement?.SelectSingleNode($"Node[@Name='{connectionInfo.Name}']");
+            Assert.That(connectionNode, Is.Not.Null);
+        }
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Root
+             * |--- con0
+             * |--- folder1
+             * |    L--- con1
+             * L--- folder2
+             *      |--- con2
+             *      L--- folder3
+             *           |--- con3
+             *           L--- con4
+             */
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            var folder1 = new ContainerInfo { Name = "folder1" };
+            var folder2 = new ContainerInfo { Name = "folder2" };
+            var folder3 = new ContainerInfo { Name = "folder3" };
+            var con0 = new ConnectionInfo { Name = "con0" };
+            var con1 = new ConnectionInfo { Name = "con1" };
+            var con2 = new ConnectionInfo { Name = "con2" };
+            var con3 = new ConnectionInfo { Name = "con3" };
+            var con4 = new ConnectionInfo { Name = "con4" };
+            rootNode.AddChild(folder1);
+            rootNode.AddChild(folder2);
+            rootNode.AddChild(con0);
+            folder1.AddChild(con1);
+            folder2.AddChild(con2);
+            folder2.AddChild(folder3);
+            folder3.AddChild(con3);
+            folder3.AddChild(con4);
+            connectionTreeModel.AddRootNode(rootNode);
+            return connectionTreeModel;
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlRootNodeSerializerTests.cs

@@ -0,0 +1,139 @@
+using System;
+using System.Collections;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlRootNodeSerializerTests
+    {
+        private XmlRootNodeSerializer _rootNodeSerializer;
+        private ICryptographyProvider _cryptographyProvider;
+        private RootNodeInfo _rootNodeInfo;
+
+        [SetUp]
+        public void Setup()
+        {
+            _rootNodeSerializer = new XmlRootNodeSerializer();
+            _cryptographyProvider = new AeadCryptographyProvider();
+            _rootNodeInfo = new RootNodeInfo(RootNodeType.Connection);
+        }
+
+        [Test]
+        public void RootElementNamedConnections()
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            Assert.That(element.Name.LocalName, Is.EqualTo("Connections"));
+        }
+
+        [Test]
+        public void RootNodeInfoNameSerialized()
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("Name"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo("Connections"));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void ExportValueSerialized(bool export)
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, export:export);
+            var attributeValue = element.Attribute(XName.Get("Export"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(export.ToString()));
+        }
+
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void EncryptionEngineSerialized(BlockCipherEngines engine, BlockCipherModes mode)
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
+            var attributeValue = element.Attribute(XName.Get("EncryptionEngine"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(engine.ToString()));
+        }
+
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void EncryptionModeSerialized(BlockCipherEngines engine, BlockCipherModes mode)
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
+            var attributeValue = element.Attribute(XName.Get("BlockCipherMode"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(mode.ToString()));
+        }
+
+        [TestCase(1000)]
+        [TestCase(1234)]
+        [TestCase(9999)]
+        [TestCase(10000)]
+        public void KdfIterationsSerialized(int iterations)
+        {
+            _cryptographyProvider.KeyDerivationIterations = iterations;
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("KdfIterations"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(iterations.ToString()));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void FullFileEncryptionFlagSerialized(bool fullFileEncryption)
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, fullFileEncryption);
+            var attributeValue = element.Attribute(XName.Get("FullFileEncryption"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(fullFileEncryption.ToString()));
+        }
+
+        [TestCase("", "ThisIsNotProtected")]
+        [TestCase(null, "ThisIsNotProtected")]
+        [TestCase("mR3m", "ThisIsNotProtected")]
+        [TestCase("customPassword1", "ThisIsProtected")]
+        public void ProtectedStringSerialized(string customPassword, string expectedPlainText)
+        {
+            _rootNodeInfo.PasswordString = customPassword;
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("Protected"))?.Value;
+            var attributeValuePlainText = _cryptographyProvider.Decrypt(attributeValue, _rootNodeInfo.PasswordString.ConvertToSecureString());
+            Assert.That(attributeValuePlainText, Is.EqualTo(expectedPlainText));
+        }
+
+        [TestCase("", "ThisIsNotProtected")]
+        [TestCase("customPassword1", "ThisIsNotProtected")]
+        public void EncryptWithDefaultPasswordWhenExporting(string customPassword, string expectedPlainText)
+        {
+            _rootNodeInfo.PasswordString = customPassword;
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, export:true);
+            var attributeValue = element.Attribute(XName.Get("Protected"))?.Value;
+            var attributeValuePlainText = _cryptographyProvider.Decrypt(attributeValue, _rootNodeInfo.DefaultPassword.ConvertToSecureString());
+            Assert.That(attributeValuePlainText, Is.EqualTo(expectedPlainText));
+        }
+
+        [Test]
+        public void ConfVersionSerialized()
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("ConfVersion"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo("2.6"));
+        }
+
+        private class TestCaseSources
+        {
+            public static IEnumerable AllEngineAndModeCombos
+            {
+                get
+                {
+                    foreach (var engine in Enum.GetValues(typeof(BlockCipherEngines)))
+                    {
+                        foreach (var mode in Enum.GetValues(typeof(BlockCipherModes)))
+                        {
+                            yield return new TestCaseData(engine, mode);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs

@@ -0,0 +1,507 @@
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.Http;
+using mRemoteNG.Connection.Protocol.ICA;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Connection.Protocol.VNC;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class AbstractConnectionInfoDataTests
+    {
+        private class TestAbstractConnectionInfoData : AbstractConnectionInfoData {}
+        private TestAbstractConnectionInfoData _testAbstractConnectionInfoData;
+
+        [SetUp]
+        public void Setup()
+        {
+            _testAbstractConnectionInfoData = new TestAbstractConnectionInfoData();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _testAbstractConnectionInfoData = null;
+        }
+
+
+        [Test]
+        public void NameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Name = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DescriptionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Description = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void IconNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Icon = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PanelNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Panel = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void HostnameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Hostname = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UsernameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Username = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PasswordNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Password = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DomainNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Domain = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ProtocolNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Protocol = ProtocolType.HTTP;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ExtAppNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.ExtApp = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PortNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Port = 9999;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PuttySessionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.PuttySession = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void IcaEncryptionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.ICAEncryptionStrength = ProtocolICA.EncryptionStrength.Encr128BitLogonOnly;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UseConsoleSessionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.UseConsoleSession = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdpAuthenticationLevelNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDPAuthenticationLevel = ProtocolRDP.AuthenticationLevel.AuthRequired;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void LoadBalanceInfoNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.LoadBalanceInfo = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RenderingEngineNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RenderingEngine = HTTPBase.RenderingEngine.Gecko;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UseCredSspNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.UseCredSsp = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayUsageMethodNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayUsageMethod = ProtocolRDP.RDGatewayUsageMethod.Always;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayHostnameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayHostname = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayUseConnectionCredentialsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayUseConnectionCredentials = ProtocolRDP.RDGatewayUseConnectionCredentials.SmartCard;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayUsernameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayUsername = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayPasswordNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayPassword = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayDomainNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayDomain = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ResolutionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Resolution = ProtocolRDP.RDPResolutions.Res1366x768;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void AutomaticResizeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.AutomaticResize = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ColorsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Colors = ProtocolRDP.RDPColors.Colors16Bit;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void CacheBitmapsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.CacheBitmaps = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DisplayWallpaperNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.DisplayWallpaper = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DisplayThemesNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.DisplayThemes = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void EnableFontSmoothingNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.EnableFontSmoothing = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void EnableDesktopCompositionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.EnableDesktopComposition = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectKeysNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectKeys = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectDiskDrivesNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectDiskDrives = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectPrintersNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectPrinters = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectPortsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectPorts = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectSmartCardsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectSmartCards = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectSoundNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectSound = ProtocolRDP.RDPSounds.DoNotPlay;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PreExtAppNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.PreExtApp = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PostExtAppNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.PostExtApp = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void MacAddressNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.MacAddress = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UserFieldNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.UserField = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncCompressionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCCompression = ProtocolVNC.Compression.Comp5;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncEncodingNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCEncoding = ProtocolVNC.Encoding.EncTight;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncAuthModeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCAuthMode = ProtocolVNC.AuthMode.AuthWin;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyTypeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyType = ProtocolVNC.ProxyType.ProxyUltra;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyIpNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyIP = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyPortNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyPort = 9999;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyUsernameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyUsername = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyPasswordNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyPassword = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncColorsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCColors = ProtocolVNC.Colors.Col8Bit;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncSmartSizeModeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCSmartSizeMode = ProtocolVNC.SmartSizeMode.SmartSFree;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncViewOnlyNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCViewOnly = true;
+            Assert.That(wasCalled, Is.True);
+        }
+    }
+}

mRemoteNGTests/Connection/ConnectionInfoComparerTests.cs

@@ -0,0 +1,42 @@
+using System.ComponentModel;
+using mRemoteNG.Connection;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class ConnectionInfoComparerTests
+    {
+        private ConnectionInfo _con1;
+        private ConnectionInfo _con2;
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            _con1 = new ConnectionInfo { Name = "a" };
+            _con2 = new ConnectionInfo { Name = "b" };
+        }
+
+        [Test]
+        public void SortAscendingOnName()
+        {
+            var comparer = new ConnectionInfoComparer<string>(node => node.Name)
+            {
+                SortDirection = ListSortDirection.Ascending
+            };
+            var compareReturn = comparer.Compare(_con1, _con2);
+            Assert.That(compareReturn, Is.Negative);
+        }
+
+        [Test]
+        public void SortDescendingOnName()
+        {
+            var comparer = new ConnectionInfoComparer<string>(node => node.Name)
+            {
+                SortDirection = ListSortDirection.Descending
+            };
+            var compareReturn = comparer.Compare(_con1, _con2);
+            Assert.That(compareReturn, Is.Positive);
+        }
+    }
+}

mRemoteNGTests/Connection/ConnectionInfoInheritanceTests.cs

@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using System.Reflection;
 using System.Collections;
+using System.Linq;
 
 namespace mRemoteNGTests.Connection
 {
@@ -59,10 +60,23 @@ namespace mRemoteNGTests.Connection
             Assert.That(_inheritance.Username, Is.True);
         }
 
+        [Test]
+        public void GetPropertiesReturnsListOfSettableProperties()
+        {
+            var hasIconProperty = _inheritance.GetProperties().Contains(typeof(ConnectionInfoInheritance).GetProperty("Icon"));
+            Assert.That(hasIconProperty, Is.True);
+        }
+
+        [Test]
+        public void GetPropertiesExludesPropertiesThatShouldNotBeSet()
+        {
+            var hasEverythingInheritedProperty = _inheritance.GetProperties().Contains(typeof(ConnectionInfoInheritance).GetProperty("EverythingInherited"));
+            Assert.That(hasEverythingInheritedProperty, Is.False);
+        }
 
         private bool AllInheritancePropertiesAreTrue()
         {
-            bool allPropertiesTrue = true;
+            var allPropertiesTrue = true;
             foreach (var property in _inheritanceProperties)
             {
                 if (PropertyIsBoolean(property) && PropertyIsChangedWhenSettingInheritAll(property) && BooleanPropertyIsSetToFalse(property))
@@ -73,7 +87,7 @@ namespace mRemoteNGTests.Connection
 
         private bool AllInheritancePropertiesAreFalse()
         {
-            bool allPropertiesFalse = true;
+            var allPropertiesFalse = true;
             foreach (var property in _inheritanceProperties)
             {
                 if (PropertyIsBoolean(property) && PropertyIsChangedWhenSettingInheritAll(property) && BooleanPropertyIsSetToTrue(property))
@@ -84,8 +98,7 @@ namespace mRemoteNGTests.Connection
 
         private bool PropertyIsChangedWhenSettingInheritAll(PropertyInfo property)
         {
-            ArrayList propertiesIgnoredByInheritAll = new ArrayList();
-            propertiesIgnoredByInheritAll.Add("IsDefault");
+            var propertiesIgnoredByInheritAll = new ArrayList {"IsDefault"};
             return propertiesIgnoredByInheritAll.Contains(property);
         }
 
@@ -101,7 +114,7 @@ namespace mRemoteNGTests.Connection
 
         private bool BooleanPropertyIsSetToTrue(PropertyInfo property)
         {
-            return (bool)property.GetValue(_inheritance) == true;
+            return (bool)property.GetValue(_inheritance);
         }
     }
 }

mRemoteNGTests/Connection/ConnectionInfoTests.cs

@@ -0,0 +1,103 @@
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.SSH;
+using mRemoteNG.Container;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class ConnectionInfoTests
+    {
+        private ConnectionInfo _connectionInfo;
+        private const string TestDomain = "somedomain";
+
+        [SetUp]
+        public void Setup()
+        {
+            _connectionInfo = new ConnectionInfo();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _connectionInfo = null;
+        }
+
+        [Test]
+        public void CreatingConnectionInfoWithParentSetsTheParentProperty()
+        {
+            var container = new ContainerInfo();
+            var connectionInfo = new ConnectionInfo(container);
+            Assert.That(connectionInfo.Parent, Is.EqualTo(container));
+        }
+
+        [Test]
+        public void CreatingConnectionInfoWithParentAddsToTheParentsChildList()
+        {
+            var container = new ContainerInfo();
+            var connectionInfo = new ConnectionInfo(container);
+            Assert.That(container.Children, Does.Contain(connectionInfo));
+        }
+
+        [Test]
+        public void CopyCreatesMemberwiseCopy()
+        {
+            _connectionInfo.Domain = TestDomain;
+            var secondConnection = _connectionInfo.Clone();
+            Assert.That(secondConnection.Domain, Is.EqualTo(_connectionInfo.Domain));
+        }
+
+        [Test]
+        public void CopyFromCopiesProperties()
+        {
+            var secondConnection = new ConnectionInfo {Domain = TestDomain};
+            _connectionInfo.CopyFrom(secondConnection);
+            Assert.That(_connectionInfo.Domain, Is.EqualTo(secondConnection.Domain));
+        }
+
+        [Test]
+        public void CopyingAConnectionInfoAlsoCopiesItsInheritance()
+        {
+            _connectionInfo.Inheritance.Username = true;
+            var secondConnection = new ConnectionInfo {Inheritance = {Username = false}};
+            secondConnection.CopyFrom(_connectionInfo);
+            Assert.That(secondConnection.Inheritance.Username, Is.True);
+        }
+
+        [Test]
+        public void PropertyChangedEventRaisedWhenOpenConnectionsChanges()
+        {
+            var eventWasCalled = false;
+            _connectionInfo.PropertyChanged += (sender, args) => eventWasCalled = true;
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            Assert.That(eventWasCalled);
+        }
+
+        [Test]
+        public void PropertyChangedEventArgsAreCorrectWhenOpenConnectionsChanges()
+        {
+            var nameOfModifiedProperty = "";
+            _connectionInfo.PropertyChanged += (sender, args) => nameOfModifiedProperty = args.PropertyName;
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            Assert.That(nameOfModifiedProperty, Is.EqualTo("OpenConnections"));
+        }
+
+        [TestCase(ProtocolType.HTTP, ExpectedResult = 80)]
+        [TestCase(ProtocolType.HTTPS, ExpectedResult = 443)]
+        [TestCase(ProtocolType.ICA, ExpectedResult = 1494)]
+        [TestCase(ProtocolType.IntApp, ExpectedResult = 0)]
+        [TestCase(ProtocolType.RAW, ExpectedResult = 23)]
+        [TestCase(ProtocolType.RDP, ExpectedResult = 3389)]
+        [TestCase(ProtocolType.Rlogin, ExpectedResult = 513)]
+        [TestCase(ProtocolType.SSH1, ExpectedResult = 22)]
+        [TestCase(ProtocolType.SSH2, ExpectedResult = 22)]
+        [TestCase(ProtocolType.Telnet, ExpectedResult = 23)]
+        [TestCase(ProtocolType.VNC, ExpectedResult = 5900)]
+        public int GetDefaultPortReturnsCorrectPortForProtocol(ProtocolType protocolType)
+        {
+            _connectionInfo.Protocol = protocolType;
+            return _connectionInfo.GetDefaultPort();
+        }
+    }
+}

mRemoteNGTests/Connection/DefaultConnectionInfoTests.cs

@@ -0,0 +1,34 @@
+using mRemoteNG.Connection;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class DefaultConnectionInfoTests
+    {
+        private string _testDomain = "somedomain";
+
+        [SetUp]
+        public void Setup()
+        {
+            DefaultConnectionInfo.Instance.Domain = "";
+        }
+
+        [Test]
+        public void LoadingDefaultInfoUpdatesAllProperties()
+        {
+            var connectionInfoSource = new ConnectionInfo { Domain = _testDomain };
+            DefaultConnectionInfo.Instance.LoadFrom(connectionInfoSource);
+            Assert.That(DefaultConnectionInfo.Instance.Domain, Is.EqualTo(_testDomain));
+        }
+
+        [Test]
+        public void SavingDefaultConnectionInfoExportsAllProperties()
+        {
+            var saveTarget = new ConnectionInfo();
+            DefaultConnectionInfo.Instance.Domain = _testDomain;
+            DefaultConnectionInfo.Instance.SaveTo(saveTarget);
+            Assert.That(saveTarget.Domain, Is.EqualTo(_testDomain));
+        }
+    }
+}

mRemoteNGTests/Connection/DefaultConnectionInheritanceTests.cs

@@ -0,0 +1,49 @@
+using mRemoteNG.Connection;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class DefaultConnectionInheritanceTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            DefaultConnectionInheritance.Instance.TurnOffInheritanceCompletely();
+        }
+
+        [Test]
+        public void LoadingDefaultInheritanceUpdatesAllProperties()
+        {
+            var inheritanceSource = new ConnectionInfoInheritance(new object(), true);
+            inheritanceSource.TurnOnInheritanceCompletely();
+            DefaultConnectionInheritance.Instance.LoadFrom(inheritanceSource);
+            Assert.That(DefaultConnectionInheritance.Instance.EverythingInherited, Is.True);
+        }
+
+        [Test]
+        public void SavingDefaultInheritanceExportsAllProperties()
+        {
+            var inheritanceDestination = new ConnectionInfoInheritance(new object(), true);
+            DefaultConnectionInheritance.Instance.AutomaticResize = true;
+            DefaultConnectionInheritance.Instance.SaveTo(inheritanceDestination);
+            Assert.That(inheritanceDestination.AutomaticResize, Is.True);
+        }
+
+        [Test]
+        public void NewInheritanceInstancesCreatedWithDefaultInheritanceValues()
+        {
+            DefaultConnectionInheritance.Instance.Domain = true;
+            var inheritanceInstance = new ConnectionInfoInheritance(new object());
+            Assert.That(inheritanceInstance.Domain, Is.True);
+        }
+
+        [Test]
+        public void NewInheritanceInstancesCreatedWithAllDefaultInheritanceValues()
+        {
+            DefaultConnectionInheritance.Instance.TurnOnInheritanceCompletely();
+            var inheritanceInstance = new ConnectionInfoInheritance(new object());
+            Assert.That(inheritanceInstance.EverythingInherited, Is.True);
+        }
+    }
+}

mRemoteNGTests/Connection/Protocol/ProtocolListTests.cs

@@ -0,0 +1,218 @@
+using System.Collections;
+using System.Collections.Specialized;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.SSH;
+using mRemoteNG.Connection.Protocol.Telnet;
+using mRemoteNG.Connection.Protocol.VNC;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection.Protocol
+{
+    public class ProtocolListTests
+    {
+        private ProtocolList _protocolList;
+        private ProtocolBase _protocol1;
+        private ProtocolBase _protocol2;
+        private ProtocolBase _protocol3;
+
+
+        [SetUp]
+        public void Setup()
+        {
+            _protocolList = new ProtocolList();
+            _protocol1 = new ProtocolTelnet();
+            _protocol2 = new ProtocolSSH2();
+            _protocol3 = new ProtocolVNC();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _protocolList = null;
+            _protocol1 = null;
+            _protocol2 = null;
+            _protocol3 = null;
+        }
+
+        [Test]
+        public void EmptyWhenInitialized()
+        {
+            Assert.That(_protocolList.Count == 0);
+        }
+
+        [Test]
+        public void AddAddsObjectToList()
+        {
+            _protocolList.Add(_protocol1);
+            Assert.That(_protocolList[0] == _protocol1);
+        }
+
+        [Test]
+        public void AddRangeAddsAllObjects()
+        {
+            var protArray = new[] {_protocol1, _protocol2, _protocol3};
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList, Is.EquivalentTo(protArray));
+        }
+
+        [Test]
+        public void CountUpdatesToReflectCurrentList()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList.Count == protArray.Length);
+        }
+
+        [Test]
+        public void RemoveRemovesObjectFromList()
+        {
+            _protocolList.Add(_protocol1);
+            _protocolList.Remove(_protocol1);
+            Assert.That(_protocolList.Count == 0);
+        }
+
+        [Test]
+        public void ClearResetsList()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            _protocolList.Clear();
+            Assert.That(_protocolList.Count == 0);
+        }
+
+        [Test]
+        public void IntIndexerReturnsCorrectObject()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList[1], Is.EqualTo(protArray[1]));
+        }
+
+        [Test]
+        public void ObjectIndexerReturnsCorrectObject()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList[_protocol3], Is.EqualTo(_protocol3));
+        }
+
+        [Test]
+        public void IndexerSafelyHandlesUnknownObjects()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList["unacceptablevalue"], Is.EqualTo(null));
+        }
+
+        [Test]
+        public void RemovingNonexistantObjectFromListDoesNothing()
+        {
+            Assert.DoesNotThrow(()=> _protocolList.Remove(_protocol1));
+        }
+
+        [Test]
+        public void AddRaisesCollectionChangedEvent()
+        {
+            var eventWasCalled = false;
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Add(_protocol1);
+            Assert.That(eventWasCalled);
+        }
+
+        [Test]
+        public void AddCollectionChangedEventContainsAddedObject()
+        {
+            IList nodeListFromEvent = new ArrayList();
+            _protocolList.CollectionChanged += (sender, args) => nodeListFromEvent = args.NewItems;
+            _protocolList.Add(_protocol1);
+            Assert.That(nodeListFromEvent, Is.EquivalentTo(new[] {_protocol1}));
+        }
+
+        [Test]
+        public void AddRangeCollectionChangedEventContainsAddedObjects()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            IList nodeListFromEvent = new ArrayList();
+            _protocolList.CollectionChanged += (sender, args) => nodeListFromEvent = args.NewItems;
+            _protocolList.AddRange(protArray);
+            Assert.That(nodeListFromEvent, Is.EquivalentTo(protArray));
+        }
+
+        [Test]
+        public void RemoveCollectionChangedEventContainsRemovedObject()
+        {
+            IList nodeListFromEvent = new ArrayList();
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => nodeListFromEvent = args.OldItems;
+            _protocolList.Remove(_protocol1);
+            Assert.That(nodeListFromEvent, Is.EquivalentTo(new[] { _protocol1 }));
+        }
+
+        [Test]
+        public void AttemptingToRemoveNonexistantObjectDoesNotRaiseCollectionChangedEvent()
+        {
+            var eventWasCalled = false;
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Remove(_protocol1);
+            Assert.That(eventWasCalled == false);
+        }
+
+        [Test]
+        public void ClearRaisesCollectionChangedEvent()
+        {
+            var eventWasCalled = false;
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Clear();
+            Assert.That(eventWasCalled);
+        }
+
+        [Test]
+        public void ClearDoesntRaiseCollectionChangedEventWhenNoObjectsRemoved()
+        {
+            var eventWasCalled = false;
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Clear();
+            Assert.That(eventWasCalled == false);
+        }
+
+        [Test]
+        public void AddCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.Add(_protocol1);
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Add));
+        }
+
+        [Test]
+        public void AddRangeCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.AddRange(new []{_protocol1});
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Add));
+        }
+
+        [Test]
+        public void RemoveCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.Remove(_protocol1);
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Remove));
+        }
+
+        [Test]
+        public void ClearCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.Clear();
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Reset));
+        }
+    }
+}

mRemoteNGTests/Container/ContainerInfoTests.cs

@@ -0,0 +1,430 @@
+using System.ComponentModel;
+using System.Linq;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Container
+{
+    public class ContainerInfoTests
+    {
+        private ContainerInfo _containerInfo;
+        private ConnectionInfo _con1;
+        private ConnectionInfo _con2;
+        private ConnectionInfo _con3;
+
+        [SetUp]
+        public void Setup()
+        {
+            _containerInfo = new ContainerInfo();
+            _con1 = new ConnectionInfo {Name = "a"};
+            _con2 = new ConnectionInfo {Name = "b"};
+            _con3 = new ConnectionInfo {Name = "c"};
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _containerInfo = null;
+            _con1 = null;
+            _con2 = null;
+            _con3 = null;
+        }
+
+        [Test]
+        public void AddSetsParentPropertyOnTheChild()
+        {
+            _containerInfo.AddChild(_con1);
+            Assert.That(_con1.Parent, Is.EqualTo(_containerInfo));
+        }
+
+        [Test]
+        public void AddAddsChildToChildrenList()
+        {
+            _containerInfo.AddChild(_con1);
+            Assert.That(_containerInfo.Children, Does.Contain(_con1));
+        }
+
+        [Test]
+        public void AddRangeAddsAllItems()
+        {
+            var collection = new[] { _con1, _con2, _con3 };
+            _containerInfo.AddChildRange(collection);
+            Assert.That(_containerInfo.Children, Is.EquivalentTo(collection));
+        }
+
+        [Test]
+        public void RemoveUnsetsParentPropertyOnChild()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.RemoveChild(_con1);
+            Assert.That(_con1.Parent, Is.Not.EqualTo(_containerInfo));
+        }
+
+        [Test]
+        public void RemoveRemovesChildFromChildrenList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.RemoveChild(_con1);
+            Assert.That(_containerInfo.Children, Does.Not.Contains(_con1));
+        }
+
+        [Test]
+        public void RemoveRangeRemovesAllIndicatedItems()
+        {
+            var collection = new[] { _con1, _con2, new ContainerInfo() };
+            _containerInfo.AddChildRange(collection);
+            _containerInfo.RemoveChildRange(collection);
+            Assert.That(_containerInfo.Children, Does.Not.Contains(collection[0]).And.Not.Contains(collection[1]).And.Not.Contains(collection[2]));
+        }
+
+        [Test]
+        public void RemoveRangeDoesNotRemoveUntargetedMembers()
+        {
+            var collection = new[] { _con1, _con2, new ContainerInfo() };
+            _containerInfo.AddChildRange(collection);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.RemoveChildRange(collection);
+            Assert.That(_containerInfo.Children, Does.Contain(_con3));
+        }
+
+        [Test]
+        public void AddingChildTriggersCollectionChangedEvent()
+        {
+            var wasCalled = false;
+            _containerInfo.CollectionChanged += (sender, args) => wasCalled = true;
+            _containerInfo.AddChild(_con1);
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RemovingChildTriggersCollectionChangedEvent()
+        {
+            var wasCalled = false;
+            _containerInfo.AddChild(_con1);
+            _containerInfo.CollectionChanged += (sender, args) => wasCalled = true;
+            _containerInfo.RemoveChild(_con1);
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ChangingChildPropertyTriggersPropertyChangedEvent()
+        {
+            var wasCalled = false;
+            _containerInfo.AddChild(_con1);
+            _containerInfo.PropertyChanged += (sender, args) => wasCalled = true;
+            _con1.Name = "somethinghere";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ChangingSubChildPropertyTriggersPropertyChangedEvent()
+        {
+            var wasCalled = false;
+            var container2 = new ContainerInfo();
+            _containerInfo.AddChild(container2);
+            container2.AddChild(_con1);
+            _containerInfo.PropertyChanged += (sender, args) => wasCalled = true;
+            _con1.Name = "somethinghere";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void SetChildPositionPutsChildInCorrectPosition()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.SetChildPosition(_con2, 2);
+            Assert.That(_containerInfo.Children.IndexOf(_con2), Is.EqualTo(2));
+        }
+
+        [Test]
+        public void SettingChildPositionAboveArrayBoundsPutsItAtEndOfList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var finalIndex = _containerInfo.Children.Count - 1;
+            _containerInfo.SetChildPosition(_con2, 5);
+            Assert.That(_containerInfo.Children.IndexOf(_con2), Is.EqualTo(finalIndex));
+        }
+
+        [Test]
+        public void SettingChildPositionBelowArrayBoundsDoesNotMoveTheChild()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var originalIndex = _containerInfo.Children.IndexOf(_con2);
+            _containerInfo.SetChildPosition(_con2, -1);
+            Assert.That(_containerInfo.Children.IndexOf(_con2), Is.EqualTo(originalIndex));
+        }
+
+        [Test]
+        public void SetChildAbovePutsChildInCorrectPosition()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var referenceChildIndexBeforeMove = _containerInfo.Children.IndexOf(_con2);
+            _containerInfo.SetChildAbove(_con3, _con2);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(referenceChildIndexBeforeMove));
+        }
+
+        [Test]
+        public void SetChildBelowPutsChildInCorrectPosition()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var referenceChildIndexBeforeMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.SetChildBelow(_con3, _con1);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(referenceChildIndexBeforeMove+1));
+        }
+
+        [Test]
+        public void PromoteChildMovesTargetUpOne()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con3);
+            _containerInfo.PromoteChild(_con3);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove - 1));
+        }
+
+        [Test]
+        public void PromoteChildDoesNothingWhenAlreadyAtTopOfList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.PromoteChild(_con1);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con1);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove));
+        }
+
+        [Test]
+        public void DemoteChildMovesTargetDownOne()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.DemoteChild(_con1);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con1);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove + 1));
+        }
+
+        [Test]
+        public void DemoteChildDoesNothingWhenAlreadyAtTopOfList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con3);
+            _containerInfo.DemoteChild(_con3);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove));
+        }
+
+        [Test]
+        public void WhenChildAlreadyPresentAddChildAtDoesNothing()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var indexBeforeAttemptedMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.AddChildAt(_con1, 2);
+            var indexAfterAttemptedMove = _containerInfo.Children.IndexOf(_con1);
+            Assert.That(indexAfterAttemptedMove, Is.EqualTo(indexBeforeAttemptedMove));
+        }
+
+        [Test]
+        public void RemoveChildDoesNothingIfChildNotInList()
+        {
+            _containerInfo.AddChild(_con1);
+            var childListBeforeRemoval = _containerInfo.Children;
+            _containerInfo.RemoveChild(_con2);
+            var childListAfterRemoval = _containerInfo.Children;
+            Assert.That(childListAfterRemoval, Is.EquivalentTo(childListBeforeRemoval));
+        }
+
+        [Test]
+        public void ClonedContainerHasNewConstantId()
+        {
+            var clone = _containerInfo.Clone();
+            Assert.That(clone.ConstantID, Is.Not.EqualTo(_containerInfo.ConstantID));
+        }
+
+        [Test]
+        public void ClonedContainerContainsClonedChildren()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var clone = _containerInfo.Clone() as ContainerInfo;
+            var clonedChildNames = clone?.Children.Select((node) => node.Name);
+            var originalChildNames = _containerInfo?.Children.Select((node) => node.Name);
+            Assert.That(clonedChildNames, Is.EquivalentTo(originalChildNames));
+        }
+
+        [Test]
+        public void HasChildrenReturnsFalseForNoChildren()
+        {
+            var hasChildren = _containerInfo.HasChildren();
+            Assert.That(hasChildren, Is.False);
+        }
+
+        [Test]
+        public void HasChildrenReturnsTrueWhenChildrenPresent()
+        {
+            _containerInfo.AddChild(_con1);
+            var hasChildren = _containerInfo.HasChildren();
+            Assert.That(hasChildren, Is.True);
+        }
+
+        [Test]
+        public void AddChildAbovePutsNewChildInCorrectLocation()
+        {
+            _containerInfo.AddChild(_con1);
+            var referenceChildIndexBeforeInsertion = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.AddChildAbove(_con2, _con1);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con2);
+            Assert.That(newChildIndex, Is.EqualTo(referenceChildIndexBeforeInsertion));
+        }
+
+        [Test]
+        public void AddChildAbovePutsNewChildAtEndOfListIfReferenceChildNotInList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChildAbove(_con2, _con3);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con2);
+            var lastIndex = _containerInfo.Children.Count - 1;
+            Assert.That(newChildIndex, Is.EqualTo(lastIndex));
+        }
+
+        [Test]
+        public void AddChildBelowPutsNewChildInCorrectLocation()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            var referenceChildIndexBeforeInsertion = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.AddChildBelow(_con3, _con1);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(newChildIndex, Is.EqualTo(referenceChildIndexBeforeInsertion + 1));
+        }
+
+        [Test]
+        public void AddChildBelowPutsNewChildAtEndOfListIfReferenceChildNotInList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChildBelow(_con2, _con3);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con2);
+            var lastIndex = _containerInfo.Children.Count - 1;
+            Assert.That(newChildIndex, Is.EqualTo(lastIndex));
+        }
+
+        [Test]
+        public void SortAscendingSortsCorrectlyByName()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.Sort();
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortDescendingSortsCorrectlyByName()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.Sort(ListSortDirection.Descending);
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortOnConstantIdAscendingSortsCorrectly()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.SortOn(node=> node.ConstantID);
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+
+        [Test]
+        public void SortOnConstantIdDescendingSortsCorrectly()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.SortOn(node => node.ConstantID, ListSortDirection.Descending);
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+
+        [Test]
+        public void SortAscendingRecursiveSortsGrandchildrenCorrectlyByName()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortRecursive();
+            var grandchildOrderAfterSort = childContainer.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortDescendingRecursiveSortsGrandchildrenCorrectlyByName()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortRecursive(ListSortDirection.Descending);
+            var grandchildOrderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortOnRecursiveConstantIdAscendingSortsGrandchildrenCorrectly()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortOnRecursive(node => node.ConstantID);
+            var grandchildOrderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+
+        [Test]
+        public void SortOnRecursiveConstantIdDescendingSortsGrandchildrenCorrectly()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortOnRecursive(node => node.ConstantID, ListSortDirection.Descending);
+            var grandchildOrderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+    }
+}

mRemoteNGTests/IntegrationTests/ConnectionInheritanceIntegrationTests.cs

@@ -0,0 +1,72 @@
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Container;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.IntegrationTests
+{
+    public class ConnectionInheritanceIntegrationTests
+    {
+        private RootNodeInfo _rootNode;
+
+        [SetUp]
+        public void Setup()
+        {
+            _rootNode = new RootNodeInfo(RootNodeType.Connection);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _rootNode = null;
+        }
+
+        [Test]
+        public void ConnectionsInheritFromCorrectFolder()
+        {
+            /**
+             * Root
+             * --Folder1
+             * ----Connection1
+             * ----Folder2
+             * ------Connection2
+             * ----Connection3 (inherits username)
+             */
+            var folder1 = new ContainerInfo {Username = "folder1User"};
+            var folder2 = new ContainerInfo {Username = "folder2User"};
+            var connection1 = new ConnectionInfo();
+            var connection2 = new ConnectionInfo();
+            var connection3 = new ConnectionInfo {Inheritance = {Username = true}};
+            _rootNode.AddChild(folder1);
+            folder1.AddChildRange(new []{connection1, folder2, connection3});
+            folder2.AddChild(connection2);
+            Assert.That(connection3.Username, Is.EqualTo(folder1.Username));
+        }
+
+        [Test]
+        public void ConnectionWillInheritAllFromFolder()
+        {
+            var folder = new ContainerInfo() {Protocol = ProtocolType.SSH2, Username = "folderUser", Domain = "CoolDomain"};
+            var connection = new ConnectionInfo() {Inheritance = {EverythingInherited = true}};
+            _rootNode.AddChild(folder);
+            folder.AddChild(connection);
+            Assert.That(new object[] { connection.Protocol, connection.Username, connection.Domain }, Is.EquivalentTo(new object[] {folder.Protocol, folder.Username, folder.Domain}));
+        }
+
+        [Test]
+        public void CanInheritThroughMultipleFolderLevels()
+        {
+            var folder1 = new ContainerInfo {Username = "folder1User"};
+            var folder2 = new ContainerInfo {Inheritance = {Username = true}};
+            var folder3 = new ContainerInfo {Inheritance = {Username = true}};
+            var connection = new ConnectionInfo {Inheritance = {Username = true}};
+            _rootNode.AddChild(folder1);
+            folder1.AddChild(folder2);
+            folder2.AddChild(folder3);
+            folder3.AddChild(connection);
+            Assert.That(connection.Username, Is.EqualTo(folder1.Username));
+        }
+    }
+}

mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs

@@ -0,0 +1,120 @@
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.IntegrationTests
+{
+    public class XmlSerializationLifeCycleTests
+    {
+        private XmlConnectionsSerializer _serializer;
+        private XmlConnectionsDeserializer _deserializer;
+
+        [SetUp]
+        public void Setup()
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            _serializer = new XmlConnectionsSerializer(cryptoProvider);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _serializer = null;
+            _deserializer = null;
+        }
+
+        [Test]
+        public void SerializeThenDeserialize()
+        {
+            var originalModel = SetupConnectionTreeModel();
+            var serializedContent = _serializer.Serialize(originalModel);
+            _deserializer = new XmlConnectionsDeserializer(serializedContent);
+            var deserializedModel = _deserializer.Deserialize();
+            var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
+            var nodeNamesFromOriginalModel = originalModel.GetRecursiveChildList().Select(node => node.Name);
+            Assert.That(nodeNamesFromDeserializedModel, Is.EquivalentTo(nodeNamesFromOriginalModel));
+        }
+
+        [Test]
+        public void SerializeThenDeserializeWithFullEncryption()
+        {
+            var originalModel = SetupConnectionTreeModel();
+            _serializer.UseFullEncryption = true;
+            var serializedContent = _serializer.Serialize(originalModel);
+            _deserializer = new XmlConnectionsDeserializer(serializedContent);
+            var deserializedModel = _deserializer.Deserialize();
+            var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
+            var nodeNamesFromOriginalModel = originalModel.GetRecursiveChildList().Select(node => node.Name);
+            Assert.That(nodeNamesFromDeserializedModel, Is.EquivalentTo(nodeNamesFromOriginalModel));
+        }
+
+        [Test]
+        public void SerializeAndDeserializePropertiesWithInternationalCharacters()
+        {
+            var originalConnectionInfo = new ConnectionInfo {Name = "con1", Password = "£°úg¶┬ä" };
+            var serializedContent = _serializer.Serialize(originalConnectionInfo);
+            _deserializer = new XmlConnectionsDeserializer(serializedContent);
+            var deserializedModel = _deserializer.Deserialize();
+            var deserializedConnectionInfo = deserializedModel.GetRecursiveChildList().First(node => node.Name == originalConnectionInfo.Name);
+            Assert.That(deserializedConnectionInfo.Password, Is.EqualTo(originalConnectionInfo.Password));
+        }
+
+
+        [Test]
+        public void SerializeAndDeserializeWithCustomKdfIterationsValue()
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            cryptoProvider.KeyDerivationIterations = 5000;
+            _serializer = new XmlConnectionsSerializer(cryptoProvider);
+            var originalModel = SetupConnectionTreeModel();
+            var serializedContent = _serializer.Serialize(originalModel);
+            _deserializer = new XmlConnectionsDeserializer(serializedContent);
+            var deserializedModel = _deserializer.Deserialize();
+            var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
+            var nodeNamesFromOriginalModel = originalModel.GetRecursiveChildList().Select(node => node.Name);
+            Assert.That(nodeNamesFromDeserializedModel, Is.EquivalentTo(nodeNamesFromOriginalModel));
+        }
+
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Root
+             * |--- con0
+             * |--- folder1
+             * |    L--- con1
+             * L--- folder2
+             *      |--- con2
+             *      L--- folder3
+             *           |--- con3
+             *           L--- con4
+             */
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            var folder1 = new ContainerInfo { Name = "folder1" };
+            var folder2 = new ContainerInfo { Name = "folder2" };
+            var folder3 = new ContainerInfo { Name = "folder3" };
+            var con0 = new ConnectionInfo { Name = "con0" };
+            var con1 = new ConnectionInfo { Name = "con1" };
+            var con2 = new ConnectionInfo { Name = "con2" };
+            var con3 = new ConnectionInfo { Name = "con3" };
+            var con4 = new ConnectionInfo { Name = "con4" };
+            rootNode.AddChild(folder1);
+            rootNode.AddChild(folder2);
+            rootNode.AddChild(con0);
+            folder1.AddChild(con1);
+            folder2.AddChild(con2);
+            folder2.AddChild(folder3);
+            folder3.AddChild(con3);
+            folder3.AddChild(con4);
+            connectionTreeModel.AddRootNode(rootNode);
+            return connectionTreeModel;
+        }
+    }
+}

mRemoteNGTests/Properties/Resources.Designer.cs

@@ -0,0 +1,262 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace mRemoteNGTests.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNGTests.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;Connections Name=&quot;Connections&quot; Export=&quot;False&quot; Protected=&quot;95syzRuZ4mRxpNkZQzoyX8SDpQXLyMq3GncO8o4SyTBoYvn3TAWgn05ZEU2DrjkM&quot; ConfVersion=&quot;2.5&quot;&gt;
+        ///    &lt;Node Name=&quot;Folder1&quot; Type=&quot;Container&quot; Expanded=&quot;True&quot; Descr=&quot;&quot; Icon=&quot;mRemoteNG&quot; Panel=&quot;General&quot; Username=&quot;&quot; Domain=&quot;&quot; Password=&quot;&quot; Hostname=&quot;&quot; Protocol=&quot;ICA&quot; PuttySession=&quot;Default Settings&quot; Port=&quot;1494&quot; ConnectToConsole=&quot;False&quot; UseCredSsp=&quot;True&quot; RenderingEngine=&quot;IE&quot; ICAEncryptionStrength=&quot;Encr128Bit&quot; RDPAuthenticationLevel=&quot; [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string confCons_v2_5 {
+            get {
+                return ResourceManager.GetString("confCons_v2_5", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;Connections Name=&quot;Connections&quot; Export=&quot;False&quot; EncryptionEngine=&quot;AES&quot; BlockCipherMode=&quot;GCM&quot; KdfIterations=&quot;1000&quot; FullFileEncryption=&quot;False&quot; Protected=&quot;Bqmajt4G5RDLsV5nn3s7QHZkkeWXQqgSDA4RSA8fWYx1bxRaorsmZ0ub4Z6mOBbefuXBbaWnsVRn0+NOJ3zTjkUJ&quot; ConfVersion=&quot;2.6&quot;&gt;
+        ///    &lt;Node Name=&quot;Folder1&quot; Type=&quot;Container&quot; Expanded=&quot;True&quot; Descr=&quot;&quot; Icon=&quot;mRemoteNG&quot; Panel=&quot;General&quot; Username=&quot;&quot; Domain=&quot;&quot; Password=&quot;&quot; Hostname=&quot;&quot; Protocol=&quot;ICA&quot; PuttySession=&quot;Default Settings&quot; Port=&quot;1494&quot; Connec [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string confCons_v2_6 {
+            get {
+                return ResourceManager.GetString("confCons_v2_6", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;Connections Name=&quot;Connections&quot; Export=&quot;False&quot; EncryptionEngine=&quot;AES&quot; BlockCipherMode=&quot;GCM&quot; KdfIterations=&quot;5000&quot; FullFileEncryption=&quot;False&quot; Protected=&quot;ZrxA5XJSUirgITMc2UxVRY4mLPxzNsyaqpgJXNdjcUdTlA/p4ZQP4bKqp44ZMrZlNU9jZgsvodGEVqS5/26St+Sk&quot; ConfVersion=&quot;2.6&quot;&gt;
+        ///    &lt;Node Name=&quot;Folder1&quot; Type=&quot;Container&quot; Expanded=&quot;True&quot; Descr=&quot;&quot; Icon=&quot;mRemoteNG&quot; Panel=&quot;General&quot; Username=&quot;&quot; Domain=&quot;&quot; Password=&quot;&quot; Hostname=&quot;&quot; Protocol=&quot;ICA&quot; PuttySession=&quot;Default Settings&quot; Port=&quot;1494&quot; Connec [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string confCons_v2_6_5k_iterations {
+            get {
+                return ResourceManager.GetString("confCons_v2_6_5k_iterations", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;Connections Name=&quot;Connections&quot; Export=&quot;False&quot; EncryptionEngine=&quot;AES&quot; BlockCipherMode=&quot;GCM&quot; KdfIterations=&quot;1000&quot; FullFileEncryption=&quot;True&quot; Protected=&quot;tfNq70KLL8id4QnOeC9OrjMlACoArKa7pFJKcG1vrrRxMkvHpJPiEx/JlbPBJ3x4HXXx806ipsFiMkU1+OT7eE3Z&quot; ConfVersion=&quot;2.6&quot;&gt;NAxOa6dYlXPZCtpxWfiFrINjIC0dicQU7YdmKRnOn6POI07mMWU/Yy5uhPeXfVfzWgbPlKGyOMk5pgTw0pYIpTZpmqRKzZN+MzFw7NTW9QgD3Uhq528OItO2/MdpGQZ8AYM+qrDHHCXG9bGkczDwe5BZ8cDnGfbFrYTINGBZ9wxjLfyA9oYxzfrzoHDACbM8gD8wvmO26ML/lShwQS+/9B [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string confCons_v2_6_fullencryption {
+            get {
+                return ResourceManager.GetString("confCons_v2_6_fullencryption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;Connections Name=&quot;Connections&quot; Export=&quot;False&quot; EncryptionEngine=&quot;AES&quot; BlockCipherMode=&quot;GCM&quot; KdfIterations=&quot;1000&quot; FullFileEncryption=&quot;False&quot; Protected=&quot;et1WJ5jh501ty5nzV139lFcoK4Cjm2HwYiFDgEtTTW6iIMTiJ7ilw0gkDOOahwig8neVelBnGaP1AAmRY4B6&quot; ConfVersion=&quot;2.6&quot;&gt;
+        ///    &lt;Node Name=&quot;Folder1&quot; Type=&quot;Container&quot; Expanded=&quot;True&quot; Descr=&quot;&quot; Icon=&quot;mRemoteNG&quot; Panel=&quot;General&quot; Username=&quot;&quot; Domain=&quot;&quot; Password=&quot;&quot; Hostname=&quot;&quot; Protocol=&quot;ICA&quot; PuttySession=&quot;Default Settings&quot; Port=&quot;1494&quot; ConnectToC [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string confCons_v2_6_passwordis_Password {
+            get {
+                return ResourceManager.GetString("confCons_v2_6_passwordis_Password", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;Connections Name=&quot;Connections&quot; Export=&quot;False&quot; EncryptionEngine=&quot;AES&quot; BlockCipherMode=&quot;GCM&quot; KdfIterations=&quot;1000&quot; FullFileEncryption=&quot;True&quot; Protected=&quot;RD3KGFlcH+4MxnYNje/ruXy6kN6pXgOwg8u6jlyU4u1RFWd8gm8DAGyAdycTDCr37dCNsi6F4Huj41haRQg4&quot; ConfVersion=&quot;2.6&quot;&gt;/au8q00e4YHoMGSnNWL/zRCzSQd1EaDgZ6VHuJ92iffxh5Spuhy86nsoiMr99UMaUF8UjlrYsboZC2B5sLO6t1lqKuB9okjY/jaLHTlGB7mmaHlDHXo7WEChz51xO+caUGfXCXPHgHOFsz/yCJIv3E9LwVOsAIH2qTfMp19OsytF3+Lb4T8v3nMAKb1iw63WcjFsp/835TMcZWWjI+SwPNKMze [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string confCons_v2_6_passwordis_Password_fullencryption {
+            get {
+                return ResourceManager.GetString("confCons_v2_6_passwordis_Password_fullencryption", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;
+        ///&lt;!-- ****************************************************************--&gt;
+        ///&lt;!-- *                                                              *--&gt;
+        ///&lt;!-- * PuTTY Configuration Manager save file - All right reserved.  *--&gt;
+        ///&lt;!-- *                                                              *--&gt;
+        ///&lt;!-- ****************************************************************--&gt;
+        ///&lt;!-- The following lines can be modified at your own risks.  --&gt;
+        ///&lt;configuration version=&quot;0.7.1.136&quot;  [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string test_puttyConnectionManager_database {
+            get {
+                return ResourceManager.GetString("test_puttyConnectionManager_database", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;RDCMan schemaVersion=&quot;1&quot;&gt;
+        ///    &lt;version&gt;99.99&lt;/version&gt;
+        ///    &lt;file&gt;
+        ///    &lt;/file&gt;
+        ///&lt;/RDCMan&gt;.
+        /// </summary>
+        internal static string test_rdcman_badVersionNumber {
+            get {
+                return ResourceManager.GetString("test_rdcman_badVersionNumber", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;RDCMan schemaVersion=&quot;1&quot;&gt;
+        ///    &lt;file&gt;
+        ///    &lt;/file&gt;
+        ///&lt;/RDCMan&gt;.
+        /// </summary>
+        internal static string test_rdcman_noversion {
+            get {
+                return ResourceManager.GetString("test_rdcman_noversion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;RDCMan schemaVersion=&quot;-99&quot;&gt;
+        ///    &lt;version&gt;2.2&lt;/version&gt;
+        ///    &lt;file&gt;
+        ///    &lt;/file&gt;
+        ///&lt;/RDCMan&gt;.
+        /// </summary>
+        internal static string test_rdcman_v2_2_badschemaversion {
+            get {
+                return ResourceManager.GetString("test_rdcman_v2_2_badschemaversion", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;RDCMan schemaVersion=&quot;1&quot;&gt;
+        ///    &lt;version&gt;2.2&lt;/version&gt;
+        ///    &lt;file&gt;
+        ///        &lt;properties&gt;
+        ///            &lt;name&gt;test_rdcman_v2_2_schema1&lt;/name&gt;
+        ///            &lt;expanded&gt;True&lt;/expanded&gt;
+        ///            &lt;comment /&gt;
+        ///            &lt;logonCredentials inherit=&quot;FromParent&quot; /&gt;
+        ///            &lt;connectionSettings inherit=&quot;FromParent&quot; /&gt;
+        ///            &lt;gatewaySettings inherit=&quot;FromParent&quot; /&gt;
+        ///            &lt;remoteDesktop inherit=&quot;FromParent&quot; /&gt;
+        ///            &lt;localResources inherit=&quot;FromParent&quot;  [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string test_rdcman_v2_2_schema1 {
+            get {
+                return ResourceManager.GetString("test_rdcman_v2_2_schema1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
+        ///&lt;RDCMan programVersion=&quot;2.7&quot; schemaVersion=&quot;3&quot;&gt;
+        ///  &lt;file&gt;
+        ///    &lt;credentialsProfiles /&gt;
+        ///    &lt;properties&gt;
+        ///      &lt;expanded&gt;True&lt;/expanded&gt;
+        ///      &lt;name&gt;test_RDCMan_connections&lt;/name&gt;
+        ///    &lt;/properties&gt;
+        ///    &lt;smartGroup&gt;
+        ///      &lt;properties&gt;
+        ///        &lt;expanded&gt;False&lt;/expanded&gt;
+        ///        &lt;name&gt;AllServers&lt;/name&gt;
+        ///      &lt;/properties&gt;
+        ///      &lt;ruleGroup operator=&quot;All&quot;&gt;
+        ///        &lt;rule&gt;
+        ///          &lt;property&gt;DisplayName&lt;/property&gt;
+        ///          &lt;operator&gt;Matches&lt;/operator&gt;
+        ///         [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string test_rdcman_v2_7_schema3 {
+            get {
+                return ResourceManager.GetString("test_rdcman_v2_7_schema3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to screen mode id:i:1
+        ///use multimon:i:0
+        ///desktopwidth:i:800
+        ///desktopheight:i:600
+        ///session bpp:i:24
+        ///winposstr:s:0,3,0,0,800,600
+        ///compression:i:1
+        ///keyboardhook:i:2
+        ///audiocapturemode:i:0
+        ///videoplaybackmode:i:1
+        ///connection type:i:7
+        ///networkautodetect:i:1
+        ///bandwidthautodetect:i:1
+        ///displayconnectionbar:i:1
+        ///username:s:myusernamehere
+        ///enableworkspacereconnect:i:0
+        ///disable wallpaper:i:1
+        ///allow font smoothing:i:1
+        ///allow desktop composition:i:1
+        ///disable full window drag:i:1
+        ///disable menu anims:i:1
+        ///disable themes:i:1
+        /// [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string test_remotedesktopconnection_rdp {
+            get {
+                return ResourceManager.GetString("test_remotedesktopconnection_rdp", resourceCulture);
+            }
+        }
+    }
+}

mRemoteNGTests/Properties/Resources.resx

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="confCons_v2_5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\confCons_v2_5.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="confCons_v2_6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\confCons_v2_6.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="confCons_v2_6_5k_iterations" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\confCons_v2_6_5k-iterations.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="confCons_v2_6_fullencryption" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\confCons_v2_6_fullencryption.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="confCons_v2_6_passwordis_Password" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\confCons_v2_6_passwordis_Password.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="confCons_v2_6_passwordis_Password_fullencryption" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\confCons_v2_6_passwordis_Password_fullencryption.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="test_puttyConnectionManager_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_puttyConnectionManager_database.dat;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="test_rdcman_badVersionNumber" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_rdcman_badVersionNumber.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="test_rdcman_noversion" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_rdcman_noversion.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="test_rdcman_v2_2_badschemaversion" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_rdcman_v2_2_badschemaversion.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="test_rdcman_v2_2_schema1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_rdcman_v2_2_schema1.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="test_rdcman_v2_7_schema3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_RDCMan_v2_7_schema3.rdg;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="test_remotedesktopconnection_rdp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\test_remotedesktopconnection.rdp;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+</root>