bump version

related to #911

CHANGELOG.TXT

@@ -1,3 +1,11 @@
+1.76.3 Alpha 5 (2018-03-14):
+
+Fixes:
+------
+#911: Csv exports sometimes do not include all fields
+#807: Inheritance is sometimes turned on for nodes under root Connections node
+
+
 1.76.2 Alpha 4 (2018-03-03):
 
 Fixes:

README.MD

@@ -10,9 +10,9 @@
 
 | Update Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
-| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7011/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7011) |
-| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7011/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7011) |
-| Development | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76Alpha3/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76Alpha3) |
+| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7012/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7012) |
+| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7012/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7012) |
+| Development | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76Alpha4/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76Alpha4) |
 
 mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
 

Tools/CreateBulkConnections_ConfCons2_6.ps1

@@ -1,5 +1,15 @@
-$EncryptionKey = (Get-Credential -Message "Enter the encryption key you would like to use. This must match the encryption key used by the rest of the confCons file." -UserName "DontNeedUsername").Password
-$PathToMrngFolder = "C:\Users\SparerD\Downloads\mRemoteNG-Portable-1.75.7012.16846"
+#####################################
+# Author: David Sparer
+# Summary: 
+#   This is intended to be a template for creating connections in bulk. This uses the serializers directly from the mRemoteNG binaries.
+#   You will still need to create the connection info objects, but the library will handle serialization. It is expected that you
+#   are familiar with PowerShell. If this is not the case, reach out to the mRemoteNG community for help.
+# Usage:
+#   Replace or modify the examples that are shown toward the end of the script to create your own connection info objects. 
+#####################################
+
+$EncryptionKey = (Get-Credential -Message "Enter the encryption key you would like to use. This must match the encryption key used by the rest of the confCons file." -UserName "DontNeedUsername").Password
+$PathToMrngFolder = ""
 
 if ($PathToMrngFolder -eq "") {
     Write-Error -Message 'You must set the $PathToMrngFolder variable in this script to the folder which contains mRemoteNG.exe'
@@ -25,8 +35,7 @@ function New-mRemoteNGXmlSerializer {
 
 function New-mRemoteNGConnectionInfo {
     [CmdletBinding()]
-    param (
-    )
+    param ()
 
     PROCESS {
         $connectionInfo = New-Object -TypeName mRemoteNG.Connection.ConnectionInfo
@@ -36,8 +45,7 @@ function New-mRemoteNGConnectionInfo {
 
 function New-mRemoteNGContainerInfo {
     [CmdletBinding()]
-    param (
-    )
+    param ()
 
     PROCESS {
         $connectionInfo = New-Object -TypeName mRemoteNG.Container.ContainerInfo
@@ -51,7 +59,7 @@ $xmlSerializer = New-mRemoteNGXmlSerializer -EncryptionKey $EncryptionKey
 
 
 #----------------------------------------------------------------
-# Example 1: serialize many connections
+# Example 1: serialize many connections, no containers
 # Here you can define the number of connection info objects to create
 # You can also provide a list of desired hostnames and iterate over those
 $xml = ""
@@ -102,5 +110,5 @@ foreach($i in 1..3)
     $serializedContainer.Add($serializedConnection)
 }
 
-# get the raw xml text
+# Call ToString() on the top-level container to get the XML of it and all its children
 Write-Output $serializedContainer.ToString()

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs

@@ -19,20 +19,20 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
     public class CsvConnectionsDeserializerMremotengFormatTests
     {
         private CsvConnectionsDeserializerMremotengFormat _deserializer;
-        private ICredentialRepositoryList _credentialRepositoryList;
+        private CsvConnectionsSerializerMremotengFormat _serializer;
 
         [SetUp]
         public void Setup()
         {
             _deserializer = new CsvConnectionsDeserializerMremotengFormat();
-            _credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
+            var credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
+            _serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), credentialRepositoryList);
         }
 
         [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.ConnectionPropertyTestCases))]
         public object ConnectionPropertiesDeserializedCorrectly(string propertyToCheck)
         {
-            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
-            var csv = serializer.Serialize(GetTestConnection());
+            var csv = _serializer.Serialize(GetTestConnection());
             var deserializedConnections = _deserializer.Deserialize(csv);
             var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
             var propertyValue = typeof(ConnectionInfo).GetProperty(propertyToCheck)?.GetValue(connection);
@@ -42,10 +42,10 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
         [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.InheritanceTestCases))]
         public object InheritancePropertiesDeserializedCorrectly(string propertyToCheck)
         {
-            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
-            var csv = serializer.Serialize(GetTestConnectionWithAllInherited());
+            var csv = _serializer.Serialize(GetTestConnectionWithAllInherited());
             var deserializedConnections = _deserializer.Deserialize(csv);
             var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
+            connection?.RemoveParent();
             var propertyValue = typeof(ConnectionInfoInheritance).GetProperty(propertyToCheck)?.GetValue(connection?.Inheritance);
             return propertyValue;
         }
@@ -58,8 +58,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
             // |   |- Con1
             // |- Con2
             var treeModel = new ConnectionTreeModelBuilder().Build();
-            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
-            var csv = serializer.Serialize(treeModel);
+            var csv = _serializer.Serialize(treeModel);
             var deserializedConnections = _deserializer.Deserialize(csv);
             var con1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "Con1");
             var folder1 = deserializedConnections.GetRecursiveChildList().First(info => info.Name == "folder1");

mRemoteNGTests/Container/RootNodeInfoTests.cs

@@ -0,0 +1,18 @@
+using mRemoteNG.Connection;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Container
+{
+    public class RootNodeInfoTests
+    {
+        [Test]
+        public void InheritanceIsDisabledForNodesDirectlyUnderRootNode()
+        {
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            var con1 = new ConnectionInfo { Inheritance = { Password = true } };
+            rootNode.AddChild(con1);
+            Assert.That(con1.Inheritance.Password, Is.False);
+        }
+    }
+}

mRemoteNGTests/mRemoteNGTests.csproj

@@ -146,6 +146,7 @@
     <Compile Include="Connection\ConnectionInfoComparerTests.cs" />
     <Compile Include="Connection\Protocol\IntegratedProgramTests.cs" />
     <Compile Include="Connection\Protocol\ProtocolListTests.cs" />
+    <Compile Include="Container\RootNodeInfoTests.cs" />
     <Compile Include="Credential\CompositeRepositoryUnlockerTests.cs" />
     <Compile Include="Credential\CredentialChangedEventArgsTests.cs" />
     <Compile Include="Credential\CredentialDeletionMsgBoxConfirmerTests.cs" />

mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs

@@ -48,7 +48,10 @@ namespace mRemoteNG.Config.Serializers.Csv
             {
                 // no parent mapped, add to root
                 if (string.IsNullOrEmpty(node.Value))
+                {
                     root.AddChild(node.Key);
+                    continue;
+                }
 
                 // search for parent in the list by GUID
                 var parent = parentMapping

mRemoteV1/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs

@@ -16,7 +16,6 @@ namespace mRemoteNG.Config.Serializers.Csv
         private readonly SaveFilter _saveFilter;
         private readonly ICredentialRepositoryList _credentialRepositoryList;
 
-
         public CsvConnectionsSerializerMremotengFormat(SaveFilter saveFilter, ICredentialRepositoryList credentialRepositoryList)
         {
             saveFilter.ThrowIfNull(nameof(saveFilter));
@@ -79,142 +78,134 @@ namespace mRemoteNG.Config.Serializers.Csv
         private void SerializeConnectionInfo(ConnectionInfo con, StringBuilder sb)
         {
             sb.AppendLine();
-            sb.Append(string.Join(";", 
-                CleanStringForCsv(con.Name),
-                CleanStringForCsv(con.ConstantID),
-                CleanStringForCsv(con.Parent?.ConstantID ?? ""),
-                CleanStringForCsv(con.GetTreeNodeType()),
-                CleanStringForCsv(con.Description),
-                CleanStringForCsv(con.Icon),
-                CleanStringForCsv(con.Panel)))
-                .Append(";");
+            sb.Append(FormatForCsv(con.Name))
+                .Append(FormatForCsv(con.ConstantID))
+                .Append(FormatForCsv(con.Parent?.ConstantID ?? ""))
+                .Append(FormatForCsv(con.GetTreeNodeType()))
+                .Append(FormatForCsv(con.Description))
+                .Append(FormatForCsv(con.Icon))
+                .Append(FormatForCsv(con.Panel));
 
             if (_saveFilter.SaveUsername)
-                sb.Append($"{CleanStringForCsv(con.Username)};");
+                sb.Append(FormatForCsv(con.Username));
 
             if (_saveFilter.SavePassword)
-                sb.Append($"{CleanStringForCsv(con.Password)};");
+                sb.Append(FormatForCsv(con.Password));
 
             if (_saveFilter.SaveDomain)
-                sb.Append($"{CleanStringForCsv(con.Domain)};");
+                sb.Append(FormatForCsv(con.Domain));
 
-            sb.Append(string.Join(";",
-                CleanStringForCsv(con.Hostname),
-                CleanStringForCsv(con.Protocol),
-                CleanStringForCsv(con.PuttySession),
-                CleanStringForCsv(con.Port),
-                CleanStringForCsv(con.UseConsoleSession),
-                CleanStringForCsv(con.UseCredSsp),
-                CleanStringForCsv(con.RenderingEngine),
-                CleanStringForCsv(con.ICAEncryptionStrength),
-                CleanStringForCsv(con.RDPAuthenticationLevel),
-                CleanStringForCsv(con.LoadBalanceInfo),
-                CleanStringForCsv(con.Colors),
-                CleanStringForCsv(con.Resolution),
-                CleanStringForCsv(con.AutomaticResize),
-                CleanStringForCsv(con.DisplayWallpaper),
-                CleanStringForCsv(con.DisplayThemes),
-                CleanStringForCsv(con.EnableFontSmoothing),
-                CleanStringForCsv(con.EnableDesktopComposition),
-                CleanStringForCsv(con.CacheBitmaps),
-                CleanStringForCsv(con.RedirectDiskDrives),
-                CleanStringForCsv(con.RedirectPorts),
-                CleanStringForCsv(con.RedirectPrinters),
-                CleanStringForCsv(con.RedirectSmartCards),
-                CleanStringForCsv(con.RedirectSound),
-                CleanStringForCsv(con.RedirectKeys),
-                CleanStringForCsv(con.PreExtApp),
-                CleanStringForCsv(con.PostExtApp),
-                CleanStringForCsv(con.MacAddress),
-                CleanStringForCsv(con.UserField),
-                CleanStringForCsv(con.ExtApp),
-                CleanStringForCsv(con.VNCCompression),
-                CleanStringForCsv(con.VNCEncoding),
-                CleanStringForCsv(con.VNCAuthMode),
-                CleanStringForCsv(con.VNCProxyType),
-                CleanStringForCsv(con.VNCProxyIP),
-                CleanStringForCsv(con.VNCProxyPort),
-                CleanStringForCsv(con.VNCProxyUsername),
-                CleanStringForCsv(con.VNCProxyPassword),
-                CleanStringForCsv(con.VNCColors),
-                CleanStringForCsv(con.VNCSmartSizeMode),
-                CleanStringForCsv(con.VNCViewOnly),
-                CleanStringForCsv(con.RDGatewayUsageMethod),
-                CleanStringForCsv(con.RDGatewayHostname),
-                CleanStringForCsv(con.RDGatewayUseConnectionCredentials),
-                CleanStringForCsv(con.RDGatewayUsername),
-                CleanStringForCsv(con.RDGatewayPassword),
-                CleanStringForCsv(con.RDGatewayDomain)))
-                .Append(";");
+            sb.Append(FormatForCsv(con.Hostname))
+                .Append(FormatForCsv(con.Protocol))
+                .Append(FormatForCsv(con.PuttySession))
+                .Append(FormatForCsv(con.Port))
+                .Append(FormatForCsv(con.UseConsoleSession))
+                .Append(FormatForCsv(con.UseCredSsp))
+                .Append(FormatForCsv(con.RenderingEngine))
+                .Append(FormatForCsv(con.ICAEncryptionStrength))
+                .Append(FormatForCsv(con.RDPAuthenticationLevel))
+                .Append(FormatForCsv(con.LoadBalanceInfo))
+                .Append(FormatForCsv(con.Colors))
+                .Append(FormatForCsv(con.Resolution))
+                .Append(FormatForCsv(con.AutomaticResize))
+                .Append(FormatForCsv(con.DisplayWallpaper))
+                .Append(FormatForCsv(con.DisplayThemes))
+                .Append(FormatForCsv(con.EnableFontSmoothing))
+                .Append(FormatForCsv(con.EnableDesktopComposition))
+                .Append(FormatForCsv(con.CacheBitmaps))
+                .Append(FormatForCsv(con.RedirectDiskDrives))
+                .Append(FormatForCsv(con.RedirectPorts))
+                .Append(FormatForCsv(con.RedirectPrinters))
+                .Append(FormatForCsv(con.RedirectSmartCards))
+                .Append(FormatForCsv(con.RedirectSound))
+                .Append(FormatForCsv(con.RedirectKeys))
+                .Append(FormatForCsv(con.PreExtApp))
+                .Append(FormatForCsv(con.PostExtApp))
+                .Append(FormatForCsv(con.MacAddress))
+                .Append(FormatForCsv(con.UserField))
+                .Append(FormatForCsv(con.ExtApp))
+                .Append(FormatForCsv(con.VNCCompression))
+                .Append(FormatForCsv(con.VNCEncoding))
+                .Append(FormatForCsv(con.VNCAuthMode))
+                .Append(FormatForCsv(con.VNCProxyType))
+                .Append(FormatForCsv(con.VNCProxyIP))
+                .Append(FormatForCsv(con.VNCProxyPort))
+                .Append(FormatForCsv(con.VNCProxyUsername))
+                .Append(FormatForCsv(con.VNCProxyPassword))
+                .Append(FormatForCsv(con.VNCColors))
+                .Append(FormatForCsv(con.VNCSmartSizeMode))
+                .Append(FormatForCsv(con.VNCViewOnly))
+                .Append(FormatForCsv(con.RDGatewayUsageMethod))
+                .Append(FormatForCsv(con.RDGatewayHostname))
+                .Append(FormatForCsv(con.RDGatewayUseConnectionCredentials))
+                .Append(FormatForCsv(con.RDGatewayUsername))
+                .Append(FormatForCsv(con.RDGatewayPassword))
+                .Append(FormatForCsv(con.RDGatewayDomain));
 
 
             if (!_saveFilter.SaveInheritance)
                 return;
 
-            sb.Append(string.Join(";",
-                con.Inheritance.CacheBitmaps,
-                con.Inheritance.Colors,
-                con.Inheritance.Description,
-                con.Inheritance.DisplayThemes,
-                con.Inheritance.DisplayWallpaper,
-                con.Inheritance.EnableFontSmoothing,
-                con.Inheritance.EnableDesktopComposition,
-                con.Inheritance.Domain,
-                con.Inheritance.Icon,
-                con.Inheritance.Panel,
-                con.Inheritance.Password,
-                con.Inheritance.Port,
-                con.Inheritance.Protocol,
-                con.Inheritance.PuttySession,
-                con.Inheritance.RedirectDiskDrives,
-                con.Inheritance.RedirectKeys,
-                con.Inheritance.RedirectPorts,
-                con.Inheritance.RedirectPrinters,
-                con.Inheritance.RedirectSmartCards,
-                con.Inheritance.RedirectSound,
-                con.Inheritance.Resolution,
-                con.Inheritance.AutomaticResize,
-                con.Inheritance.UseConsoleSession,
-                con.Inheritance.UseCredSsp,
-                con.Inheritance.RenderingEngine,
-                con.Inheritance.Username,
-                con.Inheritance.ICAEncryptionStrength,
-                con.Inheritance.RDPAuthenticationLevel,
-                con.Inheritance.LoadBalanceInfo,
-                con.Inheritance.PreExtApp,
-                con.Inheritance.PostExtApp,
-                con.Inheritance.MacAddress,
-                con.Inheritance.UserField,
-                con.Inheritance.ExtApp,
-                con.Inheritance.VNCCompression,
-                con.Inheritance.VNCEncoding,
-                con.Inheritance.VNCAuthMode,
-                con.Inheritance.VNCProxyType,
-                con.Inheritance.VNCProxyIP,
-                con.Inheritance.VNCProxyPort,
-                con.Inheritance.VNCProxyUsername,
-                con.Inheritance.VNCProxyPassword,
-                con.Inheritance.VNCColors,
-                con.Inheritance.VNCSmartSizeMode,
-                con.Inheritance.VNCViewOnly,
-                con.Inheritance.RDGatewayUsageMethod,
-                con.Inheritance.RDGatewayHostname,
-                con.Inheritance.RDGatewayUseConnectionCredentials,
-                con.Inheritance.RDGatewayUsername,
-                con.Inheritance.RDGatewayPassword,
-                con.Inheritance.RDGatewayDomain,
-                con.Inheritance.RDPAlertIdleTimeout,
-                con.Inheritance.RDPMinutesToIdleTimeout,
-                con.Inheritance.SoundQuality));
+            sb.Append(FormatForCsv(con.Inheritance.CacheBitmaps))
+                .Append(FormatForCsv(con.Inheritance.Colors))
+                .Append(FormatForCsv(con.Inheritance.Description))
+                .Append(FormatForCsv(con.Inheritance.DisplayThemes))
+                .Append(FormatForCsv(con.Inheritance.DisplayWallpaper))
+                .Append(FormatForCsv(con.Inheritance.EnableFontSmoothing))
+                .Append(FormatForCsv(con.Inheritance.EnableDesktopComposition))
+                .Append(FormatForCsv(con.Inheritance.Domain))
+                .Append(FormatForCsv(con.Inheritance.Icon))
+                .Append(FormatForCsv(con.Inheritance.Panel))
+                .Append(FormatForCsv(con.Inheritance.Password))
+                .Append(FormatForCsv(con.Inheritance.Port))
+                .Append(FormatForCsv(con.Inheritance.Protocol))
+                .Append(FormatForCsv(con.Inheritance.PuttySession))
+                .Append(FormatForCsv(con.Inheritance.RedirectDiskDrives))
+                .Append(FormatForCsv(con.Inheritance.RedirectKeys))
+                .Append(FormatForCsv(con.Inheritance.RedirectPorts))
+                .Append(FormatForCsv(con.Inheritance.RedirectPrinters))
+                .Append(FormatForCsv(con.Inheritance.RedirectSmartCards))
+                .Append(FormatForCsv(con.Inheritance.RedirectSound))
+                .Append(FormatForCsv(con.Inheritance.Resolution))
+                .Append(FormatForCsv(con.Inheritance.AutomaticResize))
+                .Append(FormatForCsv(con.Inheritance.UseConsoleSession))
+                .Append(FormatForCsv(con.Inheritance.UseCredSsp))
+                .Append(FormatForCsv(con.Inheritance.RenderingEngine))
+                .Append(FormatForCsv(con.Inheritance.Username))
+                .Append(FormatForCsv(con.Inheritance.ICAEncryptionStrength))
+                .Append(FormatForCsv(con.Inheritance.RDPAuthenticationLevel))
+                .Append(FormatForCsv(con.Inheritance.LoadBalanceInfo))
+                .Append(FormatForCsv(con.Inheritance.PreExtApp))
+                .Append(FormatForCsv(con.Inheritance.PostExtApp))
+                .Append(FormatForCsv(con.Inheritance.MacAddress))
+                .Append(FormatForCsv(con.Inheritance.UserField))
+                .Append(FormatForCsv(con.Inheritance.ExtApp))
+                .Append(FormatForCsv(con.Inheritance.VNCCompression))
+                .Append(FormatForCsv(con.Inheritance.VNCEncoding))
+                .Append(FormatForCsv(con.Inheritance.VNCAuthMode))
+                .Append(FormatForCsv(con.Inheritance.VNCProxyType))
+                .Append(FormatForCsv(con.Inheritance.VNCProxyIP))
+                .Append(FormatForCsv(con.Inheritance.VNCProxyPort))
+                .Append(FormatForCsv(con.Inheritance.VNCProxyUsername))
+                .Append(FormatForCsv(con.Inheritance.VNCProxyPassword))
+                .Append(FormatForCsv(con.Inheritance.VNCColors))
+                .Append(FormatForCsv(con.Inheritance.VNCSmartSizeMode))
+                .Append(FormatForCsv(con.Inheritance.VNCViewOnly))
+                .Append(FormatForCsv(con.Inheritance.RDGatewayUsageMethod))
+                .Append(FormatForCsv(con.Inheritance.RDGatewayHostname))
+                .Append(FormatForCsv(con.Inheritance.RDGatewayUseConnectionCredentials))
+                .Append(FormatForCsv(con.Inheritance.RDGatewayUsername))
+                .Append(FormatForCsv(con.Inheritance.RDGatewayPassword))
+                .Append(FormatForCsv(con.Inheritance.RDGatewayDomain))
+                .Append(FormatForCsv(con.Inheritance.RDPAlertIdleTimeout))
+                .Append(FormatForCsv(con.Inheritance.RDPMinutesToIdleTimeout))
+                .Append(FormatForCsv(con.Inheritance.SoundQuality));
         }
 
-        /// <summary>
-        /// Remove text that is unsafe for use in CSV files
-        /// </summary>
-        /// <param name="text"></param>
-        private string CleanStringForCsv(object text)
+        private string FormatForCsv(object value)
         {
-            return text.ToString().Replace(";", "");
+            var cleanedString = value.ToString().Replace(";", "");
+            return cleanedString + ";";
         }
     }
 }

mRemoteV1/Connection/ConnectionInfo.cs

@@ -131,15 +131,10 @@ namespace mRemoteNG.Connection
 	    {
             RemoveParent();
 		    newParent?.AddChild(this);
-			if (newParent is RootNodeInfo)
-				Inheritance.DisableInheritance();
 	    }
 
         public void RemoveParent()
         {
-			if (Parent is RootNodeInfo)
-				Inheritance.EnableInheritance();
-
             Parent?.RemoveChild(this);
         }
 

mRemoteV1/Container/ContainerInfo.cs

@@ -63,7 +63,7 @@ namespace mRemoteNG.Container
             AddChildAt(newChildItem, newChildIndex);
         }
 
-        public void AddChildAt(ConnectionInfo newChildItem, int index)
+        public virtual void AddChildAt(ConnectionInfo newChildItem, int index)
         {
             if (Children.Contains(newChildItem)) return;
             newChildItem.Parent?.RemoveChild(newChildItem);
@@ -81,7 +81,7 @@ namespace mRemoteNG.Container
             }
         }
 
-        public void RemoveChild(ConnectionInfo removalTarget)
+        public virtual void RemoveChild(ConnectionInfo removalTarget)
         {
             if (!Children.Contains(removalTarget)) return;
             removalTarget.Parent = null;

mRemoteV1/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // <Assembly: AssemblyVersion("1.0.*")>
 
-[assembly: AssemblyVersion("1.76.2.*")]
+[assembly: AssemblyVersion("1.76.3.*")]
 [assembly: NeutralResourcesLanguage("en")]

mRemoteV1/Tree/Root/RootNodeInfo.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;
 
@@ -68,5 +69,17 @@ namespace mRemoteNG.Tree.Root
             return TreeNodeType.Root;
         }
         #endregion
-    }
+
+	    public override void AddChildAt(ConnectionInfo newChildItem, int index)
+	    {
+            newChildItem.Inheritance.DisableInheritance();
+	        base.AddChildAt(newChildItem, index);
+	    }
+
+	    public override void RemoveChild(ConnectionInfo removalTarget)
+	    {
+            removalTarget.Inheritance.EnableInheritance();
+	        base.RemoveChild(removalTarget);
+	    }
+	}
 }