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

@@ -284,4 +284,8 @@ InstallerProjects/Installer/Fragments/FilesFragment.wxs
 InstallerProjects/Installer/Resources/License.rtf
 
 # user preference: .editorconfig - http://editorconfig.org/
-.editorconfig
+.editorconfig
+
+# gh-pages info
+runlocal.bat
+/_site

CREDITS.TXT

@@ -3,16 +3,19 @@ Contributors
 
 Current mRemoteNG dev team:
 David Sparer (github.com/sparerd)
-Hayato Iriumi (github.com/hiriumi)
 Sean Kaim (github.com/kmscode)
 
-Felix Deimel - mRemote original developer
-Riley McArdle - mRemoteNG original developer
+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
@@ -70,8 +73,8 @@ Copyright
 Copyright <20> 2008 Felix Deimel
 http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
 
-DockPanel Suite 2.10.0.beta2
-Copyright <20> 2015 @roken and @lextm (formerly Weifen Luo)
+DockPanel Suite 2.10.0
+Copyright <20> 2016 @roken and @lextm (formerly Weifen Luo)
 MIT License
 https://github.com/dockpanelsuite/dockpanelsuite
 

InstallerProjects/CustomActions/CustomActions.cs

@@ -7,16 +7,20 @@ namespace CustomActions
         [CustomAction]
         public static ActionResult IsMinimumRdpVersionInstalled(Session session)
         {
-            var rdpVersionChecker = new InstalledKbChecker("MINIMUM_RDP_KB", "MINIMUM_RDP_VERSION_INSTALLED", session);
-            rdpVersionChecker.Execute();
+            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 rdpVersionChecker = new InstalledKbChecker("RDP_DTLS_KB", "RDP_DTLS_UPDATE_INSTALLED", session);
-            rdpVersionChecker.Execute();
+            var kb = session["RDP_DTLS_KB"];
+            var returnVar = "RDP_DTLS_UPDATE_INSTALLED";
+            var kbInstalledChecker = new KbInstalledChecker(session);
+            kbInstalledChecker.Execute(kb, returnVar);
             return ActionResult.Success;
         }
 

InstallerProjects/CustomActions/CustomActions.csproj

@@ -45,9 +45,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CustomActions.cs" />
+    <Compile Include="KbInstalledChecker.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="InstalledWindowsUpdateGatherer.cs" />
-    <Compile Include="InstalledKbChecker.cs" />
+    <Compile Include="InstalledWindowsUpdateChecker.cs" />
     <Compile Include="UninstallNsisVersions.cs" />
     <Content Include="CustomAction.config" />
   </ItemGroup>

InstallerProjects/CustomActions/InstalledKbChecker.cs

@@ -1,53 +0,0 @@
-using System;
-using Microsoft.Deployment.WindowsInstaller;
-
-namespace CustomActions
-{
-    public class InstalledKbChecker
-    {
-        private readonly Session _session;
-        private readonly string _kbVariable;
-        private readonly string _returnVar;
-
-        public InstalledKbChecker(string kbVariable, string returnVar, Session session)
-        {
-            _kbVariable = kbVariable;
-            _returnVar = returnVar;
-            _session = session;
-        }
-
-        public bool Execute()
-        {
-            try
-            {
-                _session.Log("Begin InstalledKbChecker");
-                var minimumKb = _session[_kbVariable];
-                var isUpdateInstalled = IsUpdateInstalled(minimumKb);
-                SetReturnValue(isUpdateInstalled);
-                _session.Log("End InstalledKbChecker");
-                return true;
-            }
-            catch (Exception e)
-            {
-                _session.Log($"There was an issue executing the RdpVersionChecker. Exception: {e}");
-                return false;
-            }
-        }
-
-        private bool IsUpdateInstalled(string kb)
-        {
-            _session.Log($"Checking if '{kb}' is installed");
-            var updateGatherer = new InstalledWindowsUpdateGatherer();
-            var isUpdateInstalled = updateGatherer.IsUpdateInstalled(kb);
-            _session.Log($"KB is installed = '{isUpdateInstalled}'");
-            return isUpdateInstalled;
-        }
-
-        private void SetReturnValue(bool isUpdateInstalled)
-        {
-            var updateInstalledVal = isUpdateInstalled ? "1" : "0";
-            _session[_returnVar] = updateInstalledVal;
-            _session.Log($"Set property '{_returnVar}' to '{updateInstalledVal}'");
-        }
-    }
-}

InstallerProjects/CustomActions/InstalledWindowsUpdateChecker.cs

@@ -1,14 +1,15 @@
 using System;
 using System.Management;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace CustomActions
 {
-    public class InstalledWindowsUpdateGatherer
+    public class InstalledWindowsUpdateChecker
     {
         private readonly ManagementScope _managementScope;
 
-        public InstalledWindowsUpdateGatherer()
+        public InstalledWindowsUpdateChecker()
         {
             _managementScope = Connect();
         }
@@ -40,14 +41,32 @@ namespace CustomActions
             return installedUpdates;
         }
 
-        public bool IsUpdateInstalled(string kb)
+        public bool IsUpdateInstalled(string kb) => IsUpdateInstalled(new[] {kb});
+
+        public bool IsUpdateInstalled(IEnumerable<string> kbList)
         {
             var updateIsInstalled = false;
-            var query = $"SELECT HotFixID FROM Win32_QuickFixEngineering WHERE HotFixID='{kb}'";
+            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/Installer/mRemoteNGV1.wxs

@@ -18,7 +18,8 @@
     </Property>
     <Property Id='RDP_DTLS_KB' Value='$(var.RdpDtlsKb)' />
     <Property Id='RDP_DTLS_UPDATE_INSTALLED' Value='0' Secure='yes' />
-    <Property Id='MINIMUM_RDP_KB' Value='$(var.MinimumRdpKb)' />
+    <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' />

README.MD

@@ -3,7 +3,10 @@
 
 [![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)
 
 
@@ -31,4 +34,4 @@ 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).
+RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).

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

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/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/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>

mRemoteNGTests/Resources/confCons_v2_5.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Connections Name="Connections" Export="False" Protected="95syzRuZ4mRxpNkZQzoyX8SDpQXLyMq3GncO8o4SyTBoYvn3TAWgn05ZEU2DrjkM" ConfVersion="2.5">
+    <Node Name="Folder1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="ICA" PuttySession="Default Settings" Port="1494" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="Encr128Bit" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="u1cFYiN+39rnIjT9JOVgqzF0LwDD08ON/32tXV6aMw8=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.2" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="UVhIa8sJMvLGX56d8ZG4PMZak6lwURlkN4UYOksjeqw=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.3" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="xxViioYX/CaoWnXsE1bZdE21Jj2qsz7Du3KbONMB2LU=" Hostname="" Protocol="SSH2" PuttySession="Default Settings" Port="22" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+    </Node>
+    <Node Name="Folder2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="OG1YqC5B612X2z8mT8ujrcwjLB83TPEwzxpcAUfq8QI=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection2.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC21" Domain="domainC21" Password="4k/KraVW2VBeMzDDP3DXCBpAnhTK8NfsLWAiWkoBSF8=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Folder2.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="Connection2.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC211" Domain="domainC2111" Password="RnaM2Pe9Ksgiwudg5fnAr3Fc7oGLKq6rEpBVfzLgouE=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="Folder2.1.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+                <Node Name="Connection2.1.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameforC2111" Domain="domainC2111" Password="+CCNb8oURT36EdVuDshvgW4Y42U1OwvoKwZCvQ+Mwwo=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            </Node>
+        </Node>
+        <Node Name="Folder2.2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="ZPh3lumDECS6zgJFeXtWYScn4WCPPJahMkfkAoKdkC4=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="InheritalAllConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="0RS1CG8gyibBDcj1LgOuUYR+BXtWkIvuwonoGZ1f9/0=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            <Node Name="Folder2.2.1 InheritAll" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="XfhhpQnL1lp34KZITCKTgDD3+7C7t8VW6y26rERXG+A=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True">
+                <Node Name="Connection2.2.1.1 InheritAll" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="i4LCsy8+QgJ7xsDHh8ckf1h4Kno3sQYN9QhGD7vaTTc=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            </Node>
+            <Node Name="InheritUsernameConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="inheritUsernameDomain" Password="IaLl8+z9y4uk7hYIvgwpQzrSuo7MFvfTGPNzT19I1n4zDkZJwwLO6ba4UcFECDe8" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritDomainConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="folder2domain" Password="DH57coImERkLQr0VIhReTRlBEatv45F3Dtz0hfzqzv9Hbhx48maiZx4XOFn4ZYvS" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritPasswordConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="inheritUsernameDomain" Password="8Whb2isHSTBVrMSMDFCeSnNOA6l5n6GUmf1+9be0HUI=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        </Node>
+    </Node>
+    <Node Name="rootConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="root" Domain="rootdomain" Password="W2KSje/AD81hhjqdZeg8gkVvLozkd++94zH5hjOSWc0=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+</Connections>

mRemoteNGTests/Resources/confCons_v2_6.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Connections Name="Connections" Export="False" EncryptionEngine="AES" BlockCipherMode="GCM" KdfIterations="1000" FullFileEncryption="False" Protected="8LmIO3+MWBY0zTmfjfOEdCGxhTAwnlohb1veTGNZFt6lAYvY2UOzWyjVzkx6V93smpbP0ZOuexN15u7rvwJEjawC" ConfVersion="2.6">
+    <Node Name="Folder1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="ICA" PuttySession="Default Settings" Port="1494" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="Encr128Bit" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="fdZPNiJlK9u/uRr22ViSGc8w69qHSDjWw4oeqJWCqFS+kT03rMOOdCczpCtvs6sX59iIcxetSA==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.2" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="hAsz/lUntsPLR8Zat4mUTF1vcprNjjLxQK+lUJnsJcVEaAvgrPVKENBY8OvUytaw63zgVWp87g==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.3" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="jQXxO9cdSBepxE1ly/XjZwU8mqvqNbmaO6UByt1AE53r/1Wi1LAnE69TU+HOlfewmwgqd2FYkw==" Hostname="" Protocol="SSH2" PuttySession="Default Settings" Port="22" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+    </Node>
+    <Node Name="Folder2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="Og5OwQv6U7hMU6fohgpp4i/Mx2MmcGpqt2RP0E45Grd5Flhi/UpUHiGSMb/Cs0GJI58eYEltAw==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection2.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC21" Domain="domainC21" Password="Zc99Lb1dOKFv0KwjiLeMUe9+PCgrFXjn9LzInaYeD4C9Dq775v6Ab+/Ziy2LaVsbZWka" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Folder2.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="Connection2.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC211" Domain="domainC2111" Password="gb+gO4iSmr6EV9bHsg4WjlMk4eGmX4LoRORopESfAcleBwFZIoCi9Cq2TSVd5My9u6rspw==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="Folder2.1.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+                <Node Name="Connection2.1.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameforC2111" Domain="domainC2111" Password="uVGn3W5EX5sLRoM9t0AVBiG5vxOhk/j2luETXI3Jj4gfWiegs++TdUr+FfelDwKLr4fdfJE=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            </Node>
+        </Node>
+        <Node Name="Folder2.2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="InheritalAllConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            <Node Name="Folder2.2.1 InheritAll" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True">
+                <Node Name="Connection2.2.1.1 InheritAll" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            </Node>
+            <Node Name="InheritUsernameConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="inheritUsernameDomain" Password="CFAVi9B4uc9Zhpt9hmAqYHcrIUHF1nVuMoe+g3jjdJg7ulbgvtUBsGmvPElTcacuIQZ1OOq5T2QSgvEq6lTUwbsR92PhJIU=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritDomainConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="folder2domain" Password="tIHG70e2LUBNqzQudqVaCR//i52WHnzdeoEukJ3BCuKrbTNYxL0L5i/LF5CpBdnRYKOplgGzVgsYvSQ/NRjQV1PWINhWy90=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritPasswordConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="inheritUsernameDomain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        </Node>
+    </Node>
+    <Node Name="rootConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="root" Domain="rootdomain" Password="QjVdSbogtcT8NsiZ83XQRWiU/9FXLKKYj4P87lMJbNdQEl10UswLG2zOg2GCYJZ7njJAXrYLIULpuGjs" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+</Connections>

mRemoteNGTests/Resources/confCons_v2_6_5k-iterations.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Connections Name="Connections" Export="False" EncryptionEngine="AES" BlockCipherMode="GCM" KdfIterations="5000" FullFileEncryption="False" Protected="Z1IOT8h7neJ5V7es5Iv63A2WsDG6QWl10F/Rb9ljKxvCseEITty1BfMNgiaVPfm7w61uabQKqu2waDCXUpLo1OZW" ConfVersion="2.6">
+    <Node Name="Folder1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="ICA" PuttySession="Default Settings" Port="1494" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="Encr128Bit" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="Z3gnKsowJa1jorYkylUYGWeRXzANCSHt797uoViLJ5f41GUj7kJWe9PjxPHpIqTvu3iUkhxsUQ==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.2" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="XcGdi52XOIjKGn1qXKe7Mo/xOaXa3MEyCJVwwiC9DrWY9j9Cc6iQZFVDDcoHEAWip4DL+LhWnA==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.3" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="k3xo08s+XuE66cvz6EQOcvwtBVQmhhKqHRQ1d+vEFqGwfbwnGqwWoo0Aur4Hp2ukzZim/WOkjg==" Hostname="" Protocol="SSH2" PuttySession="Default Settings" Port="22" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+    </Node>
+    <Node Name="Folder2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="le+uKgaUpDE3/uRWK4GeEvzKHz58RzoNwCZGXQ4SEmdsFX858hEJqieoefxPRuoDlcqc1dD7ig==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection2.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC21" Domain="domainC21" Password="YJtEz9kawG0mPmF6kchoUe/b3x0yKDVqZl5VVh8YfBcEXLqZnSVtbmcs8CZeMliAOP1u" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Folder2.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="Connection2.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC211" Domain="domainC2111" Password="4Qzd0gehLXc4oJ5j8iRmoNIlP4HCR25Y8UvxUqATmAlJ4qxP4L0vOLuPX9CHTCZ0ZzDs3Q==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="Folder2.1.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+                <Node Name="Connection2.1.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameforC2111" Domain="domainC2111" Password="EP3keqzE3CKR9xhc3ryiA4AoVkB1tLYnpy5UhlFSziCBESQW7uLw6ru2L/M0cUlAj5xnDX4=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            </Node>
+        </Node>
+        <Node Name="Folder2.2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="InheritalAllConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            <Node Name="Folder2.2.1 InheritAll" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True">
+                <Node Name="Connection2.2.1.1 InheritAll" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            </Node>
+            <Node Name="InheritUsernameConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="inheritUsernameDomain" Password="dqqh/2hcFacWAc0gGWSjkMBXboIAKzDPrZLwzX+O0RaCk6sYs82MU5VnY26YZNKUZJXWssa7s5f52hKqKMQZ6S4pgmdMSDQ=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritDomainConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="folder2domain" Password="I8CjAXPV7Tgq5rlKbvwtcNVnZ8QP9Lt4i4Xo2cWvJV67Uv8OT0Z3gMKkoGozLfQ/Dl19VYJZvjyi5DAehioCMMCQmsrq7Eg=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritPasswordConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="inheritUsernameDomain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        </Node>
+    </Node>
+    <Node Name="rootConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="root" Domain="rootdomain" Password="L72IgpkriXVOBWly89VYmXTyCFq/ArXZLN3fFZ0QHH9axQFUjWxH9eBLWyx3oMw8mn4aAyfuapPSHn8U" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+</Connections>

mRemoteNGTests/Resources/confCons_v2_6_passwordis_Password.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Connections Name="Connections" Export="False" EncryptionEngine="AES" BlockCipherMode="GCM" KdfIterations="1000" FullFileEncryption="False" Protected="e/T6ajrPtNNlHreSeD4QBqToTuiqtNACKiPJv7vU+l6TWCu9JNsmL+Y8lJ4aTl5YVcstXpQjxsZ9i8+YV4Gs" ConfVersion="2.6">
+    <Node Name="Folder1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="ICA" PuttySession="Default Settings" Port="1494" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="Encr128Bit" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="CJVJ2L3rAm6M4+s8fjTPtdadgyquxgjouQD6MUSDFKMDZShaPV+GXitckZbK8E7THgd8lVhktg==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.2" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="E1XqFYVjCBRPA+zheTg7OCojgki4P4lhf5zCE9RS40OwgGJdgdwy1dG5CROeawh2Mxv2paPUhw==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Connection1.3" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder1" Domain="domainFolder1" Password="3y/oZqN6DiNcUoM8ll+gH3VfkcsF7uRz447CG+eyOGZDbn6p44JilE8K3nzHHmcuzzSWfAZoRQ==" Hostname="" Protocol="SSH2" PuttySession="Default Settings" Port="22" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+    </Node>
+    <Node Name="Folder2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="Cc8VeGR5shoSMTrQlBZLOlMgk9ZVoroq98Mie0kMwjdF5y7lJ1Tx9MJo7hfbiCUC2BvVlmTEeQ==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+        <Node Name="Connection2.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC21" Domain="domainC21" Password="/4exqbP5O5zpHkS2QWTvSwmYWGZnJoBURZ9KXLZXfy/ORYfVmxJiqTrGkjSjWesl2zSg" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        <Node Name="Folder2.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="Connection2.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameC211" Domain="domainC2111" Password="4mYCVoBZQJh9DS7aaE9is3Q/vK+6nvJ783R0rZ03zaIiwwr7DtD+prPCi0MNd+14YB+m3A==" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="Folder2.1.1" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="" Domain="" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+                <Node Name="Connection2.1.1.1" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="usernameforC2111" Domain="domainC2111" Password="Mkr5rotARpOOeca9I5HDDReHZeJ88DFSEtHUV8lFNfLa/RTn8wgnuz9e0k+F3txILpTxha0=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            </Node>
+        </Node>
+        <Node Name="Folder2.2" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False">
+            <Node Name="InheritalAllConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            <Node Name="Folder2.2.1 InheritAll" Type="Container" Expanded="True" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True">
+                <Node Name="Connection2.2.1.1 InheritAll" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="folder2domain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="True" InheritColors="True" InheritDescription="True" InheritDisplayThemes="True" InheritDisplayWallpaper="True" InheritEnableFontSmoothing="True" InheritEnableDesktopComposition="True" InheritDomain="True" InheritIcon="True" InheritPanel="True" InheritPassword="True" InheritPort="True" InheritProtocol="True" InheritPuttySession="True" InheritRedirectDiskDrives="True" InheritRedirectKeys="True" InheritRedirectPorts="True" InheritRedirectPrinters="True" InheritRedirectSmartCards="True" InheritRedirectSound="True" InheritSoundQuality="False" InheritResolution="True" InheritAutomaticResize="True" InheritUseConsoleSession="True" InheritUseCredSsp="True" InheritRenderingEngine="True" InheritUsername="True" InheritICAEncryptionStrength="True" InheritRDPAuthenticationLevel="True" InheritLoadBalanceInfo="True" InheritPreExtApp="True" InheritPostExtApp="True" InheritMacAddress="True" InheritUserField="True" InheritExtApp="True" InheritVNCCompression="True" InheritVNCEncoding="True" InheritVNCAuthMode="True" InheritVNCProxyType="True" InheritVNCProxyIP="True" InheritVNCProxyPort="True" InheritVNCProxyUsername="True" InheritVNCProxyPassword="True" InheritVNCColors="True" InheritVNCSmartSizeMode="True" InheritVNCViewOnly="True" InheritRDGatewayUsageMethod="True" InheritRDGatewayHostname="True" InheritRDGatewayUseConnectionCredentials="True" InheritRDGatewayUsername="True" InheritRDGatewayPassword="True" InheritRDGatewayDomain="True" />
+            </Node>
+            <Node Name="InheritUsernameConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="userFolder2" Domain="inheritUsernameDomain" Password="sLSc8lfEYTQm1knxb7lwmcHAIXhGDNH+h7XzHKN5KPkGhS8Y+gipeH4YhrVRfowist8Pp7P/acQzU1cny5tYeAc/s1kmbtI=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="True" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritDomainConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="folder2domain" Password="tXsA53Ce86U/+AprFjezj0NSIREu/7nRpVF4EKUuF+SUhFMeXWDa38b4c8h2VcE/EU3Bh1aIcv4Vxfnw/OXYDljivdEeq5A=" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="True" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+            <Node Name="InheritPasswordConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="inheritDomainUsername" Domain="inheritUsernameDomain" Password="" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="True" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+        </Node>
+    </Node>
+    <Node Name="rootConnection" Type="Connection" Descr="" Icon="mRemoteNG" Panel="General" Username="root" Domain="rootdomain" Password="zE99YL7l+/T5s2ctJGGVO35qrXCKchScuhlmnipUiUItRsNPKiDTW/4iBJ4w65cfpVyArZ41vFOenGoY" Hostname="" Protocol="RDP" PuttySession="Default Settings" Port="3389" ConnectToConsole="False" UseCredSsp="True" RenderingEngine="IE" ICAEncryptionStrength="EncrBasic" RDPAuthenticationLevel="NoAuth" LoadBalanceInfo="" Colors="Colors16Bit" Resolution="FitToWindow" AutomaticResize="True" DisplayWallpaper="False" DisplayThemes="False" EnableFontSmoothing="False" EnableDesktopComposition="False" CacheBitmaps="False" RedirectDiskDrives="False" RedirectPorts="False" RedirectPrinters="False" RedirectSmartCards="False" RedirectSound="DoNotPlay" SoundQuality="Dynamic" RedirectKeys="False" Connected="False" PreExtApp="" PostExtApp="" MacAddress="" UserField="" ExtApp="" VNCCompression="CompNone" VNCEncoding="EncHextile" VNCAuthMode="AuthVNC" VNCProxyType="ProxyNone" VNCProxyIP="" VNCProxyPort="0" VNCProxyUsername="" VNCProxyPassword="" VNCColors="ColNormal" VNCSmartSizeMode="SmartSAspect" VNCViewOnly="False" RDGatewayUsageMethod="Never" RDGatewayHostname="" RDGatewayUseConnectionCredentials="Yes" RDGatewayUsername="" RDGatewayPassword="" RDGatewayDomain="" InheritCacheBitmaps="False" InheritColors="False" InheritDescription="False" InheritDisplayThemes="False" InheritDisplayWallpaper="False" InheritEnableFontSmoothing="False" InheritEnableDesktopComposition="False" InheritDomain="False" InheritIcon="False" InheritPanel="False" InheritPassword="False" InheritPort="False" InheritProtocol="False" InheritPuttySession="False" InheritRedirectDiskDrives="False" InheritRedirectKeys="False" InheritRedirectPorts="False" InheritRedirectPrinters="False" InheritRedirectSmartCards="False" InheritRedirectSound="False" InheritSoundQuality="False" InheritResolution="False" InheritAutomaticResize="False" InheritUseConsoleSession="False" InheritUseCredSsp="False" InheritRenderingEngine="False" InheritUsername="False" InheritICAEncryptionStrength="False" InheritRDPAuthenticationLevel="False" InheritLoadBalanceInfo="False" InheritPreExtApp="False" InheritPostExtApp="False" InheritMacAddress="False" InheritUserField="False" InheritExtApp="False" InheritVNCCompression="False" InheritVNCEncoding="False" InheritVNCAuthMode="False" InheritVNCProxyType="False" InheritVNCProxyIP="False" InheritVNCProxyPort="False" InheritVNCProxyUsername="False" InheritVNCProxyPassword="False" InheritVNCColors="False" InheritVNCSmartSizeMode="False" InheritVNCViewOnly="False" InheritRDGatewayUsageMethod="False" InheritRDGatewayHostname="False" InheritRDGatewayUseConnectionCredentials="False" InheritRDGatewayUsername="False" InheritRDGatewayPassword="False" InheritRDGatewayDomain="False" />
+</Connections>

mRemoteNGTests/Resources/test_rdcman_badVersionNumber.rdg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RDCMan schemaVersion="1">
+    <version>99.99</version>
+    <file>
+    </file>
+</RDCMan>

mRemoteNGTests/Resources/test_rdcman_noversion.rdg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RDCMan schemaVersion="1">
+    <file>
+    </file>
+</RDCMan>

mRemoteNGTests/Resources/test_rdcman_v2_2_badschemaversion.rdg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RDCMan schemaVersion="-99">
+    <version>2.2</version>
+    <file>
+    </file>
+</RDCMan>

mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RDCMan schemaVersion="1">
+    <version>2.2</version>
+    <file>
+        <properties>
+            <name>test_rdcman_v2_2_schema1</name>
+            <expanded>True</expanded>
+            <comment />
+            <logonCredentials inherit="FromParent" />
+            <connectionSettings inherit="FromParent" />
+            <gatewaySettings inherit="FromParent" />
+            <remoteDesktop inherit="FromParent" />
+            <localResources inherit="FromParent" />
+            <securitySettings inherit="FromParent" />
+            <displaySettings inherit="FromParent" />
+        </properties>
+        <group>
+            <properties>
+                <name>Group1</name>
+                <expanded>True</expanded>
+                <comment />
+                <logonCredentials inherit="FromParent" />
+                <connectionSettings inherit="FromParent" />
+                <gatewaySettings inherit="FromParent" />
+                <remoteDesktop inherit="FromParent" />
+                <localResources inherit="FromParent" />
+                <securitySettings inherit="FromParent" />
+                <displaySettings inherit="FromParent" />
+            </properties>
+            <server>
+                <name>server1</name>
+                <displayName>server1_displayname</displayName>
+                <comment>Comment text here</comment>
+                <logonCredentials inherit="None">
+                    <userName>myusername1</userName>
+                    <domain>mydomain</domain>
+                    <password storeAsClearText="False">AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA/jk3lWsW+ku0n4AOVYyLTAAAAAACAAAAAAAQZgAAAAEAACAAAABhmrmYHd+c7VjWfPvxJ8pgi55yeV2brJDV/i9XzGUz6wAAAAAOgAAAAAIAACAAAAACJMhtb6tmkJn9vSv9J4VMWgt3S7Ikmf63xK/uKQ+YuyAAAACD3mJOT1910KD71zqbi+m/F6A0LK0tu0BhpOhr9v0yH0AAAADrb+Uv2btNYhfTUDGbw5pT5dbp5oXzc3I8QO7X1vgMXiI5TkrSxfHP/2j+Yak++vAjpVtzlxk49hpDLNAZnnhg</password>
+                </logonCredentials>
+                <connectionSettings inherit="None">
+                    <connectToConsole>True</connectToConsole>
+                    <startProgram />
+                    <workingDir />
+                    <port>9933</port>
+                </connectionSettings>
+                <gatewaySettings inherit="None">
+                    <userName>gatewayusername</userName>
+                    <domain>innerdomain</domain>
+                    <password storeAsClearText="False">AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA/jk3lWsW+ku0n4AOVYyLTAAAAAACAAAAAAAQZgAAAAEAACAAAACgU917evQ54VsDf3nkofPOAPj0icRejg3yfyUwZqV3DgAAAAAOgAAAAAIAACAAAACuPdtJTxd2yvFuTpSOeZz1loraPu2WFqUXiJp4cfjbJTAAAAB8L5YX93h6pQoKJozrk+Y+spHWqP+eqBUXRJ45oLreKslslSWCEO7VWg4rgr0FYsNAAAAAU1i5aSTlBy99EkNEd2inrAJAopCfNig6osiEVdvA6eYnCogG5mhzYEK5d5Wt49S8HbEyuLF/8IxV0PKG53vCZQ==</password>
+                    <enabled>True</enabled>
+                    <hostName>gatewayserverhost.innerdomain.net</hostName>
+                    <logonMethod>4</logonMethod>
+                    <localBypass>False</localBypass>
+                    <credSharing>False</credSharing>
+                </gatewaySettings>
+                <remoteDesktop inherit="None">
+                    <size>1024 x 768</size>
+                    <sameSizeAsClientArea>True</sameSizeAsClientArea>
+                    <fullScreen>False</fullScreen>
+                    <colorDepth>24</colorDepth>
+                </remoteDesktop>
+                <localResources inherit="None">
+                    <audioRedirection>2</audioRedirection>
+                    <audioRedirectionQuality>0</audioRedirectionQuality>
+                    <audioCaptureRedirection>0</audioCaptureRedirection>
+                    <keyboardHook>1</keyboardHook>
+                    <redirectClipboard>True</redirectClipboard>
+                    <redirectDrives>True</redirectDrives>
+                    <redirectPorts>True</redirectPorts>
+                    <redirectPrinters>True</redirectPrinters>
+                    <redirectSmartCards>True</redirectSmartCards>
+                </localResources>
+                <securitySettings inherit="None">
+                    <authentication>1</authentication>
+                </securitySettings>
+                <displaySettings inherit="None">
+                    <thumbnailScale>1</thumbnailScale>
+                </displaySettings>
+            </server>
+            <server>
+                <name>server2</name>
+                <displayName>server2</displayName>
+                <comment />
+                <logonCredentials inherit="FromParent" />
+                <connectionSettings inherit="FromParent" />
+                <gatewaySettings inherit="FromParent" />
+                <remoteDesktop inherit="FromParent" />
+                <localResources inherit="FromParent" />
+                <securitySettings inherit="FromParent" />
+                <displaySettings inherit="FromParent" />
+            </server>
+        </group>
+        <group>
+            <properties>
+                <name>Group2</name>
+                <expanded>True</expanded>
+                <comment />
+                <logonCredentials inherit="FromParent" />
+                <connectionSettings inherit="FromParent" />
+                <gatewaySettings inherit="FromParent" />
+                <remoteDesktop inherit="FromParent" />
+                <localResources inherit="FromParent" />
+                <securitySettings inherit="FromParent" />
+                <displaySettings inherit="FromParent" />
+            </properties>
+            <group>
+                <properties>
+                    <name>Group3</name>
+                    <expanded>True</expanded>
+                    <comment />
+                    <logonCredentials inherit="FromParent" />
+                    <connectionSettings inherit="FromParent" />
+                    <gatewaySettings inherit="FromParent" />
+                    <remoteDesktop inherit="FromParent" />
+                    <localResources inherit="FromParent" />
+                    <securitySettings inherit="FromParent" />
+                    <displaySettings inherit="FromParent" />
+                </properties>
+                <server>
+                    <name>server3</name>
+                    <displayName>server3</displayName>
+                    <comment />
+                    <logonCredentials inherit="FromParent" />
+                    <connectionSettings inherit="FromParent" />
+                    <gatewaySettings inherit="FromParent" />
+                    <remoteDesktop inherit="FromParent" />
+                    <localResources inherit="FromParent" />
+                    <securitySettings inherit="FromParent" />
+                    <displaySettings inherit="FromParent" />
+                </server>
+                <server>
+                    <name>server4</name>
+                    <displayName>server4</displayName>
+                    <comment />
+                    <logonCredentials inherit="FromParent" />
+                    <connectionSettings inherit="FromParent" />
+                    <gatewaySettings inherit="FromParent" />
+                    <remoteDesktop inherit="FromParent" />
+                    <localResources inherit="FromParent" />
+                    <securitySettings inherit="FromParent" />
+                    <displaySettings inherit="FromParent" />
+                </server>
+            </group>
+        </group>
+    </file>
+</RDCMan>

mRemoteNGTests/Resources/test_rdcman_v2_7_schema3.rdg

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RDCMan programVersion="2.7" schemaVersion="3">
+  <file>
+    <credentialsProfiles />
+    <properties>
+      <expanded>True</expanded>
+      <name>test_RDCMan_connections</name>
+    </properties>
+    <smartGroup>
+      <properties>
+        <expanded>False</expanded>
+        <name>AllServers</name>
+      </properties>
+      <ruleGroup operator="All">
+        <rule>
+          <property>DisplayName</property>
+          <operator>Matches</operator>
+          <value>server</value>
+        </rule>
+      </ruleGroup>
+    </smartGroup>
+    <group>
+      <properties>
+        <expanded>True</expanded>
+        <name>Group1</name>
+      </properties>
+      <server>
+        <properties>
+          <name>server1</name>
+        </properties>
+        <logonCredentials inherit="None">
+          <profileName scope="Local">Custom</profileName>
+          <userName>someusername1</userName>
+          <password>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA/jk3lWsW+ku0n4AOVYyLTAAAAAACAAAAAAAQZgAAAAEAACAAAACZryl2a4trJLcUdyg7jL/m51fxn4Vy+je6SBhT5FasmgAAAAAOgAAAAAIAACAAAAAcG6MQhKFvEcKRrRE74YKrrnYKxLFnVxbGzyfl7JoyvjAAAACAofcbQqcr6h9VQuwwWW5IBkW1zsugofl1MjsL9t2uWfuBgnrya1Xlyue5E7cG8BZAAAAApgx/XXqBqXhr6CV2SJTlXihg7n5epOIT02A8ymy3qRftDgXlmu3IaN7krK3gofv+iNdVrvIdJJMYCihm7dyqOw==</password>
+          <domain>mydomain</domain>
+        </logonCredentials>
+        <connectionSettings inherit="None">
+          <connectToConsole>False</connectToConsole>
+          <startProgram />
+          <workingDir />
+          <port>9933</port>
+          <loadBalanceInfo />
+        </connectionSettings>
+        <gatewaySettings inherit="None">
+          <enabled>True</enabled>
+          <hostName>gatewayserver.innerdomain.net</hostName>
+          <logonMethod>Any</logonMethod>
+          <localBypass>True</localBypass>
+          <credSharing>True</credSharing>
+          <profileName scope="Local">Custom</profileName>
+          <userName />
+          <password />
+          <domain />
+        </gatewaySettings>
+        <remoteDesktop inherit="None">
+          <sameSizeAsClientArea>False</sameSizeAsClientArea>
+          <fullScreen>True</fullScreen>
+          <colorDepth>24</colorDepth>
+        </remoteDesktop>
+        <localResources inherit="None">
+          <audioRedirection>Client</audioRedirection>
+          <audioRedirectionQuality>Dynamic</audioRedirectionQuality>
+          <audioCaptureRedirection>DoNotRecord</audioCaptureRedirection>
+          <keyboardHook>FullScreenClient</keyboardHook>
+          <redirectClipboard>True</redirectClipboard>
+          <redirectDrives>True</redirectDrives>
+          <redirectDrivesList>
+            <item>C:\</item>
+            <item>D:\</item>
+            <item>E:\</item>
+            <item>F:\</item>
+            <item>G:\</item>
+          </redirectDrivesList>
+          <redirectPrinters>True</redirectPrinters>
+          <redirectPorts>True</redirectPorts>
+          <redirectSmartCards>True</redirectSmartCards>
+          <redirectPnpDevices>True</redirectPnpDevices>
+        </localResources>
+        <displaySettings inherit="None">
+          <thumbnailScale>1</thumbnailScale>
+          <smartSizeDockedWindows>False</smartSizeDockedWindows>
+          <smartSizeUndockedWindows>False</smartSizeUndockedWindows>
+        </displaySettings>
+        <securitySettings inherit="None">
+          <authentication>Warn</authentication>
+        </securitySettings>
+      </server>
+      <server>
+        <properties>
+          <name>server2</name>
+        </properties>
+      </server>
+    </group>
+    <group>
+      <properties>
+        <expanded>True</expanded>
+        <name>Group2</name>
+      </properties>
+      <group>
+        <properties>
+          <expanded>True</expanded>
+          <name>Group3</name>
+        </properties>
+        <server>
+          <properties>
+            <name>server3</name>
+          </properties>
+        </server>
+        <server>
+          <properties>
+            <name>server4</name>
+          </properties>
+        </server>
+      </group>
+    </group>
+  </file>
+  <connected />
+  <favorites />
+  <recentlyUsed />
+</RDCMan>

mRemoteNGTests/Security/AeadCryptographyProviderTests.cs

@@ -1,7 +1,10 @@
-using System.Security;
+using System;
+using System.Collections;
+using System.Security;
 using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using NUnit.Framework;
+using NUnit.Framework.Constraints;
 
 
 namespace mRemoteNGTests.Security
@@ -39,11 +42,12 @@ namespace mRemoteNGTests.Security
             Assert.That(cipherText.IsBase64String, Is.True);
         }
 
-        [Test]
-        public void DecryptedTextIsEqualToOriginalPlainText()
+        [TestCaseSource(nameof(GetAllBlockCipherEngineAndModeCombinations))]
+        public void DecryptedTextIsEqualToOriginalPlainText(BlockCipherEngines engine, BlockCipherModes mode)
         {
-            var cipherText = _cryptographyProvider.Encrypt(_plainText, _encryptionKey);
-            var decryptedCipherText = _cryptographyProvider.Decrypt(cipherText, _encryptionKey);
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
+            var cipherText = cryptoProvider.Encrypt(_plainText, _encryptionKey);
+            var decryptedCipherText = cryptoProvider.Decrypt(cipherText, _encryptionKey);
             Assert.That(decryptedCipherText, Is.EqualTo(_plainText));
         }
 
@@ -54,5 +58,60 @@ namespace mRemoteNGTests.Security
             var cipherText2 = _cryptographyProvider.Encrypt(_plainText, _encryptionKey);
             Assert.That(cipherText1, Is.Not.EqualTo(cipherText2));
         }
+
+        private static IEnumerable GetAllBlockCipherEngineAndModeCombinations()
+        {
+            var combinationList = new ArrayList();
+            var engineChoices = Enum.GetValues(typeof(BlockCipherEngines));
+            var modeChoices = Enum.GetValues(typeof(BlockCipherModes));
+            foreach (var engine in engineChoices)
+            {
+                foreach (var mode in modeChoices)
+                {
+                    combinationList.Add(new[] { engine, mode });
+                }
+            }
+            return combinationList;
+        }
+
+        [Test]
+        public void DecryptionFailureThrowsException()
+        {
+            var cipherText = _cryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            ActualValueDelegate<string> decryptMethod = () => _cryptographyProvider.Decrypt(cipherText, "wrongKey".ConvertToSecureString());
+            Assert.That(decryptMethod, Throws.TypeOf<EncryptionException>());
+        }
+
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void GetCipherEngine(BlockCipherEngines engine, BlockCipherModes mode)
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo(engine));
+        }
+
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void GetCipherMode(BlockCipherEngines engine, BlockCipherModes mode)
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherMode, Is.EqualTo(mode));
+        }
+
+
+        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/Security/Authentication/PasswordAuthenticatorTests.cs

@@ -0,0 +1,114 @@
+using System.Security;
+using mRemoteNG.Security;
+using mRemoteNG.Security.Authentication;
+using mRemoteNG.Security.SymmetricEncryption;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Security.Authentication
+{
+    public class PasswordAuthenticatorTests
+    {
+        private PasswordAuthenticator _authenticator;
+        private readonly SecureString _correctPassword = "9theCorrectPass#5".ConvertToSecureString();
+        private readonly SecureString _wrongPassword = "wrongPassword".ConvertToSecureString();
+
+        [SetUp]
+        public void Setup()
+        {
+            var cryptoProvider = new AeadCryptographyProvider {KeyDerivationIterations = 10000};
+            const string cipherText = "MPELiwk7+xeNlruIyt5uxTvVB+/RLVoLdUGnwY4CWCqwKe7T2IBwWo4oaKum5hdv7447g5m2nZsYPrfARSlotQB4r1KZQg==";
+            _authenticator = new PasswordAuthenticator(cryptoProvider, cipherText);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _authenticator = null;
+        }
+
+        [Test]
+        public void AuthenticatingWithCorrectPasswordReturnsTrue()
+        {
+            var authenticated = _authenticator.Authenticate(_correctPassword);
+            Assert.That(authenticated);
+        }
+
+        [Test]
+        public void AuthenticatingWithWrongPasswordReturnsFalse()
+        {
+            var authenticated = _authenticator.Authenticate(_wrongPassword);
+            Assert.That(!authenticated);
+        }
+
+        [Test]
+        public void AuthenticationRequestorIsCalledWhenInitialPasswordIsWrong()
+        {
+            var wasCalled = false;
+            _authenticator.AuthenticationRequestor = () =>
+            {
+                wasCalled = true;
+                return _correctPassword;
+            };
+            _authenticator.Authenticate(_wrongPassword);
+            Assert.That(wasCalled);
+        }
+
+        [Test]
+        public void AuthenticationRequestorNotCalledWhenInitialPasswordIsCorrect()
+        {
+            var wasCalled = false;
+            _authenticator.AuthenticationRequestor = () =>
+            {
+                wasCalled = true;
+                return _correctPassword;
+            };
+            _authenticator.Authenticate(_correctPassword);
+            Assert.That(!wasCalled);
+        }
+
+        [Test]
+        public void ProvidingCorrectPasswordToTheAuthenticationRequestorReturnsTrue()
+        {
+            _authenticator.AuthenticationRequestor = () => _correctPassword;
+            var authenticated = _authenticator.Authenticate(_wrongPassword);
+            Assert.That(authenticated);
+        }
+
+        [Test]
+        public void AuthenticationFailsWhenAuthenticationRequestorGivenEmptyPassword()
+        {
+            _authenticator.AuthenticationRequestor = () => new SecureString();
+            var authenticated = _authenticator.Authenticate(_wrongPassword);
+            Assert.That(!authenticated);
+        }
+
+        [Test]
+        public void AuthenticatorRespectsMaxAttempts()
+        {
+            var authAttempts = 0;
+            _authenticator.AuthenticationRequestor = () =>
+            {
+                authAttempts++;
+                return _wrongPassword;
+            };
+            _authenticator.Authenticate(_wrongPassword);
+            Assert.That(authAttempts == _authenticator.MaxAttempts);
+        }
+
+        [Test]
+        public void AuthenticatorRespectsMaxAttemptsCustomValue()
+        {
+            const int customMaxAttempts = 5;
+            _authenticator.MaxAttempts = customMaxAttempts;
+            var authAttempts = 0;
+            _authenticator.AuthenticationRequestor = () =>
+            {
+                authAttempts++;
+                return _wrongPassword;
+            };
+            _authenticator.Authenticate(_wrongPassword);
+            Assert.That(authAttempts == customMaxAttempts);
+        }
+    }
+}

mRemoteNGTests/Security/CryptographyProviderFactoryTests.cs

@@ -1,4 +1,7 @@
-using mRemoteNG.Security;
+using System;
+using System.Collections;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
 using NUnit.Framework;
 
 
@@ -21,92 +24,42 @@ namespace mRemoteNGTests.Security
             _cryptographyProviderFactory = null;
         }
 
-        [Test]
-        public void CanCreateAesGcm()
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void CanCreateAeadProvidersWithCorrectEngine(BlockCipherEngines engine, BlockCipherModes mode)
         {
-            var engine = BlockCipherEngines.AES;
-            var mode = BlockCipherModes.GCM;
             var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo(engine));
         }
 
-        [Test]
-        public void CanCreateAesCcm()
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void CanCreateAeadProvidersWithCorrectMode(BlockCipherEngines engine, BlockCipherModes mode)
         {
-            var engine = BlockCipherEngines.AES;
-            var mode = BlockCipherModes.CCM;
             var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
-        }
-
-        [Test]
-        public void CanCreateAesEax()
-        {
-            var engine = BlockCipherEngines.AES;
-            var mode = BlockCipherModes.EAX;
-            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
-        }
-
-        [Test]
-        public void CanCreateSerpentGcm()
-        {
-            var engine = BlockCipherEngines.Serpent;
-            var mode = BlockCipherModes.GCM;
-            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
-        }
-
-        [Test]
-        public void CanCreateSerpentCcm()
-        {
-            var engine = BlockCipherEngines.Serpent;
-            var mode = BlockCipherModes.CCM;
-            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
-        }
-
-        [Test]
-        public void CanCreateSerpentEax()
-        {
-            var engine = BlockCipherEngines.Serpent;
-            var mode = BlockCipherModes.EAX;
-            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
-        }
-
-        [Test]
-        public void CanCreateTwofishCcm()
-        {
-            var engine = BlockCipherEngines.Twofish;
-            var mode = BlockCipherModes.CCM;
-            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
-        }
-
-        [Test]
-        public void CanCreateTwofishEax()
-        {
-            var engine = BlockCipherEngines.Twofish;
-            var mode = BlockCipherModes.EAX;
-            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
-        }
-
-        [Test]
-        public void CanCreateTwofishGcm()
-        {
-            var engine = BlockCipherEngines.Twofish;
-            var mode = BlockCipherModes.GCM;
-            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+            Assert.That(cryptoProvider.CipherMode, Is.EqualTo(mode));
         }
 
         [Test]
         public void CanCreateLegacyRijndael()
         {
             var cryptoProvider = _cryptographyProviderFactory.CreateLegacyRijndaelCryptographyProvider();
-            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo("Rijndael"));
+            Assert.That(cryptoProvider, Is.TypeOf<LegacyRijndaelCryptographyProvider>());
+        }
+
+        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/Security/KeyDerivation/Pkcs5S2KeyGeneratorTests.cs

@@ -0,0 +1,91 @@
+using System;
+using mRemoteNG.Security.KeyDerivation;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Security.KeyDerivation
+{
+    public class Pkcs5S2KeyGeneratorTests
+    {
+        [Test]
+        public void DefaultConstructorThrowsNoException()
+        {
+            // ReSharper disable once ObjectCreationAsStatement
+            Assert.DoesNotThrow(() => new Pkcs5S2KeyGenerator());
+        }
+
+        [Test]
+        public void CreatingGeneratorWithLowIterationCountThrowsError()
+        {
+            // ReSharper disable once ObjectCreationAsStatement
+            Assert.Throws<ArgumentOutOfRangeException>(() => new Pkcs5S2KeyGenerator(256, 999));
+        }
+
+        [Test]
+        public void CreatingGeneratorWithNegativeKeyBitSizeThrowsError()
+        {
+            // ReSharper disable once ObjectCreationAsStatement
+            Assert.Throws<ArgumentOutOfRangeException>(() => new Pkcs5S2KeyGenerator(-1));
+        }
+
+        [Test]
+        public void IdenticalParametersProduceIdenticalKeys()
+        {
+            var keyDerivationFunction = new Pkcs5S2KeyGenerator();
+            var key1 = keyDerivationFunction.DeriveKey("", new byte[0]);
+            var key2 = keyDerivationFunction.DeriveKey("", new byte[0]);
+            Assert.That(key1, Is.EquivalentTo(key2));
+        }
+
+        [Test]
+        public void DifferingIterationsProduceDifferingKeys()
+        {
+            var keyDerivationFunction1 = new Pkcs5S2KeyGenerator(256, 1001);
+            var keyDerivationFunction2 = new Pkcs5S2KeyGenerator(256, 1002);
+            var key1 = keyDerivationFunction1.DeriveKey("", new byte[0]);
+            var key2 = keyDerivationFunction2.DeriveKey("", new byte[0]);
+            Assert.That(key1, Is.Not.EquivalentTo(key2));
+        }
+
+        [Test]
+        public void DifferingKeysizeProduceDifferingKeys()
+        {
+            var keyDerivationFunction1 = new Pkcs5S2KeyGenerator();
+            var keyDerivationFunction2 = new Pkcs5S2KeyGenerator(512);
+            var key1 = keyDerivationFunction1.DeriveKey("", new byte[0]);
+            var key2 = keyDerivationFunction2.DeriveKey("", new byte[0]);
+            Assert.That(key1, Is.Not.EquivalentTo(key2));
+        }
+
+        [Test]
+        public void DifferingPasswordsProduceDifferingKeys()
+        {
+            var keyDerivationFunction = new Pkcs5S2KeyGenerator();
+            var key1 = keyDerivationFunction.DeriveKey("a", new byte[0]);
+            var key2 = keyDerivationFunction.DeriveKey("b", new byte[0]);
+            Assert.That(key1, Is.Not.EquivalentTo(key2));
+        }
+
+        [Test]
+        public void DifferingSaltsProduceDifferingKeys()
+        {
+            var keyDerivationFunction = new Pkcs5S2KeyGenerator();
+            var key1 = keyDerivationFunction.DeriveKey("", new byte[0]);
+            var key2 = keyDerivationFunction.DeriveKey("", new byte[] {1});
+            Assert.That(key1, Is.Not.EquivalentTo(key2));
+        }
+
+        [TestCase(0)]
+        [TestCase(1)]
+        [TestCase(8)]
+        [TestCase(9)]
+        [TestCase(256)]
+        [TestCase(333)]
+        public void KeyLengthIsKeyBitSizeDividedBy8(int keyBitSize)
+        {
+            var keyDerivationFunction = new Pkcs5S2KeyGenerator(keyBitSize);
+            var key = keyDerivationFunction.DeriveKey("", new byte[0]);
+            Assert.That(key.Length, Is.EqualTo(keyBitSize / 8));
+        }
+    }
+}

mRemoteNGTests/Security/LegacyRijndaelCryptographyProviderTests.cs

@@ -2,16 +2,18 @@
 using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using NUnit.Framework;
+using NUnit.Framework.Constraints;
 
 
 namespace mRemoteNGTests.Security
 {
-    [TestFixture()]
     public class LegacyRijndaelCryptographyProviderTests
     {
         private ICryptographyProvider _rijndaelCryptographyProvider;
         private SecureString _encryptionKey;
         private string _plainText;
+        private const string CipherText = "RmV7zw/a7ZRRzZdcTkrLDgBfyEmeh8OFMgg2OKFJnwg=";
+
 
         [SetUp]
         public void SetUp()
@@ -55,5 +57,33 @@ namespace mRemoteNGTests.Security
             var cipherText2 = _rijndaelCryptographyProvider.Encrypt(_plainText, _encryptionKey);
             Assert.That(cipherText1, Is.Not.EqualTo(cipherText2));
         }
+
+        [Test]
+        public void DecryptingFromPreviousApplicationExecutionWorks()
+        {
+            var decryptedCipherText = _rijndaelCryptographyProvider.Decrypt(CipherText, _encryptionKey);
+            Assert.That(decryptedCipherText, Is.EqualTo(_plainText));
+        }
+
+        [Test]
+        public void DecryptionFailureThrowsException()
+        {
+            ActualValueDelegate<string> decryptMethod = () => _rijndaelCryptographyProvider.Decrypt(CipherText, "wrongKey".ConvertToSecureString());
+            Assert.That(decryptMethod, Throws.TypeOf<EncryptionException>());
+        }
+
+        [Test]
+        public void EncryptingEmptyStringReturnsEmptyString()
+        {
+            var cipherText = _rijndaelCryptographyProvider.Encrypt("", _encryptionKey);
+            Assert.That(cipherText, Is.EqualTo(""));
+        }
+
+        [Test]
+        public void DecryptingEmptyStringReturnsEmptyString()
+        {
+            var decryptedCipherText = _rijndaelCryptographyProvider.Decrypt("", _encryptionKey);
+            Assert.That(decryptedCipherText, Is.EqualTo(""));
+        }
     }
 }

mRemoteNGTests/Security/SecureStringExtensionsTests.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Security;
+using mRemoteNG.Security;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Security
+{
+    public class SecureStringExtensionsTests
+    {
+        [Test]
+        public void ConvertToSecureString()
+        {
+            var securedString = "MySecureString".ConvertToSecureString();
+            Assert.That(securedString.Length, Is.GreaterThan(0));
+        }
+
+        [Test]
+        public void ConvertToUnsecureString()
+        {
+            var originalText = "MySecureString";
+            var securedString = originalText.ConvertToSecureString();
+            var unsecuredString = securedString.ConvertToUnsecureString();
+            Assert.That(unsecuredString, Is.EqualTo(originalText));
+        }
+
+        [Test]
+        public void ConvertToSecureStringOnNullStringThrowsException()
+        {
+            string myString = null;
+            Assert.Throws<ArgumentNullException>(() => myString.ConvertToSecureString());
+        }
+
+        [Test]
+        public void ConvertToUnsecureStringOnNullStringThrowsException()
+        {
+            SecureString secureString = null;
+            Assert.Throws<ArgumentNullException>(() => secureString.ConvertToUnsecureString());
+        }
+    }
+}

mRemoteNGTests/Tools/ExternalToolsArgumentParserTests.cs

@@ -0,0 +1,105 @@
+using System;
+using System.Collections;
+using mRemoteNG.Connection;
+using mRemoteNG.Tools;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Tools
+{
+    public class ExternalToolsArgumentParserTests
+    {
+        private ExternalToolArgumentParser _argumentParser;
+        private const string TestString = @"()%!^abc123*<>&|""'\";
+        private const string StringAfterMetacharacterEscaping = @"^(^)^%^!^^abc123*^<^>^&^|^""'\";
+        private const string StringAfterAllEscaping = @"^(^)^%^!^^abc123*^<^>^&^|\^""'\";
+        private const string StringAfterNoEscaping = TestString;
+        private const int Port = 9933;
+        private const string PortAsString = "9933";
+        private const string SampleCommandString = @"/k echo ()%!^abc123*<>&|""'\";
+
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            var connectionInfo = new ConnectionInfo
+            {
+                Name = TestString,
+                Hostname = TestString,
+                Port = Port,
+                Username = TestString,
+                Password = TestString,
+                Domain = TestString,
+                Description = TestString,
+                MacAddress = TestString,
+                UserField = TestString
+            };
+            _argumentParser = new ExternalToolArgumentParser(connectionInfo);
+        }
+
+        [OneTimeTearDown]
+        public void Teardown()
+        {
+            _argumentParser = null;
+        }
+
+        [TestCaseSource(typeof(ParserTestsDataSource), nameof(ParserTestsDataSource.TestCases))]
+        public string ParserTests(string argumentString)
+        {
+            return _argumentParser.ParseArguments(argumentString);
+        }
+
+        [Test]
+        public void NullConnectionInfoResultsInEmptyVariables()
+        {
+            var parser = new ExternalToolArgumentParser(null);
+            var parsedText = parser.ParseArguments("test %USERNAME% test");
+            Assert.That(parsedText, Is.EqualTo("test  test"));
+        }
+
+
+
+        private class ParserTestsDataSource
+        {
+            public static IEnumerable TestCases
+            {
+                get
+                {
+                    yield return new TestCaseData("%NAME%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-NAME%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!NAME%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%HOSTNAME%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-HOSTNAME%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!HOSTNAME%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%PORT%").Returns(PortAsString);
+                    yield return new TestCaseData("%-PORT%").Returns(PortAsString);
+                    yield return new TestCaseData("%!PORT%").Returns(PortAsString);
+                    yield return new TestCaseData("%USERNAME%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-USERNAME%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!USERNAME%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%PASSWORD%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-PASSWORD%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!PASSWORD%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%DOMAIN%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-DOMAIN%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!DOMAIN%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%DESCRIPTION%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-DESCRIPTION%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!DESCRIPTION%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%MACADDRESS%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-MACADDRESS%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!MACADDRESS%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%USERFIELD%").Returns(StringAfterAllEscaping);
+                    yield return new TestCaseData("%-USERFIELD%").Returns(StringAfterMetacharacterEscaping);
+                    yield return new TestCaseData("%!USERFIELD%").Returns(StringAfterNoEscaping);
+                    yield return new TestCaseData("%%") {TestName = "EmptyVariableTagsNotParsed" }.Returns("%%");
+                    yield return new TestCaseData("/k echo %!USERNAME%") { TestName = "ParsingWorksWhenVariableIsNotInFirstPosition" }.Returns(SampleCommandString);
+                    yield return new TestCaseData("%COMSPEC%") { TestName = "EnvironmentVariablesParsed" }.Returns(Environment.GetEnvironmentVariable("comspec"));
+                    yield return new TestCaseData("%UNSUPPORTEDPARAMETER%") { TestName = "UnsupportedParametersNotParsed" }.Returns("%UNSUPPORTEDPARAMETER%");
+                    yield return new TestCaseData(@"\%COMSPEC\%") { TestName = "BackslashEscapedEnvironmentVariablesParsed" }.Returns(Environment.GetEnvironmentVariable("comspec"));
+                    yield return new TestCaseData(@"^%COMSPEC^%") { TestName = "ChevronEscapedEnvironmentVariablesNotParsed" }.Returns("%COMSPEC%");
+                }
+            }
+    }
+    }
+}

mRemoteNGTests/Tree/ConnectionTreeDragAndDropHandlerTests.cs

@@ -0,0 +1,287 @@
+using System.Windows.Forms;
+using BrightIdeasSoftware;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Tree
+{
+    public class ConnectionTreeDragAndDropHandlerTests
+    {
+        private ConnectionTreeDragAndDropHandler _dragAndDropHandler;
+        private RootNodeInfo _rootNode;
+        private ContainerInfo _container1;
+        private ContainerInfo _container2;
+        private ContainerInfo _container3;
+        private ConnectionInfo _connection1;
+        private ConnectionInfo _connection2;
+        private ConnectionInfo _connection3;
+        private ConnectionInfo _connection4;
+        private ConnectionInfo _connection5;
+
+        [SetUp]
+        public void Setup()
+        {
+            _dragAndDropHandler = new ConnectionTreeDragAndDropHandler();
+            InitializeNodes();
+            CreateSimpleTreeModel();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _dragAndDropHandler = null;
+            DestroyNodes();
+        }
+
+        [Test]
+        public void CanDragConnectionOntoContainer()
+        {
+            var source = _connection3;
+            var target = _container1;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.Move));
+        }
+
+        [Test]
+        public void CanDragContainerOntoContainer()
+        {
+            var source = _container1;
+            var target = _container2;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.Move));
+        }
+
+        [Test]
+        public void CanDragContainerBetweenContainers()
+        {
+            var source = _container3;
+            var target = _container2;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.AboveItem);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.Move));
+        }
+
+        [Test]
+        public void CanDragConnectionBetweenConnections()
+        {
+            var source = _connection1;
+            var target = _connection4;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.AboveItem);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.Move));
+        }
+
+        [Test]
+        public void CantDragConnectionOntoItself()
+        {
+            var source = _connection1;
+            var target = _connection1;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragContainerOntoItself()
+        {
+            var source = _container1;
+            var target = _container1;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragContainerOntoItsChild()
+        {
+            var source = _container2;
+            var target = _container3;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragContainerBetweenItsChildren()
+        {
+            var source = _container3;
+            var target = _connection4;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.BelowItem);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragNodeOntoItsCurrentParent()
+        {
+            var source = _container3;
+            var target = _container2;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragRootNodeInfo()
+        {
+            var source = _rootNode;
+            var target = new ContainerInfo();
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragNodeAboveRootNodeInfo()
+        {
+            var source = _connection1;
+            var target = _rootNode;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.AboveItem);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragNodeBelowRootNodeInfo()
+        {
+            var source = _connection1;
+            var target = _rootNode;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.BelowItem);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragPuttySessionInfo()
+        {
+            var source = new PuttySessionInfo();
+            var target = _container2;
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragConnectionOntoRootPuttySessionNode()
+        {
+            var source = _connection1;
+            var target = new RootPuttySessionsNodeInfo();
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragContainerOntoRootPuttySessionNode()
+        {
+            var source = _container1;
+            var target = new RootPuttySessionsNodeInfo();
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.Item);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragNodeAbovePuttySessionNodes()
+        {
+            var source = _connection1;
+            var target = new PuttySessionInfo();
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.AboveItem);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void CantDragNodeBelowPuttySessionNodes()
+        {
+            var source = _connection1;
+            var target = new PuttySessionInfo();
+            var dragDropEffects = _dragAndDropHandler.CanModelDrop(source, target, DropTargetLocation.BelowItem);
+            Assert.That(dragDropEffects, Is.EqualTo(DragDropEffects.None));
+        }
+
+        [Test]
+        public void DraggingNodeBelowSiblingRearrangesTheUnderlyingModelCorrectly()
+        {
+            var source = _connection3;
+            var target = _connection5;
+            var location = DropTargetLocation.BelowItem;
+            _dragAndDropHandler.DropModel(source, target, location);
+            var actualIndex = _container3.Children.IndexOf(source);
+            var expectedIndex = _container3.Children.IndexOf(target) + 1;
+            Assert.That(actualIndex, Is.EqualTo(expectedIndex));
+        }
+
+        [Test]
+        public void DraggingNodeAboveSiblingRearrangesTheUnderlyingModelCorrectly()
+        {
+            var source = _connection3;
+            var target = _connection5;
+            var location = DropTargetLocation.AboveItem;
+            _dragAndDropHandler.DropModel(source, target, location);
+            var actualIndex = _container3.Children.IndexOf(source);
+            var expectedIndex = _container3.Children.IndexOf(target) - 1;
+            Assert.That(actualIndex, Is.EqualTo(expectedIndex));
+        }
+
+        [Test]
+        public void DraggingNodeToNewContainerAddsNodeToTheNewContainer()
+        {
+            var source = _connection3;
+            var target = _container1;
+            var location = DropTargetLocation.Item;
+            _dragAndDropHandler.DropModel(source, target, location);
+            Assert.That(target.Children.Contains(source));
+        }
+
+        [Test]
+        public void DraggingNodeToNewContainerRemovesNodeFromOldContainer()
+        {
+            var source = _connection3;
+            var target = _container1;
+            var location = DropTargetLocation.Item;
+            _dragAndDropHandler.DropModel(source, target, location);
+            Assert.That(!_container3.Children.Contains(source));
+        }
+
+
+        private void InitializeNodes()
+        {
+            _rootNode = new RootNodeInfo(RootNodeType.Connection);
+            _container1 = new ContainerInfo();
+            _container2 = new ContainerInfo();
+            _container3 = new ContainerInfo();
+            _connection1 = new ConnectionInfo();
+            _connection2 = new ConnectionInfo();
+            _connection3 = new ConnectionInfo();
+            _connection4 = new ConnectionInfo();
+            _connection5 = new ConnectionInfo();
+        }
+
+        private void CreateSimpleTreeModel()
+        {
+            /*
+             * Root
+             * |-- container1
+             * |   L-- connection1
+             * L-- container2
+             *     |-- container3
+             *     |   |-- connection3
+             *     |   |-- connection4
+             *     |   L-- connection5
+             *     L-- connection2
+             */
+            _rootNode.AddChild(_container1);
+            _rootNode.AddChild(_container2);
+            _container1.AddChild(_connection1);
+            _container2.AddChild(_container3);
+            _container2.AddChild(_connection2);
+            _container3.AddChild(_connection3);
+            _container3.AddChild(_connection4);
+            _container3.AddChild(_connection5);
+        }
+
+        private void DestroyNodes()
+        {
+            _rootNode = null;
+            _container1 = null;
+            _container2 = null;
+            _container3 = null;
+            _connection1 = null;
+            _connection2 = null;
+            _connection3 = null;
+            _connection4 = null;
+            _connection5 = null;
+        }
+    }
+}

mRemoteNGTests/Tree/ConnectionTreeModelTests.cs

@@ -0,0 +1,40 @@
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Tree;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Tree
+{
+    public class ConnectionTreeModelTests
+    {
+        private ConnectionTreeModel _connectionTreeModel;
+
+        [SetUp]
+        public void Setup()
+        {
+            _connectionTreeModel = new ConnectionTreeModel();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _connectionTreeModel = null;
+        }
+
+        [Test]
+        public void GetChildListProvidesAllChildren()
+        {
+            var root = new ContainerInfo();
+            var folder1 = new ContainerInfo();
+            var folder2 = new ContainerInfo();
+            var con1 = new ConnectionInfo();
+            root.AddChild(folder1);
+            folder1.AddChild(folder2);
+            root.AddChild(con1);
+            _connectionTreeModel.AddRootNode(root);
+            var connectionList = _connectionTreeModel.GetRecursiveChildList(root);
+            Assert.That(connectionList, Is.EquivalentTo(new[] {folder1,folder2,con1}));
+        }
+    }
+}

mRemoteNGTests/Tree/NodeSearcherTests.cs

@@ -0,0 +1,94 @@
+using System.Linq;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Tree
+{
+    public class NodeSearcherTests
+    {
+        private NodeSearcher _nodeSearcher;
+        private ContainerInfo _folder1;
+        private ContainerInfo _folder2;
+        private ConnectionInfo _con1;
+        private ConnectionInfo _con2;
+        private ConnectionInfo _con3;
+        private ConnectionInfo _con4;
+        private ConnectionInfo _con5;
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            var connectionTreeModel = SetupConnectionTreeModel();
+            _nodeSearcher = new NodeSearcher(connectionTreeModel);
+        }
+
+        [Test]
+        public void SearchByNameReturnsAllExpectedMatches()
+        {
+            var matches = _nodeSearcher.SearchByName("folder");
+            Assert.That(matches.ToList(), Is.EquivalentTo(new[] {_folder1, _folder2}));
+        }
+
+        [Test]
+        public void NextMatchAdvancesTheIterator()
+        {
+            _nodeSearcher.SearchByName("folder");
+            var match1 = _nodeSearcher.CurrentMatch;
+            var match2 = _nodeSearcher.NextMatch();
+            Assert.That(match1, Is.Not.EqualTo(match2));
+        }
+
+        [Test]
+        public void PreviousMatchRollsBackTheIterator()
+        {
+            _nodeSearcher.SearchByName("con");
+            var match1 = _nodeSearcher.CurrentMatch;
+            _nodeSearcher.NextMatch();
+            var match2 = _nodeSearcher.PreviousMatch();
+            Assert.That(match1, Is.EqualTo(match2));
+        }
+
+        [Test]
+        public void SearchingWithEmptyStringReturnsNoMatches()
+        {
+            var matches = _nodeSearcher.SearchByName("");
+            Assert.That(matches.Count(), Is.EqualTo(0));
+        }
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Tree:
+             * Root
+             * |--- folder1
+             * |    |--- con1
+             * |    L--- con2
+             * |--- folder2
+             * |    |--- con3
+             * |    L--- con4
+             * L--- con5
+             * 
+             */
+            var connectionTreeModel = new ConnectionTreeModel();
+            var root = new RootNodeInfo(RootNodeType.Connection);
+            _folder1 = new ContainerInfo { Name = "folder1"};
+            _con1 = new ConnectionInfo { Name = "con1"};
+            _con2 = new ConnectionInfo { Name = "con2"};
+            _folder2 = new ContainerInfo { Name = "folder2" };
+            _con3 = new ConnectionInfo { Name = "con3" };
+            _con4 = new ConnectionInfo { Name = "con4" };
+            _con5 = new ConnectionInfo { Name = "con5" };
+
+            connectionTreeModel.AddRootNode(root);
+            root.AddChildRange(new [] { _folder1, _folder2, _con5 });
+            _folder1.AddChildRange(new [] { _con1, _con2 });
+            _folder2.AddChildRange(new[] { _con3, _con4 });
+
+            return connectionTreeModel;
+        }
+    }
+}

mRemoteNGTests/Tree/RootNodeInfoTests.cs

@@ -0,0 +1,50 @@
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Tree
+{
+    public class RootNodeInfoTests
+    {
+        private RootNodeInfo _rootNodeInfo;
+
+        [SetUp]
+        public void Setup()
+        {
+            _rootNodeInfo = new RootNodeInfo(RootNodeType.Connection);
+        }
+
+        [Test]
+        public void DefaultPasswordReturnsExpectedValue()
+        {
+            var defaultPassword = _rootNodeInfo.DefaultPassword;
+            Assert.That(defaultPassword, Is.EqualTo("mR3m"));
+        }
+
+        [TestCase("a", true)]
+        [TestCase("mR3m", false)]
+        [TestCase("", false)]
+        [TestCase(null, false)]
+        public void PasswordPropertyReflectsWhetherACustomPasswordIsInUse(string password, bool expected)
+        {
+            _rootNodeInfo.PasswordString = password;
+            Assert.That(_rootNodeInfo.Password, Is.EqualTo(expected));
+        }
+
+        [TestCase("")]
+        [TestCase(null)]
+        public void PasswordStringReturnsDefaultPasswordWhenNoCustomOneIsSet(string password)
+        {
+            _rootNodeInfo.PasswordString = password;
+            Assert.That(_rootNodeInfo.PasswordString, Is.EqualTo(_rootNodeInfo.DefaultPassword));
+        }
+
+        [TestCase("a")]
+        [TestCase("1234")]
+        public void PasswordStringReturnsCustomPassword(string password)
+        {
+            _rootNodeInfo.PasswordString = password;
+            Assert.That(_rootNodeInfo.PasswordString, Is.EqualTo(password));
+        }
+    }
+}

mRemoteNGTests/UI/Controls/CustomListViewTests.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using mRemoteNG.Controls;
-using NUnit.Framework;
-using NUnit.Extensions.Forms;
-using System.Windows.Forms;
-
-namespace mRemoteNGTests.UI.Controls
-{
-    public class CustomListViewTests
-    {
-        mRemoteNG.Controls.ListView _listView;
-
-        [SetUp]
-        public void Setup()
-        {
-            _listView = new mRemoteNG.Controls.ListView();
-            _listView.Name = "myTestListView";
-            _listView.View = System.Windows.Forms.View.Tile;
-        }
-
-        [TearDown]
-        public void Teardown()
-        {
-            _listView.Dispose();
-            while (_listView.Disposing) ;
-            _listView = null;
-        }
-    }
-}

mRemoteNGTests/UI/Forms/PasswordFormTests.cs

@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NUnit.Framework;
+using NUnit.Framework;
 using NUnit.Extensions.Forms;
-using System.Threading.Tasks;
-using mRemoteNG.Forms;
 using mRemoteNG.UI.Forms;
 
 namespace mRemoteNGTests.UI.Forms
@@ -26,7 +20,9 @@ namespace mRemoteNGTests.UI.Forms
         public void Teardown()
         {
             _passwordForm.Dispose();
-            while (_passwordForm.Disposing) ;
+            while (_passwordForm.Disposing)
+            {
+            }
             _passwordForm = null;
         }
 

mRemoteNGTests/mRemoteNGTests.csproj

@@ -66,18 +66,23 @@
       <HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NUnitForms">
       <HintPath>nUnitForms\bin\NUnitForms.dll</HintPath>
     </Reference>
+    <Reference Include="ObjectListView, Version=2.9.1.1072, Culture=neutral, PublicKeyToken=b1c5bf581481bcd4, processorArchitecture=MSIL">
+      <HintPath>..\packages\ObjectListView.Official.2.9.1\lib\net20\ObjectListView.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.9.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
       <HintPath>..\packages\DockPanelSuite.2.10.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
       <Private>True</Private>
@@ -86,6 +91,7 @@
       <HintPath>..\packages\DockPanelSuite.ThemeVS2012Light.2.10.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012Light.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -102,18 +108,46 @@
   <ItemGroup>
     <Compile Include="App\LoggerTests.cs" />
     <Compile Include="BinaryFileTests.cs" />
+    <Compile Include="Config\Serializers\DataTableSerializerTests.cs" />
+    <Compile Include="Config\Serializers\PortScanDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\PuttyConnectionManagerDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\XmlConnectionNodeSerializerTests.cs" />
+    <Compile Include="Config\Serializers\XmlConnectionsDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\RemoteDesktopConnectionDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\RemoteDesktopConnectionManagerDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\XmlConnectionsDocumentCompilerTests.cs" />
+    <Compile Include="Config\Serializers\XmlConnectionsDocumentEncryptorTests.cs" />
+    <Compile Include="Config\Serializers\XmlConnectionsSerializerTests.cs" />
+    <Compile Include="Config\Serializers\XmlRootNodeSerializerTests.cs" />
+    <Compile Include="Connection\AbstractConnectionInfoDataTests.cs" />
+    <Compile Include="Connection\ConnectionInfoComparerTests.cs" />
+    <Compile Include="Connection\Protocol\ProtocolListTests.cs" />
+    <Compile Include="IntegrationTests\XmlSerializationLifeCycleTests.cs" />
+    <Compile Include="Security\Authentication\PasswordAuthenticatorTests.cs" />
+    <Compile Include="Security\KeyDerivation\Pkcs5S2KeyGeneratorTests.cs" />
+    <Compile Include="Security\SecureStringExtensionsTests.cs" />
+    <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
+    <Compile Include="Tree\ConnectionTreeDragAndDropHandlerTests.cs" />
+    <Compile Include="Tree\ConnectionTreeModelTests.cs" />
     <Compile Include="Connection\ConnectionInfoInheritanceTests.cs" />
+    <Compile Include="Connection\ConnectionInfoTests.cs" />
+    <Compile Include="Connection\DefaultConnectionInfoTests.cs" />
     <Compile Include="Connection\DefaultConnectionInheritanceTests.cs" />
+    <Compile Include="Container\ContainerInfoTests.cs" />
+    <Compile Include="IntegrationTests\ConnectionInheritanceIntegrationTests.cs" />
     <Compile Include="ListViewTester.cs" />
-    <Compile Include="Config\Connections\SqlConnectionUpdateCheckerTests.cs" />
-    <Compile Include="Config\Connections\SqlUpdateQueryBuilderTest.cs" />
-    <Compile Include="Config\Connections\SqlUpdateTimerTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Security\AeadCryptographyProviderTests.cs" />
     <Compile Include="Security\CryptographyProviderFactoryTests.cs" />
     <Compile Include="Security\EncryptedSecureStringTests.cs" />
     <Compile Include="Security\LegacyRijndaelCryptographyProviderTests.cs" />
-    <Compile Include="UI\Controls\CustomListViewTests.cs" />
+    <Compile Include="Tree\NodeSearcherTests.cs" />
+    <Compile Include="Tree\RootNodeInfoTests.cs" />
     <Compile Include="UI\Controls\TestForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -134,10 +168,39 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="UI\Controls\TestForm.resx">
       <DependentUpon>TestForm.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\confCons_v2_5.xml" />
+    <None Include="Resources\test_puttyConnectionManager_database.dat" />
+    <None Include="Resources\test_rdcman_badVersionNumber.rdg" />
+    <None Include="Resources\test_rdcman_noversion.rdg" />
+    <None Include="Resources\test_rdcman_v2_2_badschemaversion.rdg" />
+    <None Include="Resources\test_rdcman_v2_2_schema1.rdg" />
+    <None Include="Resources\test_RDCMan_v2_7_schema3.rdg" />
+    <None Include="Resources\test_remotedesktopconnection.rdp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\confCons_v2_6.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\confCons_v2_6_fullencryption.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\confCons_v2_6_passwordis_Password.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\confCons_v2_6_passwordis_Password_fullencryption.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\confCons_v2_6_5k-iterations.xml" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

mRemoteNGTests/packages.config

@@ -4,5 +4,6 @@
   <package id="DockPanelSuite" version="2.10.0" targetFramework="net45" />
   <package id="DockPanelSuite.ThemeVS2012Light" version="2.10.0" targetFramework="net45" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
-  <package id="NUnit" version="3.4.1" targetFramework="net45" />
+  <package id="NUnit" version="3.5.0" targetFramework="net45" />
+  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net45" />
 </packages>

mRemoteV1/App/CompatibilityChecker.cs

@@ -20,7 +20,7 @@ namespace mRemoteNG.App
         {
             if (FipsPolicyEnabledForServer2003() || FipsPolicyEnabledForServer2008AndNewer())
             {
-                MessageBox.Show(frmMain.Default, string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProdName, GeneralAppInfo.ProdName, MessageBoxButtons.OK, MessageBoxIcon.Error));
+                MessageBox.Show(frmMain.Default, string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName, GeneralAppInfo.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error));
                 Environment.Exit(1);
             }
         }
@@ -53,7 +53,7 @@ namespace mRemoteNG.App
             {
                 proccesses = Process.GetProcessesByName("virtscrl");
             }
-            catch (Exception ex)
+            catch (InvalidOperationException ex)
             {
                 Runtime.MessageCollector.AddExceptionMessage("Error in CheckLenovoAutoScrollUtility", ex);
             }

mRemoteV1/App/Export.cs

@@ -1,98 +1,102 @@
 using System;
+using System.Linq;
 using System.Windows.Forms;
-using mRemoteNG.Forms;
 using mRemoteNG.Config.Connections;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
 using mRemoteNG.UI.Forms;
 
 
 namespace mRemoteNG.App
 {
-	public class Export
+	public static class Export
 	{
-		public static void ExportToFile(TreeNode rootTreeNode, TreeNode selectedTreeNode)
+		public static void ExportToFile(ConnectionInfo selectedNode, ConnectionTreeModel connectionTreeModel)
 		{
 			try
 			{
-				TreeNode exportTreeNode = default(TreeNode);
-				Security.Save saveSecurity = new Security.Save();
+			    var saveSecurity = new SaveFilter();
 					
-				using (ExportForm exportForm = new ExportForm())
+				using (var exportForm = new ExportForm())
 				{
-					if (Tree.ConnectionTreeNode.GetNodeType(selectedTreeNode) == Tree.TreeNodeType.Container)
+					if (selectedNode?.GetTreeNodeType() == TreeNodeType.Container)
+						exportForm.SelectedFolder = selectedNode as ContainerInfo;
+					else if (selectedNode?.GetTreeNodeType() == TreeNodeType.Connection)
 					{
-						exportForm.SelectedFolder = selectedTreeNode;
-					}
-					else if (Tree.ConnectionTreeNode.GetNodeType(selectedTreeNode) == Tree.TreeNodeType.Connection)
-					{
-						if (Tree.ConnectionTreeNode.GetNodeType(selectedTreeNode.Parent) == Tree.TreeNodeType.Container)
-						{
-							exportForm.SelectedFolder = selectedTreeNode.Parent;
-						}
-						exportForm.SelectedConnection = selectedTreeNode;
+						if (selectedNode.Parent.GetTreeNodeType() == TreeNodeType.Container)
+							exportForm.SelectedFolder = selectedNode.Parent;
+						exportForm.SelectedConnection = selectedNode;
 					}
 						
 					if (exportForm.ShowDialog(frmMain.Default) != DialogResult.OK)
-					{
 						return ;
-					}
-						
-					switch (exportForm.Scope)
+
+				    ConnectionInfo exportTarget;
+				    switch (exportForm.Scope)
 					{
-						case mRemoteNG.Forms.ExportForm.ExportScope.SelectedFolder:
-							exportTreeNode = exportForm.SelectedFolder;
+						case ExportForm.ExportScope.SelectedFolder:
+							exportTarget = exportForm.SelectedFolder;
 							break;
-                        case mRemoteNG.Forms.ExportForm.ExportScope.SelectedConnection:
-							exportTreeNode = exportForm.SelectedConnection;
+                        case ExportForm.ExportScope.SelectedConnection:
+							exportTarget = exportForm.SelectedConnection;
 							break;
 						default:
-							exportTreeNode = rootTreeNode;
+							exportTarget = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
 							break;
 					}
 						
-					saveSecurity.Username = exportForm.IncludeUsername;
-					saveSecurity.Password = exportForm.IncludePassword;
-					saveSecurity.Domain = exportForm.IncludeDomain;
-					saveSecurity.Inheritance = exportForm.IncludeInheritance;
+					saveSecurity.SaveUsername = exportForm.IncludeUsername;
+					saveSecurity.SavePassword = exportForm.IncludePassword;
+					saveSecurity.SaveDomain = exportForm.IncludeDomain;
+					saveSecurity.SaveInheritance = exportForm.IncludeInheritance;
 						
-					SaveExportFile(exportForm.FileName, exportForm.SaveFormat, exportTreeNode, saveSecurity);
+					SaveExportFile(exportForm.FileName, exportForm.SaveFormat, saveSecurity, exportTarget);
 				}
 					
 			}
 			catch (Exception ex)
 			{
-                Runtime.MessageCollector.AddExceptionMessage(message: "App.Export.ExportToFile() failed.", ex: ex, logOnly: true);
+                Runtime.MessageCollector.AddExceptionMessage("App.Export.ExportToFile() failed.", ex, logOnly: true);
 			}
 		}
 			
-		private static void SaveExportFile(string fileName, ConnectionsSaver.Format saveFormat, TreeNode rootNode, Security.Save saveSecurity)
+		private static void SaveExportFile(string fileName, ConnectionsSaver.Format saveFormat, SaveFilter saveFilter, ConnectionInfo exportTarget)
 		{
 			try
 			{
-                if (Runtime.SQLConnProvider != null)
-				{
-                    Runtime.SQLConnProvider.Disable();
-				}
-					
-				ConnectionsSaver connectionsSave = new ConnectionsSaver();
-				connectionsSave.Export = true;
-				connectionsSave.ConnectionFileName = fileName;
-				connectionsSave.SaveFormat = saveFormat;
-                connectionsSave.ConnectionList = Runtime.ConnectionList;
-                connectionsSave.ContainerList = Runtime.ContainerList;
-				connectionsSave.RootTreeNode = rootNode;
-				connectionsSave.SaveSecurity = saveSecurity;
-				connectionsSave.SaveConnections();
+			    ISerializer<string> serializer;
+			    switch (saveFormat)
+			    {
+			        case ConnectionsSaver.Format.mRXML:
+                        var factory = new CryptographyProviderFactory();
+                        var cryptographyProvider = factory.CreateAeadCryptographyProvider(mRemoteNG.Settings.Default.EncryptionEngine, mRemoteNG.Settings.Default.EncryptionBlockCipherMode);
+                        cryptographyProvider.KeyDerivationIterations = Settings.Default.EncryptionKeyDerivationIterations;
+                        serializer = new XmlConnectionsSerializer(cryptographyProvider);
+			            ((XmlConnectionsSerializer) serializer).SaveFilter = saveFilter;
+			            break;
+			        case ConnectionsSaver.Format.mRCSV:
+                        serializer = new CsvConnectionsSerializerMremotengFormat();
+                        ((CsvConnectionsSerializerMremotengFormat)serializer).SaveFilter = saveFilter;
+                        break;
+			        default:
+			            throw new ArgumentOutOfRangeException(nameof(saveFormat), saveFormat, null);
+			    }
+			    var serializedData = serializer.Serialize(exportTarget);
+			    var fileDataProvider = new FileDataProvider(fileName);
+                fileDataProvider.Save(serializedData);
 			}
 			catch (Exception ex)
 			{
-				Runtime.MessageCollector.AddExceptionMessage(string.Format("Export.SaveExportFile(\"{0}\") failed.", fileName), ex);
+			    Runtime.MessageCollector.AddExceptionStackTrace($"Export.SaveExportFile(\"{fileName}\") failed.", ex);
 			}
 			finally
 			{
-                if (Runtime.SQLConnProvider != null)
-				{
-                    Runtime.SQLConnProvider.Enable();
-				}
+			    Runtime.RemoteConnectionsSyncronizer?.Enable();
 			}
 		}
 	}

mRemoteV1/App/Import.cs

@@ -1,20 +1,17 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using mRemoteNG.Config.Import;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
-using mRemoteNG.Tree;
-using mRemoteNG.UI.TaskDialog;
+using mRemoteNG.Tools;
+
 
 namespace mRemoteNG.App
 {
-    public class Import
+    public static class Import
     {
-        #region Private Enumerations
-
         private enum FileType
         {
             Unknown = 0,
@@ -25,12 +22,8 @@ namespace mRemoteNG.App
             PuttyConnectionManager
         }
 
-        #endregion
-
         #region Public Methods
-
-        public static void ImportFromFile(TreeNode rootTreeNode, TreeNode selectedTreeNode,
-            bool alwaysUseSelectedTreeNode = false)
+        public static void ImportFromFile(ContainerInfo importDestinationContainer)
         {
             try
             {
@@ -51,37 +44,32 @@ namespace mRemoteNG.App
                     openFileDialog.Filter = string.Join("|", fileTypes.ToArray());
 
                     if (openFileDialog.ShowDialog() != DialogResult.OK)
-                    {
                         return;
-                    }
-
-                    var parentTreeNode = GetParentTreeNode(rootTreeNode, selectedTreeNode, alwaysUseSelectedTreeNode);
-                    if (parentTreeNode == null)
-                    {
-                        return;
-                    }
 
                     foreach (var fileName in openFileDialog.FileNames)
                     {
                         try
                         {
+                            IConnectionImporter importer;
+                            // ReSharper disable once SwitchStatementMissingSomeCases
                             switch (DetermineFileType(fileName))
                             {
                                 case FileType.mRemoteXml:
-                                    Config.Import.mRemoteNG.Import(fileName, parentTreeNode);
+                                    importer = new mRemoteNGImporter();
                                     break;
                                 case FileType.RemoteDesktopConnection:
-                                    RemoteDesktopConnection.Import(fileName, parentTreeNode);
+                                    importer = new RemoteDesktopConnectionImporter();
                                     break;
                                 case FileType.RemoteDesktopConnectionManager:
-                                    RemoteDesktopConnectionManager.Import(fileName, parentTreeNode);
+                                    importer = new RemoteDesktopConnectionManagerImporter();
                                     break;
                                 case FileType.PuttyConnectionManager:
-                                    PuttyConnectionManager.Import(fileName, parentTreeNode);
+                                    importer = new PuttyConnectionManagerImporter();
                                     break;
                                 default:
                                     throw new FileFormatException("Unrecognized file format.");
                             }
+                            importer.Import(fileName, importDestinationContainer);
                         }
                         catch (Exception ex)
                         {
@@ -91,14 +79,7 @@ namespace mRemoteNG.App
                         }
                     }
 
-                    parentTreeNode.Expand();
-                    var parentContainer = (ContainerInfo) parentTreeNode.Tag;
-                    if (parentContainer != null)
-                    {
-                        parentContainer.IsExpanded = true;
-                    }
-
-                    Runtime.SaveConnectionsBG();
+                    Runtime.SaveConnectionsAsync();
                 }
             }
             catch (Exception ex)
@@ -107,60 +88,26 @@ namespace mRemoteNG.App
             }
         }
 
-        public static void ImportFromActiveDirectory(string ldapPath)
+        public static void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOU)
         {
             try
             {
-                var rootTreeNode = ConnectionTree.TreeView.Nodes[0];
-                var selectedTreeNode = ConnectionTree.TreeView.SelectedNode;
-
-                var parentTreeNode = GetParentTreeNode(rootTreeNode, selectedTreeNode);
-                if (parentTreeNode == null)
-                {
-                    return;
-                }
-
-                ActiveDirectory.Import(ldapPath, parentTreeNode);
-
-                parentTreeNode.Expand();
-                var parentContainer = (ContainerInfo) parentTreeNode.Tag;
-                if (parentContainer != null)
-                {
-                    parentContainer.IsExpanded = true;
-                }
-
-                Runtime.SaveConnectionsBG();
+                ActiveDirectoryImporter.Import(ldapPath, importDestinationContainer, importSubOU);
+                Runtime.SaveConnectionsAsync();
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage("App.Import.ImportFromActiveDirectory() failed.", ex,
-                    logOnly: true);
+                Runtime.MessageCollector.AddExceptionMessage("App.Import.ImportFromActiveDirectory() failed.", ex, logOnly: true);
             }
         }
 
-        public static void ImportFromPortScan(IEnumerable hosts, ProtocolType protocol)
+        public static void ImportFromPortScan(IEnumerable<ScanHost> hosts, ProtocolType protocol, ContainerInfo importDestinationContainer)
         {
             try
             {
-                var rootTreeNode = ConnectionTree.TreeView.Nodes[0];
-                var selectedTreeNode = ConnectionTree.TreeView.SelectedNode;
-
-                var parentTreeNode = GetParentTreeNode(rootTreeNode, selectedTreeNode);
-                if (parentTreeNode == null)
-                {
-                    return;
-                }
-
-                PortScan.Import(hosts, protocol, parentTreeNode);
-
-                parentTreeNode.Expand();
-                var parentContainer = (ContainerInfo) parentTreeNode.Tag;
-                if (parentContainer != null)
-                {
-                    parentContainer.IsExpanded = true;
-                }
-
-                Runtime.SaveConnectionsBG();
+                var importer = new PortScanImporter(protocol);
+                importer.Import(hosts, importDestinationContainer);
+                Runtime.SaveConnectionsAsync();
             }
             catch (Exception ex)
             {
@@ -168,70 +115,14 @@ namespace mRemoteNG.App
                     logOnly: true);
             }
         }
-
         #endregion
 
-        #region Private Methods
-
-        private static TreeNode GetParentTreeNode(TreeNode rootTreeNode, TreeNode selectedTreeNode,
-            bool alwaysUseSelectedTreeNode = false)
-        {
-            TreeNode parentTreeNode;
-
-            selectedTreeNode = GetContainerTreeNode(selectedTreeNode);
-            if (selectedTreeNode == null || selectedTreeNode == rootTreeNode)
-            {
-                parentTreeNode = rootTreeNode;
-            }
-            else
-            {
-                if (alwaysUseSelectedTreeNode)
-                {
-                    parentTreeNode = GetContainerTreeNode(selectedTreeNode);
-                }
-                else
-                {
-                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.strImportLocationMainInstruction,
-                        Language.strImportLocationContent, "", "", "",
-                        string.Format(Language.strImportLocationCommandButtons, Environment.NewLine, rootTreeNode.Text,
-                            selectedTreeNode.Text), true, ESysIcons.Question, 0);
-                    switch (CTaskDialog.CommandButtonResult)
-                    {
-                        case 0: // Root
-                            parentTreeNode = rootTreeNode;
-                            break;
-                        case 1: // Selected Folder
-                            parentTreeNode = GetContainerTreeNode(selectedTreeNode);
-                            break;
-                        default: // Cancel
-                            parentTreeNode = null;
-                            break;
-                    }
-                }
-            }
-
-            return parentTreeNode;
-        }
-
-        private static TreeNode GetContainerTreeNode(TreeNode treeNode)
-        {
-            if ((ConnectionTreeNode.GetNodeType(treeNode) == TreeNodeType.Root) ||
-                (ConnectionTreeNode.GetNodeType(treeNode) == TreeNodeType.Container))
-            {
-                return treeNode;
-            }
-            if (ConnectionTreeNode.GetNodeType(treeNode) == TreeNodeType.Connection)
-            {
-                return treeNode.Parent;
-            }
-            return null;
-        }
-
         private static FileType DetermineFileType(string fileName)
         {
             // TODO: Use the file contents to determine the file type instead of trusting the extension
-            var fileExtension = Convert.ToString(Path.GetExtension(fileName).ToLowerInvariant());
-            switch (fileExtension)
+            var extension = Path.GetExtension(fileName);
+            if (extension == null) return FileType.Unknown;
+            switch (extension.ToLowerInvariant())
             {
                 case ".xml":
                     return FileType.mRemoteXml;
@@ -245,7 +136,5 @@ namespace mRemoteNG.App
                     return FileType.Unknown;
             }
         }
-
-        #endregion
     }
 }

mRemoteV1/App/Info/ConnectionsFileInfo.cs

@@ -1,10 +1,10 @@
 namespace mRemoteNG.App.Info
 {
-    public class ConnectionsFileInfo
+    public static class ConnectionsFileInfo
     {
         public static readonly string DefaultConnectionsPath = SettingsFileInfo.SettingsPath;
         public static readonly string DefaultConnectionsFile = "confCons.xml";
         public static readonly string DefaultConnectionsFileNew = "confConsNew.xml";
-        public static readonly double ConnectionFileVersion = 2.5;
+        public static readonly double ConnectionFileVersion = 2.6;
     }
 }

mRemoteV1/App/Info/GeneralAppInfo.cs

@@ -2,10 +2,8 @@ using System.Collections.Generic;
 using System;
 using System.IO;
 using System.Reflection;
-using System.Security;
 using System.Threading;
 using System.Windows.Forms;
-using mRemoteNG.Security;
 using static System.Environment;
 
 
@@ -17,11 +15,10 @@ namespace mRemoteNG.App.Info
 		public static readonly string UrlDonate = "http://donate.mremoteng.org/";
 		public static readonly string UrlForum = "http://forum.mremoteng.org/";
 		public static readonly string UrlBugs = "http://bugs.mremoteng.org/";
-	    public static readonly string version = Application.ProductVersion;
-        public static readonly string ProdName = Application.ProductName;
-        public static readonly string copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(AssemblyCopyrightAttribute), false)).Copyright;
-        public static readonly string HomePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-		public static readonly SecureString EncryptionKey = "mR3m".ConvertToSecureString();
+	    public static readonly string ApplicationVersion = Application.ProductVersion;
+        public static readonly string ProductName = Application.ProductName;
+        public static readonly string Copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(AssemblyCopyrightAttribute), false)).Copyright;
+        public static readonly string HomePath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
 		public static string ReportingFilePath = "";
 		public static readonly string PuttyPath = HomePath + "\\PuTTYNG.exe";
         public static string UserAgent
@@ -31,22 +28,22 @@ namespace mRemoteNG.App.Info
 			    var details = new List<string>();
 			    details.Add("compatible");
 			    details.Add(OSVersion.Platform == PlatformID.Win32NT ? $"Windows NT {OSVersion.Version.Major}.{OSVersion.Version.Minor}": OSVersion.VersionString);
-			    if (Tools.EnvironmentInfo.IsWow64)
+			    if (Is64BitProcess)
 				{
 					details.Add("WOW64");
 				}
 				details.Add(Thread.CurrentThread.CurrentUICulture.Name);
 				details.Add($".NET CLR {Environment.Version}");
-				string detailsString = string.Join("; ", details.ToArray());
+				var detailsString = string.Join("; ", details.ToArray());
 						
-				return $"Mozilla/5.0 ({detailsString}) {ProdName}/{version}";
+				return $"Mozilla/5.0 ({detailsString}) {ProductName}/{ApplicationVersion}";
 			}
 		}
 
-	    public static Version getVer()
+	    public static Version GetApplicationVersion()
 	    {
-	        System.Version v = new Version();
-            System.Version.TryParse(version, out v);
+            Version v;
+            System.Version.TryParse(ApplicationVersion, out v);
 	        return v;
 	    }
 	}

mRemoteV1/App/Info/SettingsFileInfo.cs

@@ -1,14 +1,15 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Reflection;
+#if !PORTABLE
 using System.Windows.Forms;
+#endif
 
 namespace mRemoteNG.App.Info
 {
-    public class SettingsFileInfo
+    public static class SettingsFileInfo
     {
         //public static readonly string exe = Assembly.GetExecutingAssembly().GetName().CodeBase;
-        public static readonly string exePath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+        public static readonly string exePath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
 #if !PORTABLE
         public static readonly string SettingsPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName;
 #else

mRemoteV1/App/Info/UpdateChannelInfo.cs

@@ -1,20 +1,34 @@
 namespace mRemoteNG.App.Info
 {
-    public class UpdateChannelInfo
+    public static class UpdateChannelInfo
     {
         public static string FileName
         {
+#if PORTABLE
             get
             {
-                #if DEBUG
-				return "update-debug.txt";
-                #else
-                if ((string)(mRemoteNG.Settings.Default.UpdateChannel.ToLowerInvariant()) == "debug")
-                    return "update-debug.txt";
-                else
-                    return "update.txt";
-                #endif
+                /*                                   */
+                /* return PORTABLE update files here */
+                /*                                   */
+#if DEBUG
+                return "update-portable-debug.txt";
+#else
+                return Settings.Default.UpdateChannel.ToLowerInvariant() == "debug" ? "update-portable-debug.txt" : "update-portable.txt";
+#endif 
             }
+#else //NOT portable
+            get
+            {
+                /*                                    */
+                /* return INSTALLER update files here */
+                /*                                    */
+#if DEBUG
+				return "update-debug.txt";
+#else
+                return Settings.Default.UpdateChannel.ToLowerInvariant() == "debug" ? "update-debug.txt" : "update.txt";
+#endif
+            }
+#endif //endif for PORTABLE
         }
     }
 }

mRemoteV1/App/Logger.cs

@@ -15,13 +15,7 @@ namespace mRemoteNG.App
         private static readonly Logger _loggerInstance = new Logger();
         private ILog _log;
 
-        public static ILog Instance
-        {
-            get
-            {
-                return _loggerInstance._log;
-            }
-        }
+        public static ILog Instance => _loggerInstance._log;
 
         private Logger()
         {
@@ -39,16 +33,13 @@ namespace mRemoteNG.App
 
             ILoggerRepository repository = LogManager.GetRepository();
             IAppender[] appenders = repository.GetAppenders();
-            
-            FileAppender fileAppender = default(FileAppender);
+
             foreach (IAppender appender in appenders)
             {
-                fileAppender = appender as FileAppender;
-                if (!(fileAppender == null || fileAppender.Name != "LogFileAppender"))
-                {
-                    fileAppender.File = logFile;
-                    fileAppender.ActivateOptions();
-                }
+                var fileAppender = (RollingFileAppender)appender;
+                if (fileAppender == null || fileAppender.Name != "LogFileAppender") continue;
+                fileAppender.File = logFile;
+                fileAppender.ActivateOptions();
             }
             _log = LogManager.GetLogger("Logger");
         }

mRemoteV1/App/NativeMethods.cs

@@ -7,79 +7,79 @@ namespace mRemoteNG.App
     public static class NativeMethods
     {
         #region Functions
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool AppendMenu(IntPtr hMenu, int uFlags, IntPtr uIDNewItem, string lpNewItem);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr CreatePopupMenu();
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr GetForegroundWindow();
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool InsertMenu(IntPtr hMenu, int uPosition, int uFlags, IntPtr uIDNewItem, string lpNewItem);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern int IsIconic(IntPtr hWnd);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool MoveWindow(IntPtr hWnd, int x, int y, int cx, int cy, bool repaint);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern bool PostMessage(IntPtr hWnd, uint Msg, int wParam, int lParam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        internal static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern int SendMessage(IntPtr hWnd, int msg, int wparam, int lparam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        internal static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        internal static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, System.Text.StringBuilder lParam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        internal static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, System.Text.StringBuilder lParam);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool SetForegroundWindow(IntPtr hWnd);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool SetMenuItemBitmaps(IntPtr hMenu, int uPosition, int uFlags, IntPtr hBitmapUnchecked, IntPtr hBitmapChecked);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern long SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, long dwNewLong);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern int ShowWindow(IntPtr hWnd, int nCmdShow);
 			
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr WindowFromPoint(Point point);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern void GetClassName(IntPtr hWnd, System.Text.StringBuilder lpClassName, int nMaxCount);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        internal static extern int GetClassName(IntPtr hWnd, System.Text.StringBuilder lpClassName, int nMaxCount);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern int GetDlgCtrlID(int hwndCtl);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        internal static extern int GetDlgCtrlID(IntPtr hwndCtl);
 
         [DllImport("user32", ExactSpelling = true, CharSet = CharSet.Ansi, SetLastError = true)]
-        public static extern bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
+        internal static extern bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
 
         [DllImport("user32", ExactSpelling = true, CharSet = CharSet.Ansi, SetLastError = true)]
-        public static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
+        internal static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
         #endregion
 
         #region Structures
         [StructLayout(LayoutKind.Sequential)]
-        public struct WINDOWPOS
+        internal struct WINDOWPOS
         {
             public IntPtr hwnd;
             public IntPtr hwndInsertAfter;
@@ -90,7 +90,7 @@ namespace mRemoteNG.App
             public int flags;
         }
 
-        public struct WINDOWPLACEMENT
+        internal struct WINDOWPLACEMENT
         {
             public uint length;
             public uint flags;
@@ -100,13 +100,13 @@ namespace mRemoteNG.App
             public RECT rcNormalPosition;
         }
 
-        public struct POINT
+        internal struct POINT
         {
             public long x;
             public long y;
         }
 
-        public struct RECT
+        internal struct RECT
         {
             public long left;
             public long top;

mRemoteV1/App/ProgramRoot.cs

@@ -24,6 +24,8 @@ namespace mRemoteNG.App
 
         private static void StartApplication()
         {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
             Startup.Instance.InitializeProgram();
             Application.Run(frmMain.Default);
         }
@@ -35,7 +37,7 @@ namespace mRemoteNG.App
 
         private static void StartApplicationAsSingleInstance()
         {
-            var mutexID = "mRemoteNG_SingleInstanceMutex";
+            const string mutexID = "mRemoteNG_SingleInstanceMutex";
             bool newInstanceCreated;
             mutex = new Mutex(false, mutexID, out newInstanceCreated);
             if (!newInstanceCreated)
@@ -51,18 +53,16 @@ namespace mRemoteNG.App
         private static void SwitchToCurrentInstance()
         {
             var singletonInstanceWindowHandle = GetRunningSingletonInstanceWindowHandle();
-            if (singletonInstanceWindowHandle != IntPtr.Zero)
-            {
-                if (NativeMethods.IsIconic(singletonInstanceWindowHandle) != 0)
-                    NativeMethods.ShowWindow(singletonInstanceWindowHandle, (int)NativeMethods.SW_RESTORE);
-            }
+            if (singletonInstanceWindowHandle == IntPtr.Zero) return;
+            if (NativeMethods.IsIconic(singletonInstanceWindowHandle) != 0)
+                NativeMethods.ShowWindow(singletonInstanceWindowHandle, (int)NativeMethods.SW_RESTORE);
         }
 
         private static IntPtr GetRunningSingletonInstanceWindowHandle()
         {
             var windowHandle = IntPtr.Zero;
             var currentProcess = Process.GetCurrentProcess();
-            foreach (Process enumeratedProcess in Process.GetProcessesByName(currentProcess.ProcessName))
+            foreach (var enumeratedProcess in Process.GetProcessesByName(currentProcess.ProcessName))
             {
                 if (enumeratedProcess.Id != currentProcess.Id && enumeratedProcess.MainModule.FileName == currentProcess.MainModule.FileName && enumeratedProcess.MainWindowHandle != IntPtr.Zero)
                     windowHandle = enumeratedProcess.MainWindowHandle;

mRemoteV1/App/Screens.cs

@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
 using mRemoteNG.UI.Forms;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.App
 {
-    public class Screens
+    public static class Screens
     {
         public static void SendFormToScreen(Screen Screen)
         {
@@ -30,8 +27,11 @@ namespace mRemoteNG.App
         public static void SendPanelToScreen(DockContent Panel, Screen Screen)
         {
             Panel.DockState = DockState.Float;
-            Panel.ParentForm.Left = Screen.Bounds.Location.X;
-            Panel.ParentForm.Top = Screen.Bounds.Location.Y;
+            if (Panel.ParentForm != null)
+            {
+                Panel.ParentForm.Left = Screen.Bounds.Location.X;
+                Panel.ParentForm.Top = Screen.Bounds.Location.Y;
+            }
         }
     }
 }

mRemoteV1/App/Shutdown.cs

@@ -1,23 +1,16 @@
-using mRemoteNG.Messages;
-using mRemoteNG.Tools;
+using mRemoteNG.Tools;
 using System;
 using System.Diagnostics;
-using mRemoteNG.My;
+using mRemoteNG.Config.Putty;
 using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
-    public class Shutdown
+    public static class Shutdown
     {
-        private static string _updateFilePath = null;
+        private static string _updateFilePath;
 
-        public static bool UpdatePending
-        {
-            get
-            {
-                return !string.IsNullOrEmpty(_updateFilePath);
-            }
-        }
+        private static bool UpdatePending => !string.IsNullOrEmpty(_updateFilePath);
 
         public static void Quit(string updateFilePath = null)
         {
@@ -38,13 +31,13 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strSettingsCouldNotBeSavedOrTrayDispose + Environment.NewLine + ex.Message, true);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.strSettingsCouldNotBeSavedOrTrayDispose, ex);
             }
         }
 
         private static void StopPuttySessionWatcher()
         {
-            Config.Putty.Sessions.StopWatcher();
+            PuttySessionsManager.Instance.StopWatcher();
         }
 
         private static void DisposeNotificationAreaIcon()
@@ -55,7 +48,7 @@ namespace mRemoteNG.App
 
         private static void SaveConnections()
         {
-            if (mRemoteNG.Settings.Default.SaveConsOnExit)
+            if (Settings.Default.SaveConsOnExit)
                 Runtime.SaveConnections();
         }
 
@@ -77,7 +70,7 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "The update could not be started." + Environment.NewLine + ex.Message, true);
+                Runtime.MessageCollector.AddExceptionStackTrace("The update could not be started.", ex);
             }
         }
 

mRemoteV1/App/Startup.cs

@@ -5,7 +5,6 @@ using mRemoteNG.Connection;
 using mRemoteNG.Messages;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
-using mRemoteNG.UI.Window;
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
@@ -15,20 +14,18 @@ using System.IO;
 using System.Management;
 using System.Threading;
 using System.Windows.Forms;
+using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.UI;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.App
 {
     public class Startup
     {
-        private static readonly Startup _singletonInstance = new Startup();
         private CompatibilityChecker _compatibilityChecker;
         private AppUpdater _appUpdate;
 
-        public static Startup Instance
-        {
-            get { return _singletonInstance; }
-        }
+        public static Startup Instance { get; } = new Startup();
 
         private Startup()
         {
@@ -48,10 +45,10 @@ namespace mRemoteNG.App
             ParseCommandLineArgs();
             IeBrowserEmulation.Register();
             GetConnectionIcons();
+            DefaultConnectionInfo.Instance.LoadFrom(Settings.Default, (a)=>"ConDefault"+a);
             DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, (a)=>"InhDefault"+a);
         }
 
-        
         public void SetDefaultLayout()
         {
             frmMain.Default.pnlDock.Visible = false;
@@ -61,11 +58,11 @@ namespace mRemoteNG.App
             frmMain.Default.pnlDock.DockTopPortion = frmMain.Default.pnlDock.Height * 0.25;
             frmMain.Default.pnlDock.DockBottomPortion = frmMain.Default.pnlDock.Height * 0.25;
 
-            Windows.treePanel.Show(frmMain.Default.pnlDock, DockState.DockLeft);
-            Windows.configPanel.Show(frmMain.Default.pnlDock);
-            Windows.configPanel.DockTo(Windows.treePanel.Pane, DockStyle.Bottom, -1);
+            Windows.TreePanel.Show(frmMain.Default.pnlDock, DockState.DockLeft);
+            Windows.ConfigPanel.Show(frmMain.Default.pnlDock);
+            Windows.ConfigPanel.DockTo(Windows.TreePanel.Pane, DockStyle.Bottom, -1);
 
-            Windows.screenshotForm.Hide();
+            Windows.ScreenshotForm.Hide();
 
             frmMain.Default.pnlDock.Visible = true;
         }
@@ -86,17 +83,14 @@ namespace mRemoteNG.App
             }
         }
 
-
         private void LogStartupData()
         {
-            if (Settings.Default.WriteLogFile)
-            {
-                LogApplicationData();
-                LogCmdLineArgs();
-                LogSystemData();
-                LogCLRData();
-                LogCultureData();
-            }
+            if (!Settings.Default.WriteLogFile) return;
+            LogApplicationData();
+            LogCmdLineArgs();
+            LogSystemData();
+            LogCLRData();
+            LogCultureData();
         }
 
         private void LogSystemData()
@@ -159,12 +153,12 @@ namespace mRemoteNG.App
 
         private void LogApplicationData()
         {
-            #if !PORTABLE
+#if !PORTABLE
             Logger.Instance.InfoFormat($"{Application.ProductName} {Application.ProductVersion} starting.");
-            #else
+#else
             Logger.Instance.InfoFormat(
                 $"{Application.ProductName} {Application.ProductVersion} {Language.strLabelPortableEdition} starting.");
-            #endif
+#endif
         }
 
         private void LogCmdLineArgs()
@@ -183,16 +177,16 @@ namespace mRemoteNG.App
                 $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}");
         }
 
-
         public void CreateConnectionsProvider()
         {
-            if (Settings.Default.UseSQLServer)
-            {
-                SqlConnectionsProvider _sqlConnectionsProvider = new SqlConnectionsProvider();
-            }
+            frmMain.Default.AreWeUsingSqlServerForSavingConnections = Settings.Default.UseSQLServer;
+
+            if (!Settings.Default.UseSQLServer) return;
+            Runtime.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker());
+            Runtime.RemoteConnectionsSyncronizer.Enable();
         }
 
-        private void CheckForUpdate()
+        public void CheckForUpdate()
         {
             if (_appUpdate == null)
             {
@@ -246,50 +240,6 @@ namespace mRemoteNG.App
         }
 
 
-        private void CheckForAnnouncement()
-        {
-            if (_appUpdate == null)
-                _appUpdate = new AppUpdater();
-            else if (_appUpdate.IsGetAnnouncementInfoRunning)
-                return;
-
-            _appUpdate.GetAnnouncementInfoCompletedEvent += GetAnnouncementInfoCompleted;
-            _appUpdate.GetAnnouncementInfoAsync();
-        }
-
-        private void GetAnnouncementInfoCompleted(object sender, AsyncCompletedEventArgs e)
-        {
-            if (frmMain.Default.InvokeRequired)
-            {
-                frmMain.Default.Invoke(new AsyncCompletedEventHandler(GetAnnouncementInfoCompleted), new object[] { sender, e });
-                return;
-            }
-
-            try
-            {
-                _appUpdate.GetAnnouncementInfoCompletedEvent -= GetAnnouncementInfoCompleted;
-
-                if (e.Cancelled)
-                {
-                    return;
-                }
-                if (e.Error != null)
-                {
-                    throw (e.Error);
-                }
-
-                if (_appUpdate.IsAnnouncementAvailable())
-                {
-                    Windows.Show(WindowType.Announcement);
-                }
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddExceptionMessage("GetAnnouncementInfoCompleted() failed.", ex, MessageClass.ErrorMsg, true);
-            }
-        }
-
-
         private void ParseCommandLineArgs()
         {
             try

mRemoteV1/App/SupportedCultures.cs

@@ -6,34 +6,26 @@ using System.Globalization;
 
 namespace mRemoteNG.App
 {
-	public class SupportedCultures : Dictionary<string, string>
+    [Serializable]
+    public class SupportedCultures : Dictionary<string, string>
 	{
-        private static SupportedCultures _Instance = null;
+        private static SupportedCultures _Instance;
 
-        private static SupportedCultures SingletonInstance
-        {
-            get
-            {
-                if (_Instance == null)
-                    _Instance = new SupportedCultures();
-                return _Instance;
-            }
-        }
-		
+        private static SupportedCultures SingletonInstance => _Instance ?? (_Instance = new SupportedCultures());
 
-        private SupportedCultures()
+
+	    private SupportedCultures()
         {
-            CultureInfo CultureInfo = default(CultureInfo);
-            foreach (string CultureName in Settings.Default.SupportedUICultures.Split(','))
+            foreach (var CultureName in Settings.Default.SupportedUICultures.Split(','))
             {
                 try
                 {
-                    CultureInfo = new CultureInfo(CultureName.Trim());
+                    var CultureInfo = new CultureInfo(CultureName.Trim());
                     Add(CultureInfo.Name, CultureInfo.TextInfo.ToTitleCase(CultureInfo.NativeName));
                 }
                 catch (Exception ex)
                 {
-                    Debug.Print(string.Format("An exception occurred while adding the culture \'{0}\' to the list of supported cultures. {1}", CultureName, ex.ToString()));
+                    Debug.Print($"An exception occurred while adding the culture {CultureName} to the list of supported cultures. {ex.StackTrace}");
                 }
             }
         }
@@ -50,13 +42,13 @@ namespace mRemoteNG.App
 			
 		public static string get_CultureName(string CultureNativeName)
 		{
-			string[] Names = new string[SingletonInstance.Count + 1];
-			string[] NativeNames = new string[SingletonInstance.Count + 1];
+			var Names = new string[SingletonInstance.Count + 1];
+			var NativeNames = new string[SingletonInstance.Count + 1];
 
             SingletonInstance.Keys.CopyTo(Names, 0);
             SingletonInstance.Values.CopyTo(NativeNames, 0);
 				
-			for (int Index = 0; Index <= SingletonInstance.Count; Index++)
+			for (var Index = 0; Index <= SingletonInstance.Count; Index++)
 			{
 				if (NativeNames[Index] == CultureNativeName)
 				{
@@ -76,8 +68,8 @@ namespace mRemoteNG.App
 		{
 			get
 			{
-				List<string> ValueList = new List<string>();
-				foreach (string Value in SingletonInstance.Values)
+				var ValueList = new List<string>();
+				foreach (var Value in SingletonInstance.Values)
 				{
 					ValueList.Add(Value);
 				}

mRemoteV1/App/Update/AnnouncementInfo.cs

@@ -1,32 +0,0 @@
-using System;
-
-namespace mRemoteNG.App.Update
-{
-    public class AnnouncementInfo
-    {
-        #region Public Properties
-        public bool IsValid { get; set; }
-        public string Name { get; set; }
-        public Uri Address { get; set; }
-        #endregion
-
-        #region Public Methods
-        public static AnnouncementInfo FromString(string input)
-        {
-            AnnouncementInfo newInfo = new AnnouncementInfo();
-            if (string.IsNullOrEmpty(input))
-            {
-                newInfo.IsValid = false;
-            }
-            else
-            {
-                UpdateFile updateFile = new UpdateFile(input);
-                newInfo.Name = updateFile.GetString("Name");
-                newInfo.Address = updateFile.GetUri("URL");
-                newInfo.IsValid = true;
-            }
-            return newInfo;
-        }
-        #endregion
-    }
-}

mRemoteV1/App/Update/AppUpdater.cs

@@ -3,12 +3,16 @@ using System.IO;
 using System.Net;
 using System.ComponentModel;
 using System.Threading;
-using mRemoteNG.Tools;
 using System.Reflection;
 using mRemoteNG.App.Info;
-using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 
+#if PORTABLE
+using System.Security.Cryptography;
+using System.Windows.Forms;
+#else
+using mRemoteNG.Tools;
+#endif
 
 namespace mRemoteNG.App.Update
 {
@@ -16,98 +20,30 @@ namespace mRemoteNG.App.Update
 	{
         private UpdateInfo _currentUpdateInfo;
         private string _changeLog;
-        private AnnouncementInfo _currentAnnouncementInfo;
         private WebProxy _webProxy;
         private Thread _getUpdateInfoThread;
         private Thread _getChangeLogThread;
-        private Thread _getAnnouncementInfoThread;
 
-        #region Public Properties
-        public UpdateInfo CurrentUpdateInfo
-		{
-			get
-			{
-				return _currentUpdateInfo;
-			}
-		}
+#region Public Properties
+        public UpdateInfo CurrentUpdateInfo => _currentUpdateInfo;
+
+	    public string ChangeLog => _changeLog;
+
+	    public bool IsGetUpdateInfoRunning => _getUpdateInfoThread != null && _getUpdateInfoThread.IsAlive;
+
+	    private bool IsGetChangeLogRunning => _getChangeLogThread != null && _getChangeLogThread.IsAlive;
+
+	    public bool IsDownloadUpdateRunning => _downloadUpdateWebClient != null;
+
+#endregion
 		
-        public string ChangeLog
-		{
-			get
-			{
-				return _changeLog;
-			}
-		}
-		
-        public AnnouncementInfo CurrentAnnouncementInfo
-		{
-			get
-			{
-				return _currentAnnouncementInfo;
-			}
-		}
-		
-        public bool IsGetUpdateInfoRunning
-		{
-			get
-			{
-				if (_getUpdateInfoThread != null)
-				{
-					if (_getUpdateInfoThread.IsAlive)
-					{
-						return true;
-					}
-				}
-				return false;
-			}
-		}
-		
-        public bool IsGetChangeLogRunning
-		{
-			get
-			{
-				if (_getChangeLogThread != null)
-				{
-					if (_getChangeLogThread.IsAlive)
-					{
-						return true;
-					}
-				}
-				return false;
-			}
-		}
-		
-        public bool IsGetAnnouncementInfoRunning
-		{
-			get
-			{
-				if (_getAnnouncementInfoThread != null)
-				{
-					if (_getAnnouncementInfoThread.IsAlive)
-					{
-						return true;
-					}
-				}
-				return false;
-			}
-		}
-		
-        public bool IsDownloadUpdateRunning
-		{
-			get
-			{
-				return (_downloadUpdateWebClient != null);
-			}
-		}
-        #endregion
-		
-        #region Public Methods
+#region Public Methods
 		public AppUpdater()
 		{
 			SetProxySettings();
 		}
-			
-		public void SetProxySettings()
+
+	    private void SetProxySettings()
 		{
 		    var shouldWeUseProxy = Settings.Default.UpdateUseProxy;
 		    var proxyAddress = Settings.Default.UpdateProxyAddress;
@@ -115,7 +51,7 @@ namespace mRemoteNG.App.Update
 		    var useAuthentication = Settings.Default.UpdateProxyUseAuthentication;
 		    var username = Settings.Default.UpdateProxyAuthUser;
             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-		    var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, GeneralAppInfo.EncryptionKey);
+		    var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey);
 
             SetProxySettings(shouldWeUseProxy, proxyAddress, port, useAuthentication, username, password);
 		}
@@ -124,23 +60,9 @@ namespace mRemoteNG.App.Update
 		{
 			if (useProxy && !string.IsNullOrEmpty(address))
 			{
-				if (!(port == 0))
-				{
-					_webProxy = new WebProxy(address, port);
-				}
-				else
-				{
-					_webProxy = new WebProxy(address);
-				}
-					
-				if (useAuthentication)
-				{
-					_webProxy.Credentials = new NetworkCredential(username, password);
-				}
-				else
-				{
-					_webProxy.Credentials = null;
-				}
+			    _webProxy = port != 0 ? new WebProxy(address, port) : new WebProxy(address);
+
+			    _webProxy.Credentials = useAuthentication ? new NetworkCredential(username, password) : null;
 			}
 			else
 			{
@@ -155,17 +77,7 @@ namespace mRemoteNG.App.Update
 				return false;
 			}
 				
-			return _currentUpdateInfo.Version > GeneralAppInfo.getVer();
-		}
-			
-		public bool IsAnnouncementAvailable()
-		{
-			if (_currentAnnouncementInfo == null || (!_currentAnnouncementInfo.IsValid || string.IsNullOrEmpty(_currentAnnouncementInfo.Name)))
-			{
-				return false;
-			}
-				
-			return (_currentAnnouncementInfo.Name != Settings.Default.LastAnnouncement);
+			return _currentUpdateInfo.Version > GeneralAppInfo.GetApplicationVersion();
 		}
 			
 		public void GetUpdateInfoAsync()
@@ -175,7 +87,7 @@ namespace mRemoteNG.App.Update
 				_getUpdateInfoThread.Abort();
 			}
 				
-			_getUpdateInfoThread = new Thread(new ThreadStart(GetUpdateInfo));
+			_getUpdateInfoThread = new Thread(GetUpdateInfo);
 			_getUpdateInfoThread.SetApartmentState(ApartmentState.STA);
 			_getUpdateInfoThread.IsBackground = true;
 			_getUpdateInfoThread.Start();
@@ -185,7 +97,7 @@ namespace mRemoteNG.App.Update
 		{
 			if (_currentUpdateInfo == null || !_currentUpdateInfo.IsValid)
 			{
-				throw (new InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync()."));
+				throw new InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync().");
 			}
 				
 			if (IsGetChangeLogRunning)
@@ -193,43 +105,46 @@ namespace mRemoteNG.App.Update
 				_getChangeLogThread.Abort();
 			}
 				
-			_getChangeLogThread = new Thread(new ThreadStart(GetChangeLog));
+			_getChangeLogThread = new Thread(GetChangeLog);
 			_getChangeLogThread.SetApartmentState(ApartmentState.STA);
 			_getChangeLogThread.IsBackground = true;
 			_getChangeLogThread.Start();
 		}
 			
-		public void GetAnnouncementInfoAsync()
-		{
-			if (IsGetAnnouncementInfoRunning)
-			{
-				_getAnnouncementInfoThread.Abort();
-			}
-				
-			_getAnnouncementInfoThread = new Thread(new ThreadStart(GetAnnouncementInfo));
-			_getAnnouncementInfoThread.SetApartmentState(ApartmentState.STA);
-			_getAnnouncementInfoThread.IsBackground = true;
-			_getAnnouncementInfoThread.Start();
-		}
-			
 		public void DownloadUpdateAsync()
 		{
 			if (_downloadUpdateWebClient != null)
 			{
-				throw (new InvalidOperationException("A previous call to DownloadUpdateAsync() is still in progress."));
+				throw new InvalidOperationException("A previous call to DownloadUpdateAsync() is still in progress.");
 			}
 				
 			if (_currentUpdateInfo == null || !_currentUpdateInfo.IsValid)
 			{
-				throw (new InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync()."));
+				throw new InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().");
 			}
-				
-			_currentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "exe"));
-			DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress, _currentUpdateInfo.UpdateFilePath);
+#if !PORTABLE
+            _currentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "exe"));
+#else
+		    var sfd = new SaveFileDialog
+		    {
+		        InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),
+                FileName = _currentUpdateInfo.FileName,
+		        RestoreDirectory = true
+		    };
+		    if (sfd.ShowDialog() == DialogResult.OK)
+		    {
+                _currentUpdateInfo.UpdateFilePath = sfd.FileName;
+            }
+		    else
+		    {
+		        return;
+		    }
+#endif
+            DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress, _currentUpdateInfo.UpdateFilePath);
 		}
-        #endregion
+#endregion
 		
-        #region Private Properties
+#region Private Properties
 		private WebClient _downloadUpdateWebClient;
         private WebClient DownloadUpdateWebClient
 		{
@@ -248,12 +163,12 @@ namespace mRemoteNG.App.Update
 				return _downloadUpdateWebClient;
 			}
 		}
-        #endregion
+#endregion
 		
-        #region Private Methods
+#region Private Methods
 		private WebClient CreateWebClient()
 		{
-			WebClient webClient = new WebClient();
+			var webClient = new WebClient();
 			webClient.Headers.Add("user-agent", GeneralAppInfo.UserAgent);
 			webClient.Proxy = _webProxy;
 			return webClient;
@@ -261,21 +176,21 @@ namespace mRemoteNG.App.Update
 			
 		private static DownloadStringCompletedEventArgs NewDownloadStringCompletedEventArgs(string result, Exception exception, bool cancelled, object userToken)
 		{
-			Type type = typeof(DownloadStringCompletedEventArgs);
+			var type = typeof(DownloadStringCompletedEventArgs);
             const BindingFlags bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance;
-			Type[] argumentTypes = new Type[] {typeof(string), typeof(Exception), typeof(bool), typeof(object)};
-			ConstructorInfo constructor = type.GetConstructor(bindingFlags, null, argumentTypes, null);
-			object[] arguments = new object[] {result, exception, cancelled, userToken};
+			Type[] argumentTypes = {typeof(string), typeof(Exception), typeof(bool), typeof(object)};
+			var constructor = type.GetConstructor(bindingFlags, null, argumentTypes, null);
+			object[] arguments = {result, exception, cancelled, userToken};
 
             return (DownloadStringCompletedEventArgs)constructor.Invoke(arguments);
 		}
 			
 		private DownloadStringCompletedEventArgs DownloadString(Uri address)
 		{
-			WebClient webClient = CreateWebClient();
-			string result = string.Empty;
+			var webClient = CreateWebClient();
+			var result = string.Empty;
 			Exception exception = null;
-			bool cancelled = false;
+			var cancelled = false;
 				
 			try
 			{
@@ -295,8 +210,8 @@ namespace mRemoteNG.App.Update
 			
 		private void GetUpdateInfo()
 		{
-			Uri updateFileUri = new Uri(new Uri(Convert.ToString(Settings.Default.UpdateAddress)), new Uri(UpdateChannelInfo.FileName, UriKind.Relative));
-			DownloadStringCompletedEventArgs e = DownloadString(updateFileUri);
+			var updateFileUri = new Uri(new Uri(Convert.ToString(Settings.Default.UpdateAddress)), new Uri(UpdateChannelInfo.FileName, UriKind.Relative));
+			var e = DownloadString(updateFileUri);
 				
 			if (!e.Cancelled && e.Error == null)
 			{
@@ -308,73 +223,64 @@ namespace mRemoteNG.App.Update
                     Settings.Default.UpdatePending = IsUpdateAvailable();
 				}
 			}
-				
-			if (GetUpdateInfoCompletedEventEvent != null)
-				GetUpdateInfoCompletedEventEvent(this, e);
-		}
+
+            GetUpdateInfoCompletedEventEvent?.Invoke(this, e);
+        }
 			
 		private void GetChangeLog()
 		{
-			DownloadStringCompletedEventArgs e = DownloadString(_currentUpdateInfo.ChangeLogAddress);
+			var e = DownloadString(_currentUpdateInfo.ChangeLogAddress);
 				
 			if (!e.Cancelled && e.Error == null)
 			{
 				_changeLog = e.Result;
 			}
-				
-			if (GetChangeLogCompletedEventEvent != null)
-				GetChangeLogCompletedEventEvent(this, e);
-		}
-			
-		private void GetAnnouncementInfo()
-		{
-			Uri announcementFileUri = new Uri(Convert.ToString(Settings.Default.AnnouncementAddress));
-			DownloadStringCompletedEventArgs e = DownloadString(announcementFileUri);
-				
-			if (!e.Cancelled && e.Error == null)
-			{
-				_currentAnnouncementInfo = AnnouncementInfo.FromString(e.Result);
-					
-				if (!string.IsNullOrEmpty(_currentAnnouncementInfo.Name))
-				{
-                    Settings.Default.LastAnnouncement = _currentAnnouncementInfo.Name;
-				}
-			}
-				
-			if (GetAnnouncementInfoCompletedEventEvent != null)
-				GetAnnouncementInfoCompletedEventEvent(this, e);
-		}
+
+            GetChangeLogCompletedEventEvent?.Invoke(this, e);
+        }
 			
 		private void DownloadUpdateProgressChanged(object sender, DownloadProgressChangedEventArgs e)
 		{
-			if (DownloadUpdateProgressChangedEventEvent != null)
-				DownloadUpdateProgressChangedEventEvent(sender, e);
-		}
+            DownloadUpdateProgressChangedEventEvent?.Invoke(sender, e);
+        }
 			
 		private void DownloadUpdateCompleted(object sender, AsyncCompletedEventArgs e)
 		{
-			AsyncCompletedEventArgs raiseEventArgs = e;
+			var raiseEventArgs = e;
 				
 			if (!e.Cancelled && e.Error == null)
 			{
 				try
 				{
-					Authenticode updateAuthenticode = new Authenticode(_currentUpdateInfo.UpdateFilePath);
-					updateAuthenticode.RequireThumbprintMatch = true;
-					updateAuthenticode.ThumbprintToMatch = _currentUpdateInfo.CertificateThumbprint;
-						
-					if (updateAuthenticode.Verify() != Authenticode.StatusValue.Verified)
-					{
-						if (updateAuthenticode.Status == Authenticode.StatusValue.UnhandledException)
+#if !PORTABLE
+                    var updateAuthenticode = new Authenticode(_currentUpdateInfo.UpdateFilePath)
+				    {
+				        RequireThumbprintMatch = true,
+				        ThumbprintToMatch = _currentUpdateInfo.CertificateThumbprint
+				    };
+
+				    if (updateAuthenticode.Verify() != Authenticode.StatusValue.Verified)
+				    {
+				        if (updateAuthenticode.Status == Authenticode.StatusValue.UnhandledException)
 						{
 							throw (updateAuthenticode.Exception);
 						}
-						else
-						{
-							throw (new Exception(updateAuthenticode.StatusMessage));
-						}
-					}
-				}
+
+				        throw (new Exception(updateAuthenticode.StatusMessage));
+				    }
+#else
+                    using (var md5 = MD5.Create())
+                    {
+                        using (var stream = File.OpenRead(_currentUpdateInfo.UpdateFilePath))
+                        {
+                            var hash = md5.ComputeHash(stream);
+                            var hashString = BitConverter.ToString(hash).Replace("-", "");
+                            if (!hashString.Equals(_currentUpdateInfo.CertificateThumbprint))
+                                throw new Exception("MD5 Hashes didn't match!");
+                        }
+                    }
+#endif
+                }
 				catch (Exception ex)
 				{
 					raiseEventArgs = new AsyncCompletedEventArgs(ex, false, null);
@@ -385,16 +291,15 @@ namespace mRemoteNG.App.Update
 			{
 				File.Delete(_currentUpdateInfo.UpdateFilePath);
 			}
-				
-			if (DownloadUpdateCompletedEventEvent != null)
-				DownloadUpdateCompletedEventEvent(this, raiseEventArgs);
-				
-			_downloadUpdateWebClient.Dispose();
+
+            DownloadUpdateCompletedEventEvent?.Invoke(this, raiseEventArgs);
+
+            _downloadUpdateWebClient.Dispose();
 			_downloadUpdateWebClient = null;
 		}
-        #endregion
+#endregion
 		
-        #region Events
+#region Events
         private AsyncCompletedEventHandler GetUpdateInfoCompletedEventEvent;
         public event AsyncCompletedEventHandler GetUpdateInfoCompletedEvent
         {
@@ -421,20 +326,7 @@ namespace mRemoteNG.App.Update
             }
         }
 
-        private AsyncCompletedEventHandler GetAnnouncementInfoCompletedEventEvent;
-        public event AsyncCompletedEventHandler GetAnnouncementInfoCompletedEvent
-        {
-            add
-            {
-                GetAnnouncementInfoCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Combine(GetAnnouncementInfoCompletedEventEvent, value);
-            }
-            remove
-            {
-                GetAnnouncementInfoCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Remove(GetAnnouncementInfoCompletedEventEvent, value);
-            }
-        }
-
-        private DownloadProgressChangedEventHandler DownloadUpdateProgressChangedEventEvent;
+       private DownloadProgressChangedEventHandler DownloadUpdateProgressChangedEventEvent;
         public event DownloadProgressChangedEventHandler DownloadUpdateProgressChangedEvent
         {
             add
@@ -459,6 +351,6 @@ namespace mRemoteNG.App.Update
                 DownloadUpdateCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Remove(DownloadUpdateCompletedEventEvent, value);
             }
         }
-        #endregion
+#endregion
 	}
 }

mRemoteV1/App/Update/UpdateFile.cs

@@ -1,21 +1,15 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 
 namespace mRemoteNG.App.Update
 {
     public class UpdateFile
     {
         #region Public Properties
-        private Dictionary<string, string> _items = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
         // ReSharper disable MemberCanBePrivate.Local
-        public Dictionary<string, string> Items
-        {
-            // ReSharper restore MemberCanBePrivate.Local
-            get
-            {
-                return _items;
-            }
-        }
+        // ReSharper disable once MemberCanBePrivate.Global
+        public Dictionary<string, string> Items { get; } = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
         #endregion
 
         #region Public Methods
@@ -25,79 +19,72 @@ namespace mRemoteNG.App.Update
         }
 
         // ReSharper disable MemberCanBePrivate.Local
+        // ReSharper disable once MemberCanBePrivate.Global
         public void FromString(string content)
         {
-            // ReSharper restore MemberCanBePrivate.Local
-            if (string.IsNullOrEmpty(content))
-            {
-            }
-            else
-            {
-                char[] lineSeparators = new char[] { '\n', '\r' };
-                char[] keyValueSeparators = new char[] { ':', '=' };
-                char[] commentCharacters = new char[] { '#', ';', '\'' };
+            if (string.IsNullOrEmpty(content)) return;
 
-                string[] lines = content.Split(lineSeparators.ToString().ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-                foreach (string line in lines)
+            char[] keyValueSeparators = { ':', '=' };
+            char[] commentCharacters = { '#', ';', '\'' };
+
+            using (var sr = new StringReader(content))
+            {
+                string line;
+                while ((line = sr.ReadLine()) != null)
                 {
-                    string trimmedLine = line.Trim();
+                    var trimmedLine = line.Trim();
                     if (trimmedLine.Length == 0)
                     {
                         continue;
                     }
-                    if (!(trimmedLine.Substring(0, 1).IndexOfAny(commentCharacters.ToString().ToCharArray()) == -1))
+                    if (trimmedLine.Substring(0, 1).IndexOfAny(commentCharacters) != -1)
                     {
                         continue;
                     }
 
-                    string[] parts = trimmedLine.Split(keyValueSeparators.ToString().ToCharArray(), 2);
-                    if (!(parts.Length == 2))
+                    var parts = trimmedLine.Split(keyValueSeparators, 2);
+                    if (parts.Length != 2)
                     {
                         continue;
                     }
-                    string key = Convert.ToString(parts[0].Trim());
-                    string value = Convert.ToString(parts[1].Trim());
+                    var key = parts[0].Trim();
+                    var value = parts[1].Trim();
 
-                    _items.Add(key, value);
+                    Items.Add(key, value);
                 }
             }
         }
 
         // ReSharper disable MemberCanBePrivate.Local
-        public string GetString(string key)
+        private string GetString(string key)
         {
             // ReSharper restore MemberCanBePrivate.Local
-            if (!Items.ContainsKey(key))
-            {
-                return string.Empty;
-            }
-            return this._items[key];
+            return !Items.ContainsKey(key) ? string.Empty : this.Items[key];
         }
 
         public Version GetVersion(string key)
         {
-            string value = GetString(key);
-            if (string.IsNullOrEmpty(value))
-            {
-                return null;
-            }
-            return new Version(value);
+            var value = GetString(key);
+            return string.IsNullOrEmpty(value) ? null : new Version(value);
         }
 
         public Uri GetUri(string key)
         {
-            string value = GetString(key);
-            if (string.IsNullOrEmpty(value))
-            {
-                return null;
-            }
-            return new Uri(value);
+            var value = GetString(key);
+            return string.IsNullOrEmpty(value) ? null : new Uri(value);
         }
 
         public string GetThumbprint(string key)
         {
             return GetString(key).Replace(" ", "").ToUpperInvariant();
         }
+
+        public string GetFileName()
+        {
+            var value = GetString("dURL");
+            var sv = value.Split('/');
+            return sv[sv.Length-1];
+        }
         #endregion
     }
 }

mRemoteV1/App/Update/UpdateInfo.cs

@@ -1,36 +1,36 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace mRemoteNG.App.Update
 {
     public class UpdateInfo
     {
-        public bool IsValid { get; set; }
-        public Version Version { get; set; }
-        public Uri DownloadAddress { get; set; }
+        public bool IsValid { get; private set; }
+        public Version Version { get; private set; }
+        public Uri DownloadAddress { get; private set; }
         public string UpdateFilePath { get; set; }
-        public Uri ChangeLogAddress { get; set; }
-        public Uri ImageAddress { get; set; }
-        public Uri ImageLinkAddress { get; set; }
-        public string CertificateThumbprint { get; set; }
+        public Uri ChangeLogAddress { get; private set; }
+        public Uri ImageAddress { get; private set; }
+        public Uri ImageLinkAddress { get; private set; }
+        public string CertificateThumbprint { get; private set; }
+        public string FileName { get; private set; }
 
         public static UpdateInfo FromString(string input)
         {
-            UpdateInfo newInfo = new UpdateInfo();
+            var newInfo = new UpdateInfo();
             if (string.IsNullOrEmpty(input))
             {
                 newInfo.IsValid = false;
             }
             else
             {
-                UpdateFile updateFile = new UpdateFile(input);
+                var updateFile = new UpdateFile(input);
                 newInfo.Version = updateFile.GetVersion("Version");
                 newInfo.DownloadAddress = updateFile.GetUri("dURL");
                 newInfo.ChangeLogAddress = updateFile.GetUri("clURL");
                 newInfo.ImageAddress = updateFile.GetUri("imgURL");
                 newInfo.ImageLinkAddress = updateFile.GetUri("imgURLLink");
                 newInfo.CertificateThumbprint = updateFile.GetThumbprint("CertificateThumbprint");
+                newInfo.FileName = updateFile.GetFileName();
                 newInfo.IsValid = true;
             }
             return newInfo;

mRemoteV1/App/Windows.cs

@@ -1,67 +1,63 @@
-using mRemoteNG.Forms;
-using mRemoteNG.Messages;
-using mRemoteNG.UI.Forms;
-using mRemoteNG.UI.Forms.OptionsPages;
+using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Window;
 using System;
+using mRemoteNG.UI;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.App
 {
-    public class Windows
+    public static class Windows
     {
-        public static ConnectionTreeWindow treeForm;
-        public static DockContent treePanel = new DockContent();
-        public static ConfigWindow configForm;
-        public static DockContent configPanel = new DockContent();
-        public static ErrorAndInfoWindow errorsForm;
-        public static DockContent errorsPanel = new DockContent();
-        public static ScreenshotManagerWindow screenshotForm;
-        public static DockContent screenshotPanel = new DockContent();
-        public static ExportForm exportForm;
-        public static DockContent exportPanel = new DockContent();
-        public static AboutWindow aboutForm;
-        public static DockContent aboutPanel = new DockContent();
-        public static UpdateWindow updateForm;
-        public static DockContent updatePanel = new DockContent();
-        public static SSHTransferWindow sshtransferForm;
-        public static DockContent sshtransferPanel = new DockContent();
-        public static ActiveDirectoryImportWindow adimportForm;
-        public static DockContent adimportPanel = new DockContent();
-        public static HelpWindow helpForm;
-        public static DockContent helpPanel = new DockContent();
-        public static ExternalToolsWindow externalappsForm;
-        public static DockContent externalappsPanel = new DockContent();
-        public static PortScanWindow portscanForm;
-        public static DockContent portscanPanel = new DockContent();
-        public static UltraVNCWindow ultravncscForm;
-        public static DockContent ultravncscPanel = new DockContent();
-        public static ComponentsCheckWindow componentscheckForm;
-        public static DockContent componentscheckPanel = new DockContent();
-        public static AnnouncementWindow AnnouncementForm;
-        public static DockContent AnnouncementPanel = new DockContent();
+        private static AboutWindow _aboutForm;
+        private static DockContent _aboutPanel = new DockContent();
+        private static DockContent _sshtransferPanel = new DockContent();
+        private static ActiveDirectoryImportWindow _adimportForm;
+        private static DockContent _adimportPanel = new DockContent();
+        private static HelpWindow _helpForm;
+        private static DockContent _helpPanel = new DockContent();
+        private static ExternalToolsWindow _externalappsForm;
+        private static DockContent _externalappsPanel = new DockContent();
+        private static PortScanWindow _portscanForm;
+        private static DockContent _portscanPanel = new DockContent();
+        private static UltraVNCWindow _ultravncscForm;
+        private static DockContent _ultravncscPanel = new DockContent();
+        private static ComponentsCheckWindow _componentscheckForm;
+        private static DockContent _componentscheckPanel = new DockContent();
 
-        public static void Show(WindowType windowType, bool portScanImport = false)
+        public static ConnectionTreeWindow TreeForm { get; set; }
+        public static DockContent TreePanel { get; set; } = new DockContent();
+        public static ConfigWindow ConfigForm { get; set; }
+        public static DockContent ConfigPanel { get; set; } = new DockContent();
+        public static ErrorAndInfoWindow ErrorsForm { get; set; }
+        public static DockContent ErrorsPanel { get; set; } = new DockContent();
+        public static ScreenshotManagerWindow ScreenshotForm { get; set; }
+        public static DockContent ScreenshotPanel { get; set; } = new DockContent();
+        public static UpdateWindow UpdateForm { get; set; }
+        public static DockContent UpdatePanel { get; set; } = new DockContent();
+        public static SSHTransferWindow SshtransferForm { get; set; }
+        
+        
+        public static void Show(WindowType windowType)
         {
             try
             {
                 if (windowType.Equals(WindowType.About))
                 {
-                    if (aboutForm == null || aboutForm.IsDisposed)
+                    if (_aboutForm == null || _aboutForm.IsDisposed)
                     {
-                        aboutForm = new AboutWindow(aboutPanel);
-                        aboutPanel = aboutForm;
+                        _aboutForm = new AboutWindow(_aboutPanel);
+                        _aboutPanel = _aboutForm;
                     }
-                    aboutForm.Show(frmMain.Default.pnlDock);
+                    _aboutForm.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.ActiveDirectoryImport))
                 {
-                    if (adimportForm == null || adimportForm.IsDisposed)
+                    if (_adimportForm == null || _adimportForm.IsDisposed)
                     {
-                        adimportForm = new ActiveDirectoryImportWindow(adimportPanel);
-                        adimportPanel = adimportForm;
+                        _adimportForm = new ActiveDirectoryImportWindow(_adimportPanel);
+                        _adimportPanel = _adimportForm;
                     }
-                    adimportPanel.Show(frmMain.Default.pnlDock);
+                    _adimportPanel.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.Options))
                 {
@@ -72,74 +68,65 @@ namespace mRemoteNG.App
                 }
                 else if (windowType.Equals(WindowType.SSHTransfer))
                 {
-                    sshtransferForm = new SSHTransferWindow(sshtransferPanel);
-                    sshtransferPanel = sshtransferForm;
-                    sshtransferForm.Show(frmMain.Default.pnlDock);
+                    SshtransferForm = new SSHTransferWindow(_sshtransferPanel);
+                    _sshtransferPanel = SshtransferForm;
+                    SshtransferForm.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.Update))
                 {
-                    if (updateForm == null || updateForm.IsDisposed)
+                    if (UpdateForm == null || UpdateForm.IsDisposed)
                     {
-                        updateForm = new UpdateWindow(updatePanel);
-                        updatePanel = updateForm;
+                        UpdateForm = new UpdateWindow(UpdatePanel);
+                        UpdatePanel = UpdateForm;
                     }
-                    updateForm.Show(frmMain.Default.pnlDock);
+                    UpdateForm.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.Help))
                 {
-                    if (helpForm == null || helpForm.IsDisposed)
+                    if (_helpForm == null || _helpForm.IsDisposed)
                     {
-                        helpForm = new HelpWindow(helpPanel);
-                        helpPanel = helpForm;
+                        _helpForm = new HelpWindow(_helpPanel);
+                        _helpPanel = _helpForm;
                     }
-                    helpForm.Show(frmMain.Default.pnlDock);
+                    _helpForm.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.ExternalApps))
                 {
-                    if (externalappsForm == null || externalappsForm.IsDisposed)
+                    if (_externalappsForm == null || _externalappsForm.IsDisposed)
                     {
-                        externalappsForm = new ExternalToolsWindow(externalappsPanel);
-                        externalappsPanel = externalappsForm;
+                        _externalappsForm = new ExternalToolsWindow(_externalappsPanel);
+                        _externalappsPanel = _externalappsForm;
                     }
-                    externalappsForm.Show(frmMain.Default.pnlDock);
+                    _externalappsForm.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.PortScan))
                 {
-                    portscanForm = new PortScanWindow(portscanPanel, portScanImport);
-                    portscanPanel = portscanForm;
-                    portscanForm.Show(frmMain.Default.pnlDock);
+                    _portscanForm = new PortScanWindow(_portscanPanel);
+                    _portscanPanel = _portscanForm;
+                    _portscanForm.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.UltraVNCSC))
                 {
-                    if (ultravncscForm == null || ultravncscForm.IsDisposed)
+                    if (_ultravncscForm == null || _ultravncscForm.IsDisposed)
                     {
-                        ultravncscForm = new UltraVNCWindow(ultravncscPanel);
-                        ultravncscPanel = ultravncscForm;
+                        _ultravncscForm = new UltraVNCWindow(_ultravncscPanel);
+                        _ultravncscPanel = _ultravncscForm;
                     }
-                    ultravncscForm.Show(frmMain.Default.pnlDock);
+                    _ultravncscForm.Show(frmMain.Default.pnlDock);
                 }
                 else if (windowType.Equals(WindowType.ComponentsCheck))
                 {
-                    if (componentscheckForm == null || componentscheckForm.IsDisposed)
+                    if (_componentscheckForm == null || _componentscheckForm.IsDisposed)
                     {
-                        componentscheckForm = new ComponentsCheckWindow(componentscheckPanel);
-                        componentscheckPanel = componentscheckForm;
+                        _componentscheckForm = new ComponentsCheckWindow(_componentscheckPanel);
+                        _componentscheckPanel = _componentscheckForm;
                     }
-                    componentscheckForm.Show(frmMain.Default.pnlDock);
-                }
-                else if (windowType.Equals(WindowType.Announcement))
-                {
-                    if (AnnouncementForm == null || AnnouncementForm.IsDisposed)
-                    {
-                        AnnouncementForm = new AnnouncementWindow(AnnouncementPanel);
-                        AnnouncementPanel = AnnouncementForm;
-                    }
-                    AnnouncementForm.Show(frmMain.Default.pnlDock);
+                    _componentscheckForm.Show(frmMain.Default.pnlDock);
                 }
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "App.Runtime.Windows.Show() failed." + Environment.NewLine + ex.Message, true);
+                Runtime.MessageCollector.AddExceptionStackTrace("App.Runtime.Windows.Show() failed.", ex);
             }
         }
     }

mRemoteV1/Config/ConfirmCloseEnum.cs

@@ -4,7 +4,7 @@ namespace mRemoteNG.Config
 	{
 		Unspecified = 0,
 		Never = 1,
-		@Exit = 2,
+		Exit = 2,
 		Multiple = 3,
 		All = 4
 	}

mRemoteV1/Config/Connections/ConnectionsLoader.cs

@@ -1,6 +1,10 @@
-using System.Windows.Forms;
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
+using System.Security;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.Putty;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Tools;
+using mRemoteNG.Tree;
 using mRemoteNG.UI.Forms;
 
 
@@ -9,57 +13,47 @@ namespace mRemoteNG.Config.Connections
 	public class ConnectionsLoader
 	{		
         public bool UseDatabase { get; set; }
-	    public string DatabaseHost { get; set; }
-	    public string DatabaseName { get; set; }
-	    public string DatabaseUsername { get; set; }
-	    public string DatabasePassword { get; set; }
-	    public bool DatabaseUpdate { get; set; }
-	    public string PreviousSelected { get; set; }
 	    public string ConnectionFileName { get; set; }
-	    public TreeNode RootTreeNode { get; set; }
-		public ConnectionList ConnectionList { get; set; }
-        public ContainerList ContainerList { get; set; }
-	    public ConnectionList PreviousConnectionList { get; set; }
-	    public ContainerList PreviousContainerList { get; set; }
 		
 
-		public void LoadConnections(bool import)
+		public ConnectionTreeModel LoadConnections(bool import)
 		{
+		    IDeserializer deserializer;
 			if (UseDatabase)
 			{
-			    var sqlConnectionsLoader = new SqlConnectionsLoader()
-			    {
-			        ConnectionList = ConnectionList,
-			        ContainerList = ContainerList,
-			        PreviousConnectionList = PreviousConnectionList,
-			        PreviousContainerList = PreviousContainerList,
-			        PreviousSelected = PreviousSelected,
-			        RootTreeNode = RootTreeNode,
-			        DatabaseName = DatabaseName,
-			        DatabaseHost = DatabaseHost,
-			        DatabasePassword = DatabasePassword,
-			        DatabaseUpdate = DatabaseUpdate,
-			        DatabaseUsername = DatabaseUsername
-			    };
-                sqlConnectionsLoader.LoadFromSql();
+			    var connector = new SqlDatabaseConnector();
+			    var dataProvider = new SqlDataProvider(connector);
+			    var dataTable = dataProvider.Load();
+			    deserializer = new DataTableDeserializer(dataTable);
 			}
 			else
 			{
-                var xmlConnectionsLoader = new XmlConnectionsLoader()
-                {
-                    ConnectionFileName = ConnectionFileName,
-                    ConnectionList = ConnectionList,
-                    ContainerList = ContainerList,
-                    RootTreeNode = RootTreeNode,
-                };
-				xmlConnectionsLoader.LoadFromXml(import);
+			    var dataProvider = new FileDataProvider(ConnectionFileName);
+			    var xmlString = dataProvider.Load();
+			    deserializer = new XmlConnectionsDeserializer(xmlString)
+			    {
+			        AuthenticationRequestor = PromptForPassword
+			    };
 			}
-			
-			frmMain.Default.AreWeUsingSqlServerForSavingConnections = UseDatabase;
-			frmMain.Default.ConnectionsFileName = ConnectionFileName;
-			
-			if (!import)
-				Putty.Sessions.AddSessionsToTree();
+
+            var connectionTreeModel = deserializer.Deserialize();
+
+            if (connectionTreeModel != null)
+			    frmMain.Default.ConnectionsFileName = ConnectionFileName;
+            else
+                connectionTreeModel = new ConnectionTreeModel();
+
+		    if (import) return connectionTreeModel;
+		    PuttySessionsManager.Instance.AddSessions();
+            connectionTreeModel.RootNodes.AddRange(PuttySessionsManager.Instance.RootPuttySessionsNodes);
+
+		    return connectionTreeModel;
 		}
+
+        private SecureString PromptForPassword()
+        {
+            var password = MiscTools.PasswordDialog("", false);
+            return password;
+        }
     }
 }

mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgs.cs

@@ -0,0 +1,20 @@
+using System;
+using mRemoteNG.Config.DatabaseConnectors;
+
+namespace mRemoteNG.Config.Connections.Multiuser
+{
+    public delegate void ConnectionsUpdateAvailableEventHandler(object sender, ConnectionsUpdateAvailableEventArgs args);
+
+    public class ConnectionsUpdateAvailableEventArgs : EventArgs
+    {
+        public IDatabaseConnector DatabaseConnector { get; private set; }
+        public DateTime UpdateTime { get; private set; }
+        public bool Handled { get; set; }
+
+        public ConnectionsUpdateAvailableEventArgs(IDatabaseConnector databaseConnector, DateTime updateTime)
+        {
+            DatabaseConnector = databaseConnector;
+            UpdateTime = updateTime;
+        }
+    }
+}

mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateCheckFinishedEventArgs.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace mRemoteNG.Config.Connections.Multiuser
+{
+    public delegate void UpdateCheckFinishedEventHandler(object sender, ConnectionsUpdateCheckFinishedEventArgs args);
+
+    public class ConnectionsUpdateCheckFinishedEventArgs : EventArgs
+    {
+        public bool UpdateAvailable { get; set; }
+    }
+}

mRemoteV1/Config/Connections/Multiuser/IConnectionsUpdateChecker.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace mRemoteNG.Config.Connections.Multiuser
+{
+    public interface IConnectionsUpdateChecker : IDisposable
+    {
+        bool IsUpdateAvailable();
+
+        void IsUpdateAvailableAsync();
+
+        event EventHandler UpdateCheckStarted;
+        event UpdateCheckFinishedEventHandler UpdateCheckFinished;
+        event ConnectionsUpdateAvailableEventHandler ConnectionsUpdateAvailable;
+    }
+}

mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Timers;
+using mRemoteNG.App;
+
+namespace mRemoteNG.Config.Connections.Multiuser
+{
+    public class RemoteConnectionsSyncronizer : IConnectionsUpdateChecker
+    {
+        private readonly Timer _updateTimer;
+        private readonly IConnectionsUpdateChecker _updateChecker;
+        private readonly ConnectionsLoader _connectionsLoader;
+        private readonly ConnectionsSaver _connectionsSaver;
+
+        public double TimerIntervalInMilliseconds => _updateTimer.Interval;
+
+        public RemoteConnectionsSyncronizer(IConnectionsUpdateChecker updateChecker)
+        {
+            _updateChecker = updateChecker;
+            _updateTimer = new Timer(3000);
+            _connectionsLoader = new ConnectionsLoader { UseDatabase = mRemoteNG.Settings.Default.UseSQLServer };
+            _connectionsSaver = new ConnectionsSaver { SaveFormat = ConnectionsSaver.Format.SQL };
+            SetEventListeners();
+        }
+
+        private void SetEventListeners()
+        {
+            _updateChecker.UpdateCheckStarted += OnUpdateCheckStarted;
+            _updateChecker.UpdateCheckFinished += OnUpdateCheckFinished;
+            _updateChecker.ConnectionsUpdateAvailable += (sender, args) => ConnectionsUpdateAvailable?.Invoke(sender, args);
+            _updateTimer.Elapsed += (sender, args) => _updateChecker.IsUpdateAvailableAsync();
+            ConnectionsUpdateAvailable += Load;
+        }
+
+        public void Load()
+        {
+            Runtime.ConnectionTreeModel = _connectionsLoader.LoadConnections(false);
+        }
+
+        private void Load(object sender, ConnectionsUpdateAvailableEventArgs args)
+        {
+            Load();
+            args.Handled = true;
+        }
+
+        public void Save()
+        {
+            _connectionsSaver.SaveConnections();
+        }
+
+        public void Enable() => _updateTimer.Start();
+        public void Disable() => _updateTimer.Stop();
+        public bool IsUpdateAvailable() => _updateChecker.IsUpdateAvailable();
+        public void IsUpdateAvailableAsync() => _updateChecker.IsUpdateAvailableAsync();
+
+
+        private void OnUpdateCheckStarted(object sender, EventArgs eventArgs)
+        {
+            _updateTimer.Stop();
+            UpdateCheckStarted?.Invoke(sender, eventArgs);
+        }
+
+        private void OnUpdateCheckFinished(object sender, ConnectionsUpdateCheckFinishedEventArgs eventArgs)
+        {
+            _updateTimer.Start();
+            UpdateCheckFinished?.Invoke(sender, eventArgs);
+        }
+
+        public event EventHandler UpdateCheckStarted;
+        public event UpdateCheckFinishedEventHandler UpdateCheckFinished;
+        public event ConnectionsUpdateAvailableEventHandler ConnectionsUpdateAvailable;
+
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+        private void Dispose(bool itIsSafeToAlsoFreeManagedObjects)
+        {
+            if (!itIsSafeToAlsoFreeManagedObjects) return;
+            _updateTimer.Dispose();
+            _updateChecker.Dispose();
+        }
+    }
+}

mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs

@@ -0,0 +1,118 @@
+using mRemoteNG.App;
+using mRemoteNG.Messages;
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Threading;
+using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DatabaseConnectors;
+
+namespace mRemoteNG.Config.Connections
+{
+    public class SqlConnectionsUpdateChecker : IConnectionsUpdateChecker
+    {
+        private readonly SqlDatabaseConnector _sqlConnector;
+        private readonly SqlCommand _sqlQuery;
+        private DateTime _lastUpdateTime;
+        private DateTime _lastDatabaseUpdateTime;
+
+
+        public SqlConnectionsUpdateChecker()
+        {
+            _sqlConnector = new SqlDatabaseConnector();
+            _sqlQuery = new SqlCommand("SELECT * FROM tblUpdate", _sqlConnector.SqlConnection);
+            _lastUpdateTime = default(DateTime);
+            _lastDatabaseUpdateTime = default(DateTime);
+        }
+
+        public bool IsUpdateAvailable()
+        {
+            RaiseUpdateCheckStartedEvent();
+            ConnectToSqlDb();
+            var updateIsAvailable = DatabaseIsMoreUpToDateThanUs();
+            if (updateIsAvailable)
+                RaiseConnectionsUpdateAvailableEvent();
+            RaiseUpdateCheckFinishedEvent(updateIsAvailable);
+            return updateIsAvailable;
+        }
+
+        public void IsUpdateAvailableAsync()
+        {
+            var thread = new Thread(() => IsUpdateAvailable());
+            thread.SetApartmentState(ApartmentState.STA);
+            thread.Start();
+        }
+
+        private void ConnectToSqlDb()
+        {
+            try
+            {
+                _sqlConnector.Connect();
+            }
+            catch(Exception e)
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Unable to connect to Sql DB to check for updates." + Environment.NewLine + e.Message, true);
+            }
+        }
+
+        private bool DatabaseIsMoreUpToDateThanUs()
+        {
+            return GetLastUpdateTimeFromDbResponse() > _lastUpdateTime;
+        }
+
+        private DateTime GetLastUpdateTimeFromDbResponse()
+        {
+            var lastUpdateInDb = default(DateTime);
+            try
+            {
+                var sqlReader = _sqlQuery.ExecuteReader(CommandBehavior.CloseConnection);
+                sqlReader.Read();
+                if (sqlReader.HasRows)
+                    lastUpdateInDb = Convert.ToDateTime(sqlReader["LastUpdate"]);
+                sqlReader.Close();
+            }
+            catch (Exception ex)
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Error executing Sql query to get updates from the DB." + Environment.NewLine + ex.Message, true);
+            }
+            _lastDatabaseUpdateTime = lastUpdateInDb;
+            return lastUpdateInDb;
+        }
+
+
+        public event EventHandler UpdateCheckStarted;
+        private void RaiseUpdateCheckStartedEvent()
+        {
+            UpdateCheckStarted?.Invoke(this, EventArgs.Empty);
+        }
+
+        public event UpdateCheckFinishedEventHandler UpdateCheckFinished;
+        private void RaiseUpdateCheckFinishedEvent(bool updateAvailable)
+        {
+            var args = new ConnectionsUpdateCheckFinishedEventArgs {UpdateAvailable = updateAvailable};
+            UpdateCheckFinished?.Invoke(this, args);
+        }
+
+        public event ConnectionsUpdateAvailableEventHandler ConnectionsUpdateAvailable;
+        private void RaiseConnectionsUpdateAvailableEvent()
+        {
+            var args = new ConnectionsUpdateAvailableEventArgs(_sqlConnector, _lastDatabaseUpdateTime);
+            ConnectionsUpdateAvailable?.Invoke(this, args);
+            if(args.Handled)
+                _lastUpdateTime = _lastDatabaseUpdateTime;
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        private void Dispose(bool itIsSafeToDisposeManagedObjects)
+        {
+            if (!itIsSafeToDisposeManagedObjects) return;
+            _sqlConnector.Disconnect();
+            _sqlConnector.Dispose();
+            _sqlQuery.Dispose();
+        }
+    }
+}

mRemoteV1/Config/Connections/SQLConnectionsProvider.cs

@@ -1,77 +0,0 @@
-using mRemoteNG.App;
-using mRemoteNG.Messages;
-using mRemoteNG.Tools;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Timers;
-using mRemoteNG.My;
-
-namespace mRemoteNG.Config.Connections
-{
-    public class SqlConnectionsProvider : IDisposable
-    {
-        SqlUpdateTimer _updateTimer;
-        SqlConnectionsUpdateChecker _sqlUpdateChecker;
-
-
-        public SqlConnectionsProvider()
-        {
-            _updateTimer = new SqlUpdateTimer();
-            _sqlUpdateChecker = new SqlConnectionsUpdateChecker();
-            SqlUpdateTimer.SqlUpdateTimerElapsed += SqlUpdateTimer_SqlUpdateTimerElapsed;
-            SqlConnectionsUpdateChecker.SQLUpdateCheckFinished += SQLUpdateCheckFinished;
-        }
-
-        ~SqlConnectionsProvider()
-        {
-            Dispose(false);
-        }
-
-        public void Enable()
-        {
-            _updateTimer.Enable();
-        }
-
-        public void Disable()
-        {
-            _updateTimer.Disable();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool itIsSafeToAlsoFreeManagedObjects)
-        {
-            if (itIsSafeToAlsoFreeManagedObjects)
-            {
-                DestroySQLUpdateHandlers();
-                _updateTimer.Dispose();
-                _sqlUpdateChecker.Dispose();
-            }
-        }
-
-        private void DestroySQLUpdateHandlers()
-        {
-            SqlUpdateTimer.SqlUpdateTimerElapsed -= SqlUpdateTimer_SqlUpdateTimerElapsed;
-            SqlConnectionsUpdateChecker.SQLUpdateCheckFinished -= SQLUpdateCheckFinished;
-        }
-
-        private void SqlUpdateTimer_SqlUpdateTimerElapsed()
-        {
-            _sqlUpdateChecker.IsDatabaseUpdateAvailableAsync();
-        }
-
-        private void SQLUpdateCheckFinished(bool UpdateIsAvailable)
-        {
-            if (UpdateIsAvailable)
-            {
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strSqlUpdateCheckUpdateAvailable, true);
-                Runtime.LoadConnectionsBG();
-            }
-        }
-    }
-}