refactored relationship between protocol objects and interfacecontrol

.github/ISSUE_TEMPLATE.md

@@ -1,30 +1,16 @@
-<!--- Provide a general summary of the issue in the Title above -->
+<!--
+Only file GitHub issues for bugs and feature requests.  All other topics will be closed.
 
-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
+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.
+-->
 
-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+<!-- Bug -->
+|Detail|Value|
+|--:|---|
+|Operating system | Windows 10 x64 |
+|mRemoteNG version| 1.75.7008  |
 
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
 
-## Steps to Reproduce (for bugs)
-<!--- Provide an unambiguous set of steps to reproduce -->
-<!--- this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Operating System and version (e.g. Windows 10 1709 x64):
+<!-- Feature Request -->
+<!-- If you file a feature request, please delete the bug section -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +1,4 @@
-<!--- Provide a general summary of your changes in the Title above -->
-
-## Description
-<!--- Describe your changes in detail -->
-
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Screenshots (if appropriate):
-
-## Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to change)
-
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the code style of this project.
-- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly.
-- [ ] I have read the **CONTRIBUTING** document.
+<!--
+Please provide as much detail as possible with what your pull request does.
+Include a reference to a filed issue if it exists.
+-->

CHANGELOG.TXT

@@ -1,87 +1,12 @@
-1.76.7 (2018-08-22):
-
-Fixes:
-------
-#1076: Wrong object selected when duplicating connection then switching between properties and inheritance in config window
-#1068: Fixed some toolbar positioning bugs
-
-
-1.76.6 (2018-08-03):
-
-Fixes:
-------
-#1062: Entering correct password when starting app does not load connections file
-
-1.76.5 (2018-08-02):
-
-Fixes:
-------
-#1057: Hitting F2 with no connection node selected caused unhandled exception
-#1052: 'Switch to notification panel' feature does not always switch
-#1051: Tooltips always displayed regardless of 'Show description tooltips in connection tree' setting
-#1050: Config window retains access to previously selected node after loading new connections file
-#1045: Config window shows several incorrect properties for HTTPS connections
-#1040: Canceling "select panel" form does not cancel
-#1039: Set default theme when themes disabled
-#1038: Unable to add connection with active filter
-#1036: Exception when themes are active and options page closed on Connections then reopened
-#1034: Connection context menu not being translated
-#1030: Exception thrown if importing from port scan and no tree node is selected
-#1020: BackupFileKeepCount setting not limiting backup file count
-#1004: Duplicating root or PuTTy node through hotkey causes unhandled exception
-#1002: Disabling filtering without clearing keyword leaves filtered state
-#1001: Connection tree context menu hotkeys stop working and disappear in some cases
-#999: Some hotkeys stop working if File menu was called when PuTTy Saved Sessions was selected
-#998: Can sometimes add connection under PuTTY Sessions node
-#991: Error when deleting host in filtered view
-#971: Portable Settings now apply to any machine they are used on
-#961: Connections file overwritten if correct decryption password not provided
-#893: Removed unneeded files from build/package
-#868: if statement returned the same value
-#762: Increased button size to fit locaized text
-
-
-1.76.4 Alpha 6 (2018-06-03):
-
-Features/Enhancements:
-----------------------
-#948: Fixed issue where many menu item translations were not being used
-#942: Improved Russian translation of several items
-#924: Notification for "No Host Specified" when clicking folders in quick-connect menu
-#902: Menu bar can once again be moved. View -> "Lock toolbar positions" now also locks the menu position
-Added option for creating an empty panel on startup
-
-Fixes:
-------
-#938: Minor layout improvements on the Port Scan screen
-#916: Default properties were not being saved
-
-
-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:
-------
-#899: DoNotPlay is Case Sensitive in XML Serialization
-
-
-1.76.1 Alpha 3 (2018-02-24):
+1.76.0 Alpha 3 (2018-xx-xx):
 
 Features/Enhancements:
 ----------------------
 #625: Added ability to import mRemoteNG formatted CSV files
-#648: The port scan ping timeout is now configurable
 
 Fixes:
 ------
-Fixed a few Xml serialization bugs that would occur if boolean values weren't capitalized
+
 
 
 1.76.0 Alpha 2 (2018-02-01):

CREDITS.TXT

@@ -23,7 +23,6 @@ github.com/DamianBis
 github.com/pfjason
 github.com/sirLoaf
 github.com/Fyers
-Vladimir Semenov (github.com/sli-pro)
 
 
 Past Contributors
@@ -60,8 +59,6 @@ Lukas Plachy (github.com/rheingold)
 Gyuha Shin
 Stefan (github.com/polluks)
 github.com/emazv72
-Vladimir Semenov (github.com/sli-pro)
-Marco Sousa (github.com/marcomsousa)
 
 
 Included Source Code

Jenkinsfile

@@ -1,8 +1,8 @@
-#!groovy​
 node('windows') {
 	def jobDir = pwd()
 	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
-	def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
+	def vsToolsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools"
+	def vsExtensionsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow"
 	def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe"
 	def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe"
 	def reportGeneratorPath = "${jobDir}\\packages\\ReportGenerator.3.0.2\\tools\\ReportGenerator.exe"
@@ -24,11 +24,11 @@ node('windows') {
 	}
 
 	stage ('Build mRemoteNG (Normal)') {
-		bat "\"${msBuild}\" /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+		bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
 	}
 
 	stage ('Build mRemoteNG (Portable)') {
-		bat "\"${msBuild}\" /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+		bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
 	}
 
 	stage ('Run Unit Tests (Normal, w/coverage)') {

Jenkinsfile_publish.groovy

@@ -1,13 +1,9 @@
 node('windows') {
 	def jobDir = pwd()
 	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
-    def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
-    def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe"
-    def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe"
-    def testResultFilePrefix = "TestResult"
-    def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml"
-    def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml"
-    def coverageReport = "code_coverage_report.xml"
+	def vsToolsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools"
+	def vsExtensionsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow"
+	def nunitTestAdapterPath = "C:\\Users\\Administrator\\AppData\\Local\\Microsoft\\VisualStudio\\14.0\\Extensions"
 
 	
 	stage ('Clean output dir') {
@@ -36,24 +32,24 @@ node('windows') {
     withCredentials([file(credentialsId: '9b674d57-6792-48e3-984a-4d1bab2abb64', variable: 'CODE_SIGNING_CERT')]) {
         withCredentials([usernamePassword(credentialsId: '05b7449b-05c0-490f-8661-236242526e62', passwordVariable: 'MRNG_CERT_PASSWORD', usernameVariable: 'NO_USERNAME')]) {
             stage ('Build mRemoteNG (Normal - MSI)') {
-                bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Installer\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
+                bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /t:Clean,Build /p:Configuration=\"Release Installer\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
                 archiveArtifacts artifacts: "Release\\*.msi", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
             }
         
             stage ('Build mRemoteNG (Portable)') {
-                bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Portable\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
+                bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /t:Clean,Build /p:Configuration=\"Release Portable\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
                 archiveArtifacts artifacts: "Release\\*.zip", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
             }
         }
     }
 	
-    stage ('Run Unit Tests (Normal - MSI)') {
-        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86"
-    }
-    
-    stage ('Run Unit Tests (Portable)') {
-        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86"
-    }
+	stage ('Run Unit Tests (Normal - MSI)') {
+    	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /logger:trx /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\Release\\mRemoteNGTests.dll\""
+	}
+
+	stage ('Run Unit Tests (Portable)') {
+    	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /logger:trx /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\Release Portable\\mRemoteNGTests.dll\""
+	}
 
     stage ('Generate UpdateCheck Files') {
         bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\create_upg_chk_files.ps1\" -TagName \"${env.TagName}\" -UpdateChannel \"${env.UpdateChannel}\""

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.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.76Alpha5/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76Alpha5) |
+| 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.76Alpha2/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76Alpha2) |
 
 mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
 

Tools/7zip/License.txt

@@ -3,7 +3,7 @@
       License for use and distribution
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-      Copyright (C) 1999-2018 Igor Pavlov.
+      Copyright (C) 1999-2016 Igor Pavlov.
 
       7-Zip Extra files are under the GNU LGPL license.
 

Tools/7zip/history.txt

@@ -1,25 +1,6 @@
 7-Zip Extra history
 -------------------
 
-This file contains only information about changes related to that package exclusively.
-The full history of changes is listed in history.txt in main 7-Zip program.
-
-
-18.05          2018-04-30
--------------------------
-- The speed for LZMA/LZMA2 compressing was increased 
-    by 8% for fastest/fast compression levels and 
-    by 3% for normal/maximum compression levels.
-
-
-18.03 beta     2018-03-04
--------------------------
-- The speed for single-thread LZMA/LZMA2 decoding
-  was increased  by 30% in x64 version and by 3% in x86 version.
-- 7-Zip now can use multi-threading for 7z/LZMA2 decoding,
-  if there are multiple independent data chunks in LZMA2 stream.
-
-
 9.35 beta           2014-12-07
 ------------------------------
   - SFX modules were moved to LZMA SDK package.

Tools/7zip/readme.txt

@@ -1,9 +1,9 @@
-7-Zip Extra 18.05
+7-Zip Extra 16.02
 -----------------
 
 7-Zip Extra is package of extra modules of 7-Zip. 
 
-7-Zip Copyright (C) 1999-2018 Igor Pavlov.
+7-Zip Copyright (C) 1999-2016 Igor Pavlov.
 
 7-Zip is free software. Read License.txt for more information about license.
 

Tools/CreateBulkConnections_ConfCons2_6.ps1

@@ -1,114 +0,0 @@
-#####################################
-# 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'
-}
-
-$assembly = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $PathToMrngFolder -ChildPath "mRemoteNG.exe"))
-$assembly = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $PathToMrngFolder -ChildPath "BouncyCastle.Crypto.dll"))
-
-function New-mRemoteNGXmlSerializer {
-    [CmdletBinding()]
-    param (
-        [SecureString]
-        $EncryptionKey
-    )
-
-    PROCESS {
-        $cryptoProvider = New-Object -TypeName mRemoteNG.Security.SymmetricEncryption.AeadCryptographyProvider
-        $saveFilter = New-Object -TypeName mRemoteNG.Security.SaveFilter -ArgumentList @($false)
-        $xmlSerializer = New-Object -TypeName mRemoteNG.Config.Serializers.XmlConnectionNodeSerializer -ArgumentList @($cryptoProvider, $encryptionKey, $saveFilter)
-        Write-Output $xmlSerializer
-    }
-}
-
-function New-mRemoteNGConnectionInfo {
-    [CmdletBinding()]
-    param ()
-
-    PROCESS {
-        $connectionInfo = New-Object -TypeName mRemoteNG.Connection.ConnectionInfo
-        Write-Output $connectionInfo
-    }
-}
-
-function New-mRemoteNGContainerInfo {
-    [CmdletBinding()]
-    param ()
-
-    PROCESS {
-        $connectionInfo = New-Object -TypeName mRemoteNG.Container.ContainerInfo
-        Write-Output $connectionInfo
-    }
-}
-
-# Setup the services needed to do serialization
-$xmlSerializer = New-mRemoteNGXmlSerializer -EncryptionKey $EncryptionKey
-
-
-
-#----------------------------------------------------------------
-# 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 = ""
-foreach($i in 1..5)
-{
-    $connectionInfo = New-mRemoteNGConnectionInfo
-
-    # Set connection info properties
-    $connectionInfo.Name = "server-$i"
-    $connectionInfo.Hostname = "some-win-server-$i"
-    $connectionInfo.Protocol = [mRemoteNG.Connection.Protocol.ProtocolType]::RDP
-    $connectionInfo.Inheritance.Username = $true
-    $connectionInfo.Inheritance.Domain = $true
-    $connectionInfo.Inheritance.Password = $true
-
-    $serializedConnection = $xmlSerializer.SerializeConnectionInfo($connectionInfo).ToString()
-    $xml += $serializedConnection + [System.Environment]::NewLine
-}
-
-Write-Output $xml
-
-
-
-
-#----------------------------------------------------------------
-# Example 2: serialize a container which has connections
-# You can also create containers and add connections to them, which will be nested correctly when serialized
-$xml = ""
-$container = New-mRemoteNGContainerInfo
-$container.Name = "ProductionServers"
-$serializedContainer = $xmlSerializer.SerializeConnectionInfo($container)
-
-foreach($i in 1..3)
-{
-    $connectionInfo = New-mRemoteNGConnectionInfo
-
-    # Set connection info properties
-    $connectionInfo.Name = "server-$i"
-    $connectionInfo.Hostname = "some-linux-server-$i"
-    $connectionInfo.Protocol = [mRemoteNG.Connection.Protocol.ProtocolType]::SSH2
-    $connectionInfo.Inheritance.Username = $true
-    $connectionInfo.Inheritance.Domain = $true
-    $connectionInfo.Inheritance.Password = $true
-    
-    # serialize the connection
-    $serializedConnection = $xmlSerializer.SerializeConnectionInfo($connectionInfo)
-    # add the connection to the container
-    $serializedContainer.Add($serializedConnection)
-}
-
-# Call ToString() on the top-level container to get the XML of it and all its children
-Write-Output $serializedContainer.ToString()

Tools/github_functions.ps1

@@ -1,6 +1,5 @@
 $githubUrl = 'https://api.github.com'
-# GitHub doesn't support the default powershell protocol (TLS 1.0)
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
 
 function Publish-GitHubRelease {
     param (
@@ -175,14 +174,9 @@ function Upload-GitHubReleaseAsset {
     )
 
     $UploadUri = $UploadUri -replace "(\{[\w,\?]*\})$"
-    $files = Get-Item -Path $FilePath
+    $file = Get-Item -Path $FilePath
 
-    # Get-Item could produce an array of files if a wildcard is provided. (C:\*.txt)
-    # Upload each matching item individually
-    foreach ($file in $files) {
-        Write-Output "Uploading asset to GitHub release: '$($file.FullName)'"
-        $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
-    }
+    $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
 }
 
 

Tools/postbuild_mremotev1.ps1

@@ -45,6 +45,5 @@ Format-Table -AutoSize -Wrap -InputObject @{
 & "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning
-& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath
-& "$PSScriptRoot\zip_symbols.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/rename_installer_with_version.ps1

@@ -9,7 +9,7 @@ Write-Host $SolutionDir
 Write-Host $renameTarget
 
 $targetVersionedFile = "$SolutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
-$version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
+$version = &"$SolutionDir\Tools\sigcheck.exe" /accepteula -q -n $targetVersionedFile
 
 
 $renameTargetFileObject = Get-Item -Path $renameTarget -ErrorAction SilentlyContinue

Tools/tidy_files_for_release.ps1

@@ -15,6 +15,7 @@ if ($ConfigurationName -match "Release") {
     Write-Output "Removing unnecessary files from Release versions"
     Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
     $filesToDelete = Get-ChildItem -Path $TargetDir -Recurse -Include @(
+        "*.pdb",
         "*.publish",
         "*.xml",
         "*.backup",

Tools/verify_binary_signatures.ps1

@@ -8,7 +8,6 @@ param (
     $ConfigurationName,
     
     [string]
-    [Parameter(Mandatory=$true)]
     # The code signing certificate to use when signing the files.
     $CertificatePath
 )

Tools/zip_portable_files.ps1

@@ -13,49 +13,13 @@ param (
 )
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+$path_packageZipScript = Join-Path -Path $SolutionDir -ChildPath "Tools\build-relport.cmd"
 
-if(-not [string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
-    Write-Output "Too early to run via Appveyor - artifacts don't get generated properly. Exiting"
-    Exit
-}
-
-Write-Output "Solution Dir: '$($SolutionDir)'"
-Write-Output "Target Dir: '$($TargetDir)'"
-$ConfigurationName = $ConfigurationName.Trim()
-Write-Output "Config Name (tirmmed): '$($ConfigurationName)'"
-
-
-# Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
-$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe"
-$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
 
 # Package Zip
-if ($ConfigurationName -eq "Release Portable") {
+if ($ConfigurationName -match "Release" -and $ConfigurationName -match "Portable") {
     Write-Output "Packaging Release Portable ZIP"
-   
-    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
-
-    Write-Output "Version is $($version)"
-
-    $PortableZip="$($SolutionDir)Release\mRemoteNG-Portable-$($version).zip"
-
-    $tempFolderPath = Join-Path -Path $SolutionDir -ChildPath "mRemoteV1\bin\package"
-    Remove-Item -Recurse $tempFolderPath -ErrorAction SilentlyContinue | Out-Null
-    New-Item $tempFolderPath -ItemType  "directory" | Out-Null
-    
-    Copy-Item "$($SolutionDir)mRemoteV1\Resources\PuTTYNG.exe" -Destination $tempFolderPath
-
-    #Write-Output "$($SolutionDir)mRemoteV1\bin\$ConfigurationName" 
-    #Write-Output "$($SolutionDir)mRemoteV1\bin\package"
-    Copy-Item "$($SolutionDir)mRemoteV1\bin\$ConfigurationName\*" -Destination $tempFolderPath -Recurse  -Force
-    # Delete any PDB files that accidentally get copied into the temp folder
-    Get-ChildItem -Path $tempFolderPath -Filter "*.pdb" | Remove-Item
-    Copy-Item "$($SolutionDir)*.txt" -Destination $tempFolderPath
-
-    Write-Output "Creating portable ZIP file $($PortableZip)"
-    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
-    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip (Join-Path -Path $tempFolderPath -ChildPath "*.*")
-    #& $SEVENZIP a -bt -mx=9 -tzip -y $PortableZip "$($SolutionDir)*.TXT"
+    & $path_packageZipScript
 }
 else {
     Write-Output "We will not zip anything - this isnt a portable release build."

Tools/zip_portable_files_appv.ps1

@@ -1,39 +0,0 @@
-if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
-    Write-Output "NOT running via Appveyor - Exiting"
-    Exit
-}
-
-$appvDir = $Env:APPVEYOR_BUILD_FOLDER
-
-Write-Output "Appveyor Build Dir: '$($appvDir)'"
-$ConfigurationName = $Env:CONFIGURATION.Trim()
-Write-Output "Config Name (tirmmed): '$($ConfigurationName)'"
-
-
-$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe"
-$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
-
-if ($ConfigurationName -eq "Release Portable") {
-    Write-Output "Packaging Release Portable ZIP"
-   
-    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
-
-    Write-Output "Version is $($version)"
-
-    $PortableZip="$($SolutionDir)Release\mRemoteNG-Portable-$($version).zip"
-
-    Remove-Item -Recurse "$($SolutionDir)mRemoteV1\bin\package" -ErrorAction SilentlyContinue | Out-Null
-    New-Item "$($SolutionDir)mRemoteV1\bin\package" -ItemType  "directory" | Out-Null
-    
-    Copy-Item "$($SolutionDir)mRemoteV1\Resources\PuTTYNG.exe" -Destination "$($SolutionDir)mRemoteV1\bin\package"
-
-    Copy-Item "$($SolutionDir)mRemoteV1\bin\$ConfigurationName\*" -Destination "$($SolutionDir)mRemoteV1\bin\package" -Recurse  -Force 
-    Copy-Item "$($SolutionDir)*.txt" -Destination "$($SolutionDir)mRemoteV1\bin\package"
-
-    Write-Output "Creating portable ZIP file $($PortableZip)"
-    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
-    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip "$($SolutionDir)mRemoteV1\bin\package\*.*"
-}
-else {
-    Write-Output "We will not zip anything - this isnt a portable release build."
-}

Tools/zip_symbols.ps1

@@ -1,56 +0,0 @@
-param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $SolutionDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TargetDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $ConfigurationName
-)
-
-Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-if(-not [string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
-    Write-Output "Too early to run via Appveyor - artifacts don't get generated properly. Exiting"
-    Exit
-}
-
-Write-Output "Solution Dir: '$($SolutionDir)'"
-Write-Output "Target Dir: '$($TargetDir)'"
-$ConfigurationName = $ConfigurationName.Trim()
-Write-Output "Config Name (trimmed): '$($ConfigurationName)'"
-
-
-# Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
-$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe"
-$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
-
-# Package Zip
-if ($ConfigurationName -match "Release") {
-    Write-Output "Packaging debug symbols"
-   
-    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
-
-    Write-Output "Version is $($version)"
-
-    if ($ConfigurationName -match "Portable") {
-        $zipFilePrefix = "mRemoteNG-Portable-symbols"
-    } else {
-        $zipFilePrefix = "mRemoteNG-symbols"
-    }
-
-    $outputZipPath="$($SolutionDir)Release\$zipFilePrefix-$($version).zip"
-
-    Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
-    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
-    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath (Join-Path -Path $TargetDir -ChildPath "*.pdb")
-}
-else {
-    Write-Output "We will not package debug symbols - this isnt a release build."
-}
-
-Write-Output ""

appveyor.yml

@@ -1,11 +1,10 @@
-version: 1.76.{build}
+version: 1.0.{build}
 pull_requests:
   do_not_increment_build_number: true
 image: Visual Studio 2017
 configuration:
 - Release
 - Release Portable
-- Release Installer
 platform: x86
 clone_depth: 1
 install:
@@ -15,14 +14,7 @@ before_build:
 build:
   project: mRemoteV1.sln
   verbosity: normal
-after_build:
-- ps: "if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {\n    Write-Output \"NOT running via Appveyor - Exiting\"\n    Exit\n}\n\n$appvDir = $Env:APPVEYOR_BUILD_FOLDER\n\nWrite-Output \"Appveyor Build Dir: '$($appvDir)'\"\n$ConfigurationName = $Env:CONFIGURATION.Trim()\nWrite-Output \"Config Name (tirmmed): '$($ConfigurationName)'\"\n\n\n$SIGCHECK=\"$($SolutionDir)Tools\\exes\\sigcheck.exe\"\n$SEVENZIP=\"$($SolutionDir)Tools\\7zip\\7za.exe\"\n\nif ($ConfigurationName -eq \"Release Portable\") {\n    Write-Output \"Packaging Release Portable ZIP\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"$($SolutionDir)mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    $PortableZip=\"$($SolutionDir)Release\\mRemoteNG-Portable-$($version).zip\"\n\n    Remove-Item -Recurse \"$($SolutionDir)mRemoteV1\\bin\\package\" -ErrorAction SilentlyContinue | Out-Null\n    New-Item \"$($SolutionDir)mRemoteV1\\bin\\package\" -ItemType  \"directory\" | Out-Null\n    \n    Copy-Item \"$($SolutionDir)mRemoteV1\\Resources\\PuTTYNG.exe\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\"\n\n    Copy-Item \"$($SolutionDir)mRemoteV1\\bin\\$ConfigurationName\\*\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\" -Recurse  -Force \n    Copy-Item \"$($SolutionDir)*.txt\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\"\n\n    Write-Output \"Creating portable ZIP file $($PortableZip)\"\n    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue\n    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip \"$($SolutionDir)mRemoteV1\\bin\\package\\*.*\"\n}\nelse {\n    Write-Output \"We will not zip anything - this isnt a portable release build.\"\n}"
 test:
   assemblies:
     only:
-    - mRemoteNGTests\bin\$(configuration)\mRemoteNGTests.dll
-artifacts:
-- path: Release\*.msi
-  name: mRemoteNG-installer.msi
-- path: Release\*.zip
-  name: mRemoteNG-portable.zip
+    - mRemoteNGTests\bin\$(configuration)\mRemoteNGTests.dll

mRemoteNGTests/Config/CredentialHarvesterTests.cs

@@ -4,7 +4,6 @@ using System.Security;
 using System.Xml.Linq;
 using mRemoteNG.Config;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs

@@ -1,96 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Xml;
-using System.Xml.Schema;
-using mRemoteNG.Config.Serializers.Xml;
-using mRemoteNG.Security;
-using mRemoteNG.Security.SymmetricEncryption;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-using mRemoteNGTests.TestHelpers;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
-{
-    public class ValidateXmlSchemas
-    {
-        private XmlConnectionsSerializer _serializer;
-        private ConnectionTreeModel _connectionTreeModel;
-        private ICryptographyProvider _cryptographyProvider;
-        private XmlReaderSettings _xmlReaderSettings;
-
-        [SetUp]
-        public void Setup()
-        {
-            _connectionTreeModel = new ConnectionTreeModelBuilder().Build();
-            _cryptographyProvider = new AeadCryptographyProvider();
-            var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
-                _cryptographyProvider,
-                _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
-                new SaveFilter());
-            _serializer = new XmlConnectionsSerializer(_cryptographyProvider, connectionNodeSerializer);
-            _xmlReaderSettings = new XmlReaderSettings
-            {
-                ValidationType = ValidationType.Schema,
-                ValidationFlags = XmlSchemaValidationFlags.ProcessInlineSchema |
-                                  XmlSchemaValidationFlags.ProcessSchemaLocation |
-                                  XmlSchemaValidationFlags.ReportValidationWarnings
-            };
-        }
-
-        [Test]
-        public void ValidateSchema()
-        {
-            var sb = new StringBuilder();
-            var xml = _serializer.Serialize(_connectionTreeModel);
-
-            var schemaFile = GetTargetPath("mremoteng_confcons_v2_6.xsd");
-            _xmlReaderSettings.Schemas.Add("http://mremoteng.org", schemaFile);
-            _xmlReaderSettings.ValidationEventHandler += (sender, args) =>
-            {
-                sb.AppendLine($"{args.Severity}: {args.Message}");
-            };
-
-            using (var stream = GenerateStreamFromString(xml))
-            {
-                var reader = XmlReader.Create(stream, _xmlReaderSettings);
-                while (reader.Read()) ;
-            }
-
-            Assert.That(sb.ToString(), Is.Empty);
-        }
-
-        public string GetTargetPath(string fileName, [CallerFilePath] string sourceFilePath = "")
-        {
-            const string debugOrRelease =
-#if DEBUG
-                "Debug";
-#else
-				"Release";
-#endif
-
-            const string normalOrPortable =
-#if PORTABLE
-                " Portable";
-#else
-            "";
-#endif
-            var path = Path.GetDirectoryName(sourceFilePath);
-            var filePath = $@"{path}\..\..\..\..\bin\{debugOrRelease}{normalOrPortable}\Schemas\{fileName}";
-            return filePath;
-        }
-
-        private Stream GenerateStreamFromString(string s)
-        {
-            var stream = new MemoryStream();
-            var writer = new StreamWriter(stream);
-            writer.Write(s);
-            writer.Flush();
-            stream.Position = 0;
-            return stream;
-        }
-    }
-}

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializerTests.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -9,7 +9,7 @@ using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlConnectionsDeserializerTests
     {
@@ -18,7 +18,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 
         public void Setup(string confCons, string password)
         {
-            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(() => password.ConvertToSecureString());
+            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(password.ConvertToSecureString);
             _connectionTreeModel = _xmlConnectionsDeserializer.Deserialize(confCons);
         }
 
@@ -104,14 +104,6 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
             Assert.That(folder22.Inheritance.Username, Is.True);
         }
 
-        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
-        public void ExpandedPropertyGetsDeserialized(Datagram testData)
-        {
-            Setup(testData.ConfCons, testData.Password);
-            var folder1 = GetFolderNamed("Folder1", _connectionTreeModel.GetRecursiveChildList());
-            Assert.That(folder1.IsExpanded, Is.True);
-        }
-
         private bool ContainsNodeNamed(string name, IEnumerable<ConnectionInfo> list)
         {
             return list.Any(node => node.Name == name);

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompilerTests.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Xml.XPath;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -10,7 +9,7 @@ using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
 	public class XmlConnectionsDocumentCompilerTests
     {

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptorTests.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Xml.Linq;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -10,7 +9,7 @@ using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
 	public class XmlConnectionsDocumentEncryptorTests
     {

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializerTests.cs

@@ -2,7 +2,6 @@
 using System.Xml;
 using System.Xml.Linq;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -11,7 +10,7 @@ using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
 	public class XmlConnectionsSerializerTests
     {
@@ -56,7 +55,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         [TestCase("Username", "")]
         [TestCase("Domain", "")]
         [TestCase("Password", "")]
-        [TestCase("InheritAutomaticResize", "false")]
+        [TestCase("InheritAutomaticResize", "False")]
         public void SerializerRespectsSaveFilterSettings(string attributeName, string expectedValue)
         {
             var connectionNodeSerializer = new XmlConnectionNodeSerializer26(

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializerTests.cs

@@ -2,14 +2,13 @@
 using System.Collections;
 using System.Xml.Linq;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlRootNodeSerializerTests
     {
@@ -76,7 +75,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         {
             var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, fullFileEncryption);
             var attributeValue = element.Attribute(XName.Get("FullFileEncryption"))?.Value;
-            Assert.That(bool.Parse(attributeValue), Is.EqualTo(fullFileEncryption));
+            Assert.That(attributeValue, Is.EqualTo(fullFileEncryption.ToString()));
         }
 
         [TestCase("", "ThisIsNotProtected")]

mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs

@@ -1,5 +1,4 @@
-using System.Linq;
-using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -27,7 +26,7 @@ namespace mRemoteNGTests.Config.Serializers
         {
             var model = CreateConnectionTreeModel();
             var dataTable = _dataTableSerializer.Serialize(model);
-            Assert.That(dataTable.Rows.Count, Is.EqualTo(model.GetRecursiveChildList().Count()));
+            Assert.That(dataTable.Rows.Count, Is.EqualTo(3));
         }
 
         [Test]

mRemoteNGTests/Config/Serializers/MiscSerializers/CsvConnectionsDeserializerMremotengFormatTests.cs

@@ -1,7 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.MiscSerializers;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.Http;
@@ -10,29 +11,28 @@ using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Credential;
 using mRemoteNG.Security;
-using mRemoteNGTests.TestHelpers;
 using NSubstitute;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
+namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
-    public class CsvConnectionsDeserializerMremotengFormatTests
+	public class CsvConnectionsDeserializerMremotengFormatTests
     {
         private CsvConnectionsDeserializerMremotengFormat _deserializer;
-        private CsvConnectionsSerializerMremotengFormat _serializer;
+        private ICredentialRepositoryList _credentialRepositoryList;
 
         [SetUp]
         public void Setup()
         {
             _deserializer = new CsvConnectionsDeserializerMremotengFormat();
-            var credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
-            _serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), credentialRepositoryList);
+            _credentialRepositoryList = Substitute.For<ICredentialRepositoryList>();
         }
 
         [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.ConnectionPropertyTestCases))]
         public object ConnectionPropertiesDeserializedCorrectly(string propertyToCheck)
         {
-            var csv = _serializer.Serialize(GetTestConnection());
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            var csv = serializer.Serialize(GetTestConnection());
             var deserializedConnections = _deserializer.Deserialize(csv);
             var connection = deserializedConnections.GetRecursiveChildList().FirstOrDefault();
             var propertyValue = typeof(ConnectionInfo).GetProperty(propertyToCheck)?.GetValue(connection);
@@ -42,29 +42,14 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
         [TestCaseSource(typeof(DeserializationTestSource), nameof(DeserializationTestSource.InheritanceTestCases))]
         public object InheritancePropertiesDeserializedCorrectly(string propertyToCheck)
         {
-            var csv = _serializer.Serialize(GetTestConnectionWithAllInherited());
+            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
+            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;
         }
 
-        [Test]
-        public void TreeStructureDeserializedCorrectly()
-        {
-            //Root
-            // |- folder1
-            // |   |- Con1
-            // |- Con2
-            var treeModel = new ConnectionTreeModelBuilder().Build();
-            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");
-            Assert.That(con1.Parent, Is.EqualTo(folder1));
-        }
-
         internal static ConnectionInfo GetTestConnection()
         {
             return new ConnectionInfo
@@ -97,9 +82,9 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 UseCredSsp = true,
                 RenderingEngine = HTTPBase.RenderingEngine.Gecko,
                 ICAEncryptionStrength = IcaProtocol.EncryptionStrength.Encr40Bit,
-                RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth,
-                Colors = RdpProtocol.RDPColors.Colors16Bit,
-                Resolution = RdpProtocol.RDPResolutions.Res1366x768,
+                RDPAuthenticationLevel = RdpAuthenticationLevel.WarnOnFailedAuth,
+                Colors = RdpColors.Colors16Bit,
+                Resolution = RdpResolutions.Res1366x768,
                 AutomaticResize = true,
                 DisplayWallpaper = true,
                 DisplayThemes = true,
@@ -110,7 +95,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 RedirectPorts = true,
                 RedirectPrinters = true,
                 RedirectSmartCards = true,
-                RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer,
+                RedirectSound = RdpSounds.LeaveAtRemoteComputer,
                 RedirectKeys = true,
                 VNCCompression = ProtocolVNC.Compression.Comp4,
                 VNCEncoding = ProtocolVNC.Encoding.EncRRE,
@@ -120,8 +105,8 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 VNCColors = ProtocolVNC.Colors.Col8Bit,
                 VNCSmartSizeMode = ProtocolVNC.SmartSizeMode.SmartSAspect,
                 VNCViewOnly = true,
-                RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Detect,
-                RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.SmartCard
+                RDGatewayUsageMethod = RDGatewayUsageMethod.Detect,
+                RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard
             };
         }
 

mRemoteNGTests/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormatTests.cs

@@ -1,17 +1,13 @@
 using System;
-using System.Linq;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Csv;
 using mRemoteNG.Connection;
-using mRemoteNG.Container;
 using mRemoteNG.Credential;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
-using mRemoteNGTests.TestHelpers;
 using NSubstitute;
 using NUnit.Framework;
 
-namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
+namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
 	public class CsvConnectionsSerializerMremotengFormatTests
     {
@@ -32,24 +28,6 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
             _credentialRepositoryList.GetCredentialRecord(new Guid()).ReturnsForAnyArgs(credRecord);
         }
 
-        [Test]
-        public void SerializesNodeId()
-        {
-            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
-            var connectionInfo = BuildConnectionInfo();
-            var csv = serializer.Serialize(connectionInfo);
-            Assert.That(csv, Does.Match(connectionInfo.ConstantID));
-        }
-
-        [Test]
-        public void DoesntSerializeTheRootNode()
-        {
-            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
-            var treeModel = new ConnectionTreeModelBuilder().Build();
-            var csv = serializer.Serialize(treeModel);
-            Assert.That(csv, Does.Not.Match($"{treeModel.RootNodes[0].ConstantID};.*;{TreeNodeType.Root}"));
-        }
-
         [TestCase(Username)]
         [TestCase(Domain)]
         [TestCase(Password)]
@@ -104,32 +82,6 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
             Assert.Throws<ArgumentNullException>(() => serializer.Serialize((ConnectionTreeModel)null));
         }
 
-        [Test]
-        public void FoldersAreSerialized()
-        {
-            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
-            var container = BuildContainer();
-            var csv = serializer.Serialize(container);
-            Assert.That(csv, Does.Match(container.Name));
-            Assert.That(csv, Does.Match(container.Username));
-            Assert.That(csv, Does.Match(container.Domain));
-            Assert.That(csv, Does.Match(container.Password));
-            Assert.That(csv, Does.Contain(TreeNodeType.Container.ToString()));
-        }
-
-        [Test]
-        public void SerializationIncludesRawInheritedValuesIfObjectInheritsFromParentOutsideOfSerializationScope()
-        {
-            var serializer = new CsvConnectionsSerializerMremotengFormat(new SaveFilter(), _credentialRepositoryList);
-            var treeModel = new ConnectionTreeModelBuilder().Build();
-            var serializationTarget = treeModel.GetRecursiveChildList().First(info => info.Name == "folder3");
-            var csv = serializer.Serialize(serializationTarget);
-            var lineWithFolder3 = csv.Split(new[] {Environment.NewLine}, StringSplitOptions.None).First(s => s.Contains(serializationTarget.Name));
-            Assert.That(lineWithFolder3, Does.Contain(serializationTarget.Username));
-            Assert.That(lineWithFolder3, Does.Contain(serializationTarget.Domain));
-            Assert.That(lineWithFolder3, Does.Contain(serializationTarget.Password));
-        }
-
         private ConnectionInfo BuildConnectionInfo()
         {
             return new ConnectionInfo
@@ -141,16 +93,5 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 Inheritance = {Colors = true}
             };
         }
-
-        private ContainerInfo BuildContainer()
-        {
-            return new ContainerInfo
-            {
-                Name = "MyFolder",
-                Username = "BlahBlah1",
-                Domain = "aklkskkksh8",
-                Password = "qweraslkdjf87"
-            };
-        }
     }
 }

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs

@@ -8,7 +8,7 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
-    public class RemoteDesktopConnectionDeserializerTests
+	public class RemoteDesktopConnectionDeserializerTests
     {
         // .rdp file schema: https://technet.microsoft.com/en-us/library/ff393699(v=ws.10).aspx
         private RemoteDesktopConnectionDeserializer _deserializer;
@@ -18,9 +18,9 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedDomain = "myspecialdomain";
         private const string ExpectedGatewayHostname = "gatewayhostname.domain.com";
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDPColors ExpectedColors = RdpProtocol.RDPColors.Colors24Bit;
+        private const RdpColors ExpectedColors = RdpColors.Colors24Bit;
         private const bool ExpectedBitmapCaching = false;
-        private const RdpProtocol.RDPResolutions ExpectedResolutionMode = RdpProtocol.RDPResolutions.FitToWindow;
+        private const RdpResolutions ExpectedResolutionMode = RdpResolutions.FitToWindow;
         private const bool ExpectedWallpaperDisplay = true;
         private const bool ExpectedThemesDisplay = true;
         private const bool ExpectedFontSmoothing = true;
@@ -29,7 +29,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const bool ExpectedDriveRedirection = true;
         private const bool ExpectedPortRedirection = true;
         private const bool ExpectedPrinterRedirection = true;
-        private const RdpProtocol.RDPSounds ExpectedSoundRedirection = RdpProtocol.RDPSounds.BringToThisComputer;
+        private const RdpSounds ExpectedSoundRedirection = RdpSounds.BringToThisComputer;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
-    public class RemoteDesktopConnectionManager27DeserializerTests
+	public class RemoteDesktopConnectionManager27DeserializerTests
     {
         private string _connectionFileContents;
         private RemoteDesktopConnectionManagerDeserializer _deserializer;
@@ -23,20 +23,20 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedPassword = "passwordHere!";
         private const bool ExpectedUseConsoleSession = true;
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDGatewayUsageMethod ExpectedGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+        private const RDGatewayUsageMethod ExpectedGatewayUsageMethod = 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 RdpProtocol.RDPResolutions ExpectedRdpResolution = RdpProtocol.RDPResolutions.FitToWindow;
-        private const RdpProtocol.RDPColors ExpectedRdpColorDepth = RdpProtocol.RDPColors.Colors24Bit;
-        private const RdpProtocol.RDPSounds ExpectedAudioRedirection = RdpProtocol.RDPSounds.DoNotPlay;
+        private const RdpResolutions ExpectedRdpResolution = RdpResolutions.FitToWindow;
+        private const RdpColors ExpectedRdpColorDepth = RdpColors.Colors24Bit;
+        private const RdpSounds ExpectedAudioRedirection = 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 RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth;
+        private const RdpAuthenticationLevel ExpectedAuthLevel = RdpAuthenticationLevel.WarnOnFailedAuth;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
-    public class RemoteDesktopConnectionManagerDeserializerTests
+	public class RemoteDesktopConnectionManagerDeserializerTests
     {
         private string _connectionFileContents;
         private RemoteDesktopConnectionManagerDeserializer _deserializer;
@@ -23,20 +23,20 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedPassword = "passwordHere!";
         private const bool ExpectedUseConsoleSession = true;
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDGatewayUsageMethod ExpectedGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+        private const RDGatewayUsageMethod ExpectedGatewayUsageMethod = 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 RdpProtocol.RDPResolutions ExpectedRdpResolution = RdpProtocol.RDPResolutions.FitToWindow;
-        private const RdpProtocol.RDPColors ExpectedRdpColorDepth = RdpProtocol.RDPColors.Colors24Bit;
-        private const RdpProtocol.RDPSounds ExpectedAudioRedirection = RdpProtocol.RDPSounds.DoNotPlay;
+        private const RdpResolutions ExpectedRdpResolution = RdpResolutions.FitToWindow;
+        private const RdpColors ExpectedRdpColorDepth = RdpColors.Colors24Bit;
+        private const RdpSounds ExpectedAudioRedirection = 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 RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.AuthRequired;
+        private const RdpAuthenticationLevel ExpectedAuthLevel = RdpAuthenticationLevel.AuthRequired;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs

@@ -1,5 +1,4 @@
-using System;
-using mRemoteNG.Connection;
+using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.Http;
 using mRemoteNG.Connection.Protocol.ICA;
@@ -13,11 +12,7 @@ namespace mRemoteNGTests.Connection
 	public class AbstractConnectionInfoDataTests
     {
 #pragma warning disable 618
-        private class TestAbstractConnectionInfoData : AbstractConnectionRecord {
-	        public TestAbstractConnectionInfoData() : base(Guid.NewGuid().ToString())
-	        {
-	        }
-        }
+        private class TestAbstractConnectionInfoData : AbstractConnectionRecord {}
 #pragma warning restore 618
         private TestAbstractConnectionInfoData _testAbstractConnectionInfoData;
 
@@ -165,7 +160,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.AuthRequired;
+            _testAbstractConnectionInfoData.RDPAuthenticationLevel = RdpAuthenticationLevel.AuthRequired;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -201,7 +196,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+            _testAbstractConnectionInfoData.RDGatewayUsageMethod = RDGatewayUsageMethod.Always;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -219,7 +214,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.SmartCard;
+            _testAbstractConnectionInfoData.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -255,7 +250,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.Resolution = RdpProtocol.RDPResolutions.Res1366x768;
+            _testAbstractConnectionInfoData.Resolution = RdpResolutions.Res1366x768;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -273,7 +268,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.Colors = RdpProtocol.RDPColors.Colors16Bit;
+            _testAbstractConnectionInfoData.Colors = RdpColors.Colors16Bit;
             Assert.That(wasCalled, Is.True);
         }
 
@@ -372,7 +367,7 @@ namespace mRemoteNGTests.Connection
         {
             var wasCalled = false;
             _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
+            _testAbstractConnectionInfoData.RedirectSound = RdpSounds.DoNotPlay;
             Assert.That(wasCalled, Is.True);
         }
 

mRemoteNGTests/Connection/ConnectionInfoTests.cs

@@ -27,6 +27,22 @@ namespace mRemoteNGTests.Connection
             _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()
         {
@@ -43,20 +59,6 @@ namespace mRemoteNGTests.Connection
             Assert.That(clonedConnection.Parent, Is.Null);
         }
 
-        [Test]
-        public void CloneAlsoCopiesInheritanceObject()
-        {
-            var clonedConnection = _connectionInfo.Clone();
-            Assert.That(clonedConnection.Inheritance, Is.Not.EqualTo(_connectionInfo.Inheritance));
-        }
-
-        [Test]
-        public void CloneCorrectlySetsParentOfInheritanceObject()
-        {
-            var clonedConnection = _connectionInfo.Clone();
-            Assert.That(clonedConnection.Inheritance.Parent, Is.EqualTo(clonedConnection));
-        }
-
         [Test]
         public void CopyFromCopiesProperties()
         {
@@ -79,7 +81,7 @@ namespace mRemoteNGTests.Connection
         {
             var eventWasCalled = false;
             _connectionInfo.PropertyChanged += (sender, args) => eventWasCalled = true;
-            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionInfo));
             Assert.That(eventWasCalled);
         }
 
@@ -88,7 +90,7 @@ namespace mRemoteNGTests.Connection
         {
             var nameOfModifiedProperty = "";
             _connectionInfo.PropertyChanged += (sender, args) => nameOfModifiedProperty = args.PropertyName;
-            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionInfo));
             Assert.That(nameOfModifiedProperty, Is.EqualTo("OpenConnections"));
         }
 

mRemoteNGTests/Connection/DefaultConnectionInfoTests.cs

@@ -1,62 +1,73 @@
-using System.Collections.Generic;
-using System.Reflection;
-using mRemoteNG.Connection;
-using mRemoteNGTests.TestHelpers;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
 using NUnit.Framework;
 
 
 namespace mRemoteNGTests.Connection
 {
-	public class DefaultConnectionInfoTests
-	{
-		private ConnectionInfo _randomizedConnectionInfo;
+    public class DefaultConnectionInfoTests
+    {
+        private string _testDomain = "somedomain";
 
         [SetUp]
         public void Setup()
         {
-	        _randomizedConnectionInfo = ConnectionInfoHelpers.GetRandomizedConnectionInfo();
+            DefaultConnectionInfo.Instance.Domain = "";
         }
 
-        [TestCaseSource(nameof(GetConnectionInfoProperties))]
-        public void LoadingDefaultInfoUpdatesAllProperties(PropertyInfo property)
+        [Test]
+        public void LoadingDefaultInfoUpdatesAllProperties()
         {
-            DefaultConnectionInfo.Instance.LoadFrom(_randomizedConnectionInfo);
-	        var valueInDestination = property.GetValue(DefaultConnectionInfo.Instance);
-	        var valueInSource = property.GetValue(_randomizedConnectionInfo);
-            Assert.That(valueInDestination, Is.EqualTo(valueInSource));
+            var connectionInfoSource = new ConnectionInfo { Domain = _testDomain };
+            DefaultConnectionInfo.Instance.LoadFrom(connectionInfoSource);
+            Assert.That(DefaultConnectionInfo.Instance.Domain, Is.EqualTo(_testDomain));
         }
 
-		[TestCaseSource(nameof(GetConnectionInfoProperties))]
-		public void SavingDefaultConnectionInfoExportsAllProperties(PropertyInfo property)
+        [Test]
+        public void SavingDefaultConnectionInfoExportsAllProperties()
         {
             var saveTarget = new ConnectionInfo();
-	        var randomizedValue = property.GetValue(_randomizedConnectionInfo);
-			property.SetValue(DefaultConnectionInfo.Instance, randomizedValue);
+            DefaultConnectionInfo.Instance.Domain = _testDomain;
             DefaultConnectionInfo.Instance.SaveTo(saveTarget);
-	        var valueInDestination = property.GetValue(saveTarget);
-	        var valueInSource = property.GetValue(DefaultConnectionInfo.Instance);
-			Assert.That(valueInDestination, Is.EqualTo(valueInSource));
+            Assert.That(saveTarget.Domain, Is.EqualTo(_testDomain));
         }
 
-		[TestCaseSource(nameof(GetConnectionInfoProperties))]
-		public void CanSaveDefaultConnectionToModelWithAllStringProperties(PropertyInfo property)
-		{
-            var saveTarget = new SerializableConnectionInfoAllPropertiesOfType<string>();
-
-			// randomize default connnection values to ensure we dont get false passing tests
-			var randomizedValue = property.GetValue(_randomizedConnectionInfo);
-			property.SetValue(DefaultConnectionInfo.Instance, randomizedValue);
-
+        [Test]
+        public void CanSaveEnumValuesToString()
+        {
+            const ProtocolType targetProtocol = ProtocolType.RAW;
+            var saveTarget = new AllStringPropertySaveTarget();
+            DefaultConnectionInfo.Instance.Protocol = targetProtocol;
             DefaultConnectionInfo.Instance.SaveTo(saveTarget);
-
-			var valueInSource = property.GetValue(DefaultConnectionInfo.Instance).ToString();
-			var valueInDestination = saveTarget.GetType().GetProperty(property.Name).GetValue(saveTarget).ToString();
-            Assert.That(valueInDestination, Is.EqualTo(valueInSource));
+            Assert.That(saveTarget.Protocol, Is.EqualTo(targetProtocol.ToString()));
         }
 
-		private static IEnumerable<PropertyInfo> GetConnectionInfoProperties()
-	    {
-			return new ConnectionInfo().GetSerializableProperties();
-	    }
+        [Test]
+        public void CanSaveIntegerValuesToString()
+        {
+            const int targetValue = 123;
+            var saveTarget = new AllStringPropertySaveTarget();
+            DefaultConnectionInfo.Instance.RDPMinutesToIdleTimeout = targetValue;
+            DefaultConnectionInfo.Instance.SaveTo(saveTarget);
+            Assert.That(saveTarget.RDPMinutesToIdleTimeout, Is.EqualTo(targetValue.ToString()));
+        }
+
+        [Test]
+        public void CanSaveStringValuesToString()
+        {
+            const string targetName = "hello";
+            var saveTarget = new AllStringPropertySaveTarget();
+            DefaultConnectionInfo.Instance.Username = targetName;
+            DefaultConnectionInfo.Instance.SaveTo(saveTarget);
+            Assert.That(saveTarget.Username, Is.EqualTo(targetName));
+        }
+
+
+        private class AllStringPropertySaveTarget
+        {
+            public string Username { get; set; }
+            public string Protocol { get; set; }
+            public string RDPMinutesToIdleTimeout { get; set; }
+        }
     }
 }

mRemoteNGTests/Connection/DefaultConnectionInheritanceTests.cs

@@ -1,40 +1,34 @@
-using System.Collections.Generic;
-using System.Reflection;
-using mRemoteNG.Connection;
+using mRemoteNG.Connection;
 using NUnit.Framework;
 
 
 namespace mRemoteNGTests.Connection
 {
-	public class DefaultConnectionInheritanceTests
+    public class DefaultConnectionInheritanceTests
     {
-	    [TestCaseSource(nameof(GetInheritanceProperties))]
-		public void LoadingDefaultInheritanceUpdatesAllProperties(PropertyInfo property)
+        [SetUp]
+        public void Setup()
         {
-			var inheritanceSource = new ConnectionInfoInheritance(new object(), true);
+            DefaultConnectionInheritance.Instance.TurnOffInheritanceCompletely();
+        }
+
+        [Test]
+        public void LoadingDefaultInheritanceUpdatesAllProperties()
+        {
+            var inheritanceSource = new ConnectionInfoInheritance(new object(), true);
             inheritanceSource.TurnOnInheritanceCompletely();
-	        DefaultConnectionInheritance.Instance.TurnOffInheritanceCompletely();
-
             DefaultConnectionInheritance.Instance.LoadFrom(inheritanceSource);
+            Assert.That(DefaultConnectionInheritance.Instance.EverythingInherited, Is.True);
+        }
 
-	        var valueInDestination = property.GetValue(DefaultConnectionInheritance.Instance);
-	        var valueInSource = property.GetValue(inheritanceSource);
-	        Assert.That(valueInDestination, Is.EqualTo(valueInSource));
-		}
-
-		[TestCaseSource(nameof(GetInheritanceProperties))]
-		public void SavingDefaultInheritanceExportsAllProperties(PropertyInfo property)
+        [Test]
+        public void SavingDefaultInheritanceExportsAllProperties()
         {
-			var saveTarget = new ConnectionInfoInheritance(new object(), true);
-	        saveTarget.TurnOffInheritanceCompletely();
-	        DefaultConnectionInheritance.Instance.TurnOnInheritanceCompletely();
-
-	        DefaultConnectionInheritance.Instance.SaveTo(saveTarget);
-
-	        var valueInDestination = property.GetValue(saveTarget);
-	        var valueInSource = property.GetValue(DefaultConnectionInheritance.Instance);
-	        Assert.That(valueInDestination, Is.EqualTo(valueInSource));
-		}
+            var inheritanceDestination = new ConnectionInfoInheritance(new object(), true);
+            DefaultConnectionInheritance.Instance.AutomaticResize = true;
+            DefaultConnectionInheritance.Instance.SaveTo(inheritanceDestination);
+            Assert.That(inheritanceDestination.AutomaticResize, Is.True);
+        }
 
         [Test]
         public void NewInheritanceInstancesCreatedWithDefaultInheritanceValues()
@@ -44,20 +38,12 @@ namespace mRemoteNGTests.Connection
             Assert.That(inheritanceInstance.Domain, Is.True);
         }
 
-		[TestCaseSource(nameof(GetInheritanceProperties))]
-		public void NewInheritanceInstancesCreatedWithAllDefaultInheritanceValues(PropertyInfo property)
+        [Test]
+        public void NewInheritanceInstancesCreatedWithAllDefaultInheritanceValues()
         {
             DefaultConnectionInheritance.Instance.TurnOnInheritanceCompletely();
             var inheritanceInstance = new ConnectionInfoInheritance(new object());
-
-			var valueInDestination = property.GetValue(inheritanceInstance);
-	        var valueInSource = property.GetValue(DefaultConnectionInheritance.Instance);
-	        Assert.That(valueInDestination, Is.EqualTo(valueInSource));
-		}
-
-	    private static IEnumerable<PropertyInfo> GetInheritanceProperties()
-	    {
-		    return new ConnectionInfoInheritance(new object(), true).GetProperties();
-	    }
-	}
+            Assert.That(inheritanceInstance.EverythingInherited, Is.True);
+        }
+    }
 }

mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using mRemoteNG.App;
+using mRemoteNG.App;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Tools;
@@ -12,7 +11,7 @@ namespace mRemoteNGTests.Connection.Protocol
 {
 	public class IntegratedProgramTests
 	{
-		private readonly ExternalTool _extTool = new ExternalTool
+        private readonly ExternalTool _extTool = new ExternalTool
 		{
 			DisplayName = "notepad",
 			FileName = @"%windir%\system32\notepad.exe",
@@ -20,13 +19,13 @@ namespace mRemoteNGTests.Connection.Protocol
 			TryIntegrate = true
 		};
 
-		
 		[Test]
 		public void CanStartExternalApp()
 		{
 			SetExternalToolList(_extTool);
-			var sut = new IntegratedProgram();
-			sut.InterfaceControl = BuildInterfaceControl("notepad", sut);
+		    var connectionInfo = new ConnectionInfo { ExtApp = _extTool.DisplayName };
+            var sut = new IntegratedProgram(connectionInfo);
+			sut.InterfaceControl = BuildInterfaceControl(sut);
 			sut.Initialize();
 			var appStarted = sut.Connect();
 			sut.Disconnect();
@@ -37,8 +36,9 @@ namespace mRemoteNGTests.Connection.Protocol
 		public void ConnectingToExternalAppThatDoesntExistDoesNothing()
 		{
 			SetExternalToolList(_extTool);
-			var sut = new IntegratedProgram();
-			sut.InterfaceControl = BuildInterfaceControl("doesntExist", sut);
+		    var connectionInfo = new ConnectionInfo { ExtApp = "doesntExist" };
+			var sut = new IntegratedProgram(connectionInfo);
+			sut.InterfaceControl = BuildInterfaceControl(sut);
 			var appInitialized = sut.Initialize();
 			Assert.That(appInitialized, Is.False);
 		}
@@ -48,11 +48,10 @@ namespace mRemoteNGTests.Connection.Protocol
 			Runtime.ExternalToolsService.ExternalTools = new FullyObservableCollection<ExternalTool> {externalTool};
 		}
 
-		private InterfaceControl BuildInterfaceControl(string extAppName, ProtocolBase sut)
+		private InterfaceControl BuildInterfaceControl(ProtocolBase sut)
 		{
 			var connectionWindow = new ConnectionWindow(new DockContent());
-			var connectionInfo = new ConnectionInfo {ExtApp = extAppName};
-			return new InterfaceControl(connectionWindow, sut, connectionInfo);
+			return new InterfaceControl(connectionWindow, sut);
 		}
 	}
 }

mRemoteNGTests/Connection/Protocol/ProtocolListTests.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Specialized;
+using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.SSH;
 using mRemoteNG.Connection.Protocol.Telnet;
@@ -21,9 +22,9 @@ namespace mRemoteNGTests.Connection.Protocol
         public void Setup()
         {
             _protocolList = new ProtocolList();
-            _protocol1 = new ProtocolTelnet();
-            _protocol2 = new ProtocolSSH2();
-            _protocol3 = new ProtocolVNC();
+            _protocol1 = new ProtocolTelnet(new ConnectionInfo());
+            _protocol2 = new ProtocolSSH2(new ConnectionInfo());
+            _protocol3 = new ProtocolVNC(new ConnectionInfo());
         }
 
         [TearDown]

mRemoteNGTests/Container/RootNodeInfoTests.cs

@@ -1,18 +0,0 @@
-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/IntegrationTests/XmlSerializationLifeCycleTests.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;

mRemoteNGTests/ListViewTester.cs

@@ -34,9 +34,8 @@
 
 using System.Collections;
 using System.Windows.Forms;
-using NUnit.Extensions.Forms;
 
-namespace mRemoteNGTests
+namespace NUnit.Extensions.Forms
 {
     /// <summary>
     /// A ControlTester for testing List Views.  

mRemoteNGTests/Security/Authentication/PasswordAuthenticatorTests.cs

@@ -2,7 +2,6 @@
 using mRemoteNG.Security;
 using mRemoteNG.Security.Authentication;
 using mRemoteNG.Security.SymmetricEncryption;
-using mRemoteNG.Tools;
 using NUnit.Framework;
 
 
@@ -10,31 +9,35 @@ namespace mRemoteNGTests.Security.Authentication
 {
     public class PasswordAuthenticatorTests
     {
-        private ICryptographyProvider _cryptographyProvider;
-        private string _cipherText;
+        private PasswordAuthenticator _authenticator;
         private readonly SecureString _correctPassword = "9theCorrectPass#5".ConvertToSecureString();
         private readonly SecureString _wrongPassword = "wrongPassword".ConvertToSecureString();
 
         [SetUp]
         public void Setup()
         {
-            _cryptographyProvider = new AeadCryptographyProvider {KeyDerivationIterations = 10000};
-            _cipherText = "MPELiwk7+xeNlruIyt5uxTvVB+/RLVoLdUGnwY4CWCqwKe7T2IBwWo4oaKum5hdv7447g5m2nZsYPrfARSlotQB4r1KZQg==";
+            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 authenticator = new PasswordAuthenticator(_cryptographyProvider, _cipherText, () => Optional<SecureString>.Empty);
-            var authenticated = authenticator.Authenticate(_correctPassword);
+            var authenticated = _authenticator.Authenticate(_correctPassword);
             Assert.That(authenticated);
         }
 
         [Test]
         public void AuthenticatingWithWrongPasswordReturnsFalse()
         {
-            var authenticator = new PasswordAuthenticator(_cryptographyProvider, _cipherText, () => Optional<SecureString>.Empty);
-            var authenticated = authenticator.Authenticate(_wrongPassword);
+            var authenticated = _authenticator.Authenticate(_wrongPassword);
             Assert.That(!authenticated);
         }
 
@@ -42,15 +45,12 @@ namespace mRemoteNGTests.Security.Authentication
         public void AuthenticationRequestorIsCalledWhenInitialPasswordIsWrong()
         {
             var wasCalled = false;
-
-            Optional<SecureString> AuthenticationRequestor()
+            _authenticator.AuthenticationRequestor = () =>
             {
                 wasCalled = true;
                 return _correctPassword;
-            }
-
-            var authenticator = new PasswordAuthenticator(_cryptographyProvider, _cipherText, AuthenticationRequestor);
-            authenticator.Authenticate(_wrongPassword);
+            };
+            _authenticator.Authenticate(_wrongPassword);
             Assert.That(wasCalled);
         }
 
@@ -58,30 +58,28 @@ namespace mRemoteNGTests.Security.Authentication
         public void AuthenticationRequestorNotCalledWhenInitialPasswordIsCorrect()
         {
             var wasCalled = false;
-            Optional<SecureString> AuthenticationRequestor()
+            _authenticator.AuthenticationRequestor = () =>
             {
                 wasCalled = true;
                 return _correctPassword;
-            }
-
-            var authenticator = new PasswordAuthenticator(_cryptographyProvider, _cipherText, AuthenticationRequestor);
-            authenticator.Authenticate(_correctPassword);
+            };
+            _authenticator.Authenticate(_correctPassword);
             Assert.That(!wasCalled);
         }
 
         [Test]
         public void ProvidingCorrectPasswordToTheAuthenticationRequestorReturnsTrue()
         {
-            var authenticator = new PasswordAuthenticator(_cryptographyProvider, _cipherText, () => _correctPassword);
-            var authenticated = authenticator.Authenticate(_wrongPassword);
+            _authenticator.AuthenticationRequestor = () => _correctPassword;
+            var authenticated = _authenticator.Authenticate(_wrongPassword);
             Assert.That(authenticated);
         }
 
         [Test]
         public void AuthenticationFailsWhenAuthenticationRequestorGivenEmptyPassword()
         {
-            var authenticator = new PasswordAuthenticator(_cryptographyProvider, _cipherText, () => new SecureString());
-            var authenticated = authenticator.Authenticate(_wrongPassword);
+            _authenticator.AuthenticationRequestor = () => new SecureString();
+            var authenticated = _authenticator.Authenticate(_wrongPassword);
             Assert.That(!authenticated);
         }
 
@@ -89,34 +87,27 @@ namespace mRemoteNGTests.Security.Authentication
         public void AuthenticatorRespectsMaxAttempts()
         {
             var authAttempts = 0;
-            Optional<SecureString>  AuthenticationRequestor()
+            _authenticator.AuthenticationRequestor = () =>
             {
                 authAttempts++;
                 return _wrongPassword;
-            }
-
-            var authenticator = new PasswordAuthenticator(_cryptographyProvider, _cipherText, AuthenticationRequestor);
-            authenticator.Authenticate(_wrongPassword);
-            Assert.That(authAttempts == authenticator.MaxAttempts);
+            };
+            _authenticator.Authenticate(_wrongPassword);
+            Assert.That(authAttempts == _authenticator.MaxAttempts);
         }
 
         [Test]
         public void AuthenticatorRespectsMaxAttemptsCustomValue()
         {
             const int customMaxAttempts = 5;
+            _authenticator.MaxAttempts = customMaxAttempts;
             var authAttempts = 0;
-            Optional<SecureString> AuthenticationRequestor()
+            _authenticator.AuthenticationRequestor = () =>
             {
                 authAttempts++;
                 return _wrongPassword;
-            }
-
-            var authenticator =
-                new PasswordAuthenticator(_cryptographyProvider, _cipherText, AuthenticationRequestor)
-                {
-                    MaxAttempts = customMaxAttempts
-                };
-            authenticator.Authenticate(_wrongPassword);
+            };
+            _authenticator.Authenticate(_wrongPassword);
             Assert.That(authAttempts == customMaxAttempts);
         }
     }

mRemoteNGTests/TestHelpers/ConnectionInfoHelpers.cs

@@ -1,132 +0,0 @@
-using System;
-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;
-
-namespace mRemoteNGTests.TestHelpers
-{
-    internal static class ConnectionInfoHelpers
-	{
-		private static readonly Random _random = new Random();
-
-		/// <summary>
-		/// Returns a <see cref="ConnectionInfo"/> object with randomized
-		/// values in all fields.
-		/// </summary>
-		internal static ConnectionInfo GetRandomizedConnectionInfo(bool randomizeInheritance = false)
-		{
-			var connectionInfo = new ConnectionInfo
-			{
-				// string types
-				Name = RandomString(),
-				Hostname = RandomString(),
-				Description = RandomString(),
-				Domain = RandomString(),
-				ExtApp = RandomString(),
-				Icon = RandomString(),
-				LoadBalanceInfo = RandomString(),
-				MacAddress = RandomString(),
-				Panel = RandomString(),
-				Password = RandomString(),
-				PostExtApp = RandomString(),
-				PreExtApp = RandomString(),
-				PuttySession = RandomString(),
-				RDGatewayHostname = RandomString(),
-				RDGatewayUsername = RandomString(),
-				RDGatewayDomain = RandomString(),
-				RDGatewayPassword = RandomString(),
-				UserField = RandomString(),
-				Username = RandomString(),
-				VNCProxyIP = RandomString(),
-				VNCProxyPassword = RandomString(),
-				VNCProxyUsername = RandomString(),
-
-				// bool types
-				AutomaticResize = RandomBool(),
-				CacheBitmaps = RandomBool(),
-				DisplayThemes = RandomBool(),
-				DisplayWallpaper = RandomBool(),
-				EnableDesktopComposition = RandomBool(),
-				EnableFontSmoothing = RandomBool(),
-				IsContainer = RandomBool(),
-				IsDefault = RandomBool(),
-				IsQuickConnect = RandomBool(),
-				PleaseConnect = RandomBool(),
-				RDPAlertIdleTimeout = RandomBool(),
-				RedirectDiskDrives = RandomBool(),
-				RedirectKeys = RandomBool(),
-				RedirectPorts = RandomBool(),
-				RedirectPrinters = RandomBool(),
-				RedirectSmartCards = RandomBool(),
-				UseConsoleSession = RandomBool(),
-				UseCredSsp = RandomBool(),
-				VNCViewOnly = RandomBool(),
-
-				// ints
-				Port = RandomInt(),
-				RDPMinutesToIdleTimeout = RandomInt(),
-				VNCProxyPort = RandomInt(),
-				
-				// enums
-				Colors = RandomEnum<RdpProtocol.RDPColors>(),
-				ICAEncryptionStrength = RandomEnum<IcaProtocol.EncryptionStrength> (),
-				Protocol = RandomEnum<ProtocolType>(),
-				RDGatewayUsageMethod = RandomEnum<RdpProtocol.RDGatewayUsageMethod>(),
-				RDGatewayUseConnectionCredentials = RandomEnum<RdpProtocol.RDGatewayUseConnectionCredentials>(),
-				RDPAuthenticationLevel = RandomEnum<RdpProtocol.AuthenticationLevel>(),
-				RedirectSound = RandomEnum<RdpProtocol.RDPSounds>(),
-				RenderingEngine = RandomEnum<HTTPBase.RenderingEngine>(),
-				Resolution = RandomEnum<RdpProtocol.RDPResolutions>(),
-				SoundQuality = RandomEnum<RdpProtocol.RDPSoundQuality>(),
-				VNCAuthMode = RandomEnum<ProtocolVNC.AuthMode>(),
-				VNCColors = RandomEnum<ProtocolVNC.Colors>(),
-				VNCCompression = RandomEnum<ProtocolVNC.Compression>(),
-				VNCEncoding = RandomEnum<ProtocolVNC.Encoding>(),
-				VNCProxyType = RandomEnum<ProtocolVNC.ProxyType>(),
-				VNCSmartSizeMode = RandomEnum<ProtocolVNC.SmartSizeMode>(),
-			};
-
-			if (randomizeInheritance)
-				connectionInfo.Inheritance = GetRandomizedInheritance(connectionInfo);
-
-			return connectionInfo;
-		}
-
-		internal static ConnectionInfoInheritance GetRandomizedInheritance(ConnectionInfo parent)
-		{
-			var inheritance = new ConnectionInfoInheritance(parent, true);
-			foreach (var property in inheritance.GetProperties())
-			{
-				property.SetValue(inheritance, RandomBool());
-			}
-			return inheritance;
-		}
-
-		internal static string RandomString()
-		{
-			return Guid.NewGuid().ToString("N");
-		}
-
-		internal static bool RandomBool()
-		{
-			return _random.Next() % 2 == 0;
-		}
-
-		internal static int RandomInt()
-		{
-			return _random.Next();
-		}
-
-		internal static T RandomEnum<T>() where T : struct, IConvertible
-		{
-			if (!typeof(T).IsEnum)
-				throw new ArgumentException("T must be an enum");
-
-			var values = Enum.GetValues(typeof(T));
-			return (T)values.GetValue(_random.Next(values.Length));
-		}
-    }
-}

mRemoteNGTests/TestHelpers/ConnectionTreeModelBuilder.cs

@@ -7,52 +7,17 @@ namespace mRemoteNGTests.TestHelpers
 {
     public class ConnectionTreeModelBuilder
     {
-        /// <summary>
-        /// Builds a tree which looks like:
-        /// Root
-        /// |- folder1
-        /// |   |- con1
-        /// |- con2
-        /// |- folder2
-        ///     |- folder3
-        ///         |- con3
-        /// </summary>
-        /// <returns></returns>
         public ConnectionTreeModel Build()
         {
             var model = new ConnectionTreeModel();
             var root = new RootNodeInfo(RootNodeType.Connection);
             var folder1 = new ContainerInfo { Name = "folder1", Username = "user1", Domain = "domain1", Password = "password1" };
-            var folder2 = new ContainerInfo { Name = "folder2", Username = "user2", Domain = "domain2", Password = "password2" };
-            var folder3 = new ContainerInfo
-            {
-                Name = "folder3",
-                Inheritance =
-                {
-                    Username = true,
-                    Domain = true,
-                    Password = true
-                }
-            };
             var con1 = new ConnectionInfo { Name = "Con1", Username = "user1", Domain = "domain1", Password = "password1" };
             var con2 = new ConnectionInfo { Name = "Con2", Username = "user2", Domain = "domain2", Password = "password2" };
-            var con3 = new ContainerInfo
-            {
-                Name = "con3",
-                Inheritance =
-                {
-                    Username = true,
-                    Domain = true,
-                    Password = true
-                }
-            };
 
             root.AddChild(folder1);
             root.AddChild(con2);
             folder1.AddChild(con1);
-            root.AddChild(folder2);
-            folder2.AddChild(folder3);
-            folder3.AddChild(con3);
             model.AddRootNode(root);
             return model;
         }

mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs

@@ -1,63 +0,0 @@
-namespace mRemoteNGTests.TestHelpers
-{
-	/// <summary>
-	/// A ConnectionInfo that has only the serializable properties as string types.
-	/// Only used for testing.
-	/// </summary>
-	internal class SerializableConnectionInfoAllPropertiesOfType<TType>
-	{
-		public TType Description { get; set; }
-		public TType Icon { get; set; }
-		public TType Panel { get; set; }
-		public TType Username { get; set; }
-		public TType Password { get; set; }
-		public TType Domain { get; set; }
-		public TType Protocol { get; set; }
-		public TType ExtApp { get; set; }
-		public TType PuttySession { get; set; }
-		public TType ICAEncryptionStrength { get; set; }
-		public TType UseConsoleSession { get; set; }
-		public TType RDPAuthenticationLevel { get; set; }
-		public TType RDPMinutesToIdleTimeout { get; set; }
-		public TType RDPAlertIdleTimeout { get; set; }
-		public TType LoadBalanceInfo { get; set; }
-		public TType RenderingEngine { get; set; }
-		public TType UseCredSsp { get; set; }
-		public TType RDGatewayUsageMethod { get; set; }
-		public TType RDGatewayHostname { get; set; }
-		public TType RDGatewayUseConnectionCredentials { get; set; }
-		public TType RDGatewayUsername { get; set; }
-		public TType RDGatewayPassword { get; set; }
-		public TType RDGatewayDomain { get; set; }
-		public TType Resolution { get; set; }
-		public TType AutomaticResize { get; set; }
-		public TType Colors { get; set; }
-		public TType CacheBitmaps { get; set; }
-		public TType DisplayWallpaper { get; set; }
-		public TType DisplayThemes { get; set; }
-		public TType EnableFontSmoothing { get; set; }
-		public TType EnableDesktopComposition { get; set; }
-		public TType RedirectKeys { get; set; }
-		public TType RedirectDiskDrives { get; set; }
-		public TType RedirectPrinters { get; set; }
-		public TType RedirectPorts { get; set; }
-		public TType RedirectSmartCards { get; set; }
-		public TType RedirectSound { get; set; }
-		public TType SoundQuality { get; set; }
-		public TType PreExtApp { get; set; }
-		public TType PostExtApp { get; set; }
-		public TType MacAddress { get; set; }
-		public TType UserField { get; set; }
-		public TType VNCCompression { get; set; }
-		public TType VNCEncoding { get; set; }
-		public TType VNCAuthMode { get; set; }
-		public TType VNCProxyType { get; set; }
-		public TType VNCProxyIP { get; set; }
-		public TType VNCProxyPort { get; set; }
-		public TType VNCProxyUsername { get; set; }
-		public TType VNCProxyPassword { get; set; }
-		public TType VNCColors { get; set; }
-		public TType VNCSmartSizeMode { get; set; }
-		public TType VNCViewOnly { get; set; }
-	}
-}

mRemoteNGTests/Tools/MaybeTests.cs

@@ -3,12 +3,12 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Tools
 {
-	public class OptionalTests
+	public class MaybeTests
 	{
 		[Test]
 		public void MaybeReturnsEmptyListWhenGivenNullValue()
 		{
-			var sut = new Optional<object>(null);
+			var sut = new Maybe<object>(null);
 			Assert.That(sut, Is.Empty);
 		}
 
@@ -16,7 +16,7 @@ namespace mRemoteNGTests.Tools
 		public void MaybeReturnsValueIfNotNull()
 		{
 			var expected = new object();
-			var sut = new Optional<object>(expected);
+			var sut = new Maybe<object>(expected);
 			Assert.That(sut, Has.Member(expected));
 		}
 

mRemoteNGTests/Tree/NodeSearcherTests.cs

@@ -8,7 +8,7 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Tree
 {
-	public class NodeSearcherTests
+    public class NodeSearcherTests
     {
         private NodeSearcher _nodeSearcher;
         private ContainerInfo _folder1;
@@ -104,14 +104,6 @@ namespace mRemoteNGTests.Tree
             _con4 = new ConnectionInfo { Name = "con4", Description="description6", Hostname="hostname6" };
             _con5 = new ConnectionInfo { Name = "con5", Description="description7", Hostname="hostname7" };
 
-			_folder1.Inheritance.TurnOffInheritanceCompletely();
-			_con1.Inheritance.TurnOffInheritanceCompletely();
-			_con2.Inheritance.TurnOffInheritanceCompletely();
-			_folder2.Inheritance.TurnOffInheritanceCompletely();
-			_con3.Inheritance.TurnOffInheritanceCompletely();
-			_con4.Inheritance.TurnOffInheritanceCompletely();
-			_con5.Inheritance.TurnOffInheritanceCompletely();
-
             connectionTreeModel.AddRootNode(root);
             root.AddChildRange(new [] { _folder1, _folder2, _con5 });
             _folder1.AddChildRange(new [] { _con1, _con2 });

mRemoteNGTests/Tree/RootNodeInfoTests.cs

@@ -1,5 +1,4 @@
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
+using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
 
@@ -47,13 +46,5 @@ namespace mRemoteNGTests.Tree
             _rootNodeInfo.PasswordString = password;
             Assert.That(_rootNodeInfo.PasswordString, Is.EqualTo(password));
         }
-
-        [TestCase(RootNodeType.Connection, TreeNodeType.Root)]
-        [TestCase(RootNodeType.PuttySessions, TreeNodeType.PuttyRoot)]
-        public void RootNodeHasCorrectTreeNodeType(RootNodeType rootNodeType, TreeNodeType expectedTreeNodeType)
-        {
-            var rootNode = new RootNodeInfo(rootNodeType);
-            Assert.That(rootNode.GetTreeNodeType(), Is.EqualTo(expectedTreeNodeType));
-        }
     }
 }

mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs

@@ -1,202 +0,0 @@
-using System.Linq;
-using System.Threading;
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-using mRemoteNG.UI.Controls;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.UI.Controls
-{
-    public class ConnectionTreeTests
-	{
-		private ConnectionTreeSearchTextFilter _filter;
-		private ConnectionTree _connectionTree;
-
-		[SetUp]
-		public void Setup()
-		{
-			_filter = new ConnectionTreeSearchTextFilter();
-			_connectionTree = new ConnectionTree
-			{
-				UseFiltering = true
-			};
-		}
-
-		[Test]
-		[Apartment(ApartmentState.STA)]
-		public void FilteringIsRetainedAndUpdatedWhenNodeDeleted()
-		{
-			// root
-			// |- folder1
-			// |	|- con1
-			// |	|- dontshowme
-			// |- folder2
-			//		|- con2
-			var connectionTreeModel = new ConnectionTreeModel();
-			var root = new RootNodeInfo(RootNodeType.Connection);
-			var folder1 = new ContainerInfo {Name = "folder1"};
-			var folder2 = new ContainerInfo {Name = "folder2"};
-			var con1 = new ConnectionInfo {Name = "con1"};
-			var con2 = new ConnectionInfo {Name = "con2"};
-			var conDontShow = new ConnectionInfo {Name = "dontshowme" };
-			root.AddChildRange(new []{folder1, folder2});
-			folder1.AddChildRange(new []{con1, conDontShow});
-			folder2.AddChild(con2);
-			connectionTreeModel.AddRootNode(root);
-
-			_connectionTree.ConnectionTreeModel = connectionTreeModel;
-			// ensure all folders expanded
-			_connectionTree.ExpandAll();
-
-			// apply filtering on the tree
-			_filter.FilterText = "con";
-			_connectionTree.ModelFilter = _filter;
-
-			connectionTreeModel.DeleteNode(con1);
-
-			Assert.That(_connectionTree.IsFiltering, Is.True);
-			Assert.That(_connectionTree.FilteredObjects, Does.Not.Contain(con1));
-			Assert.That(_connectionTree.FilteredObjects, Does.Not.Contain(conDontShow));
-			Assert.That(_connectionTree.FilteredObjects, Does.Contain(con2));
-		}
-
-	    [Test]
-	    [Apartment(ApartmentState.STA)]
-	    public void CannotAddConnectionToPuttySessionNode()
-	    {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-            var puttyRoot = new RootNodeInfo(RootNodeType.PuttySessions);
-	        connectionTreeModel.AddRootNode(root);
-	        connectionTreeModel.AddRootNode(puttyRoot);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-
-	        _connectionTree.SelectedObject = puttyRoot;
-	        _connectionTree.AddConnection();
-
-	        Assert.That(puttyRoot.Children, Is.Empty);
-	    }
-
-	    [Test]
-	    [Apartment(ApartmentState.STA)]
-	    public void CannotAddFolderToPuttySessionNode()
-	    {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-	        var puttyRoot = new RootNodeInfo(RootNodeType.PuttySessions);
-	        connectionTreeModel.AddRootNode(root);
-	        connectionTreeModel.AddRootNode(puttyRoot);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-
-	        _connectionTree.SelectedObject = puttyRoot;
-	        _connectionTree.AddFolder();
-
-	        Assert.That(puttyRoot.Children, Is.Empty);
-	    }
-
-	    [Test]
-	    [Apartment(ApartmentState.STA)]
-	    public void CannotDuplicateRootConnectionNode()
-	    {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-	        connectionTreeModel.AddRootNode(root);
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-
-	        _connectionTree.SelectedObject = root;
-            _connectionTree.DuplicateSelectedNode();
-
-	        Assert.That(connectionTreeModel.RootNodes, Has.One.Items);
-	    }
-
-	    [Test]
-	    [Apartment(ApartmentState.STA)]
-	    public void CannotDuplicateRootPuttyNode()
-	    {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var puttyRoot = new RootNodeInfo(RootNodeType.PuttySessions);
-	        connectionTreeModel.AddRootNode(puttyRoot);
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-
-	        _connectionTree.SelectedObject = puttyRoot;
-	        _connectionTree.DuplicateSelectedNode();
-
-	        Assert.That(connectionTreeModel.RootNodes, Has.One.Items);
-	    }
-
-	    [Test]
-	    [Apartment(ApartmentState.STA)]
-	    public void CannotDuplicatePuttyConnectionNode()
-	    {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var puttyRoot = new RootNodeInfo(RootNodeType.PuttySessions);
-            var puttyConnection = new PuttySessionInfo();
-            puttyRoot.AddChild(puttyConnection);
-	        connectionTreeModel.AddRootNode(puttyRoot);
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
-
-            _connectionTree.SelectedObject = puttyConnection;
-	        _connectionTree.DuplicateSelectedNode();
-
-	        Assert.That(puttyRoot.Children, Has.One.Items);
-	    }
-
-	    [Test]
-	    [Apartment(ApartmentState.STA)]
-	    public void DuplicatingWithNoNodeSelectedDoesNothing()
-	    {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var puttyRoot = new RootNodeInfo(RootNodeType.PuttySessions);
-	        connectionTreeModel.AddRootNode(puttyRoot);
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-
-            _connectionTree.SelectedObject = null;
-	        _connectionTree.DuplicateSelectedNode();
-
-	        Assert.That(connectionTreeModel.RootNodes, Has.One.Items);
-	    }
-
-	    [Test]
-	    [Apartment(ApartmentState.STA)]
-	    public void ExpandingAllItemsUpdatesColumnWidthAppropriately()
-	    {
-            var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-            connectionTreeModel.AddRootNode(root);
-	        ContainerInfo parent = root;
-	        foreach (var i in Enumerable.Repeat("", 8))
-	        {
-                var newContainer = new ContainerInfo {IsExpanded = false};
-                parent.AddChild(newContainer);
-	            parent = newContainer;
-	        }
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-
-	        var widthBefore = _connectionTree.Columns[0].Width;
-	        _connectionTree.ExpandAll();
-            var widthAfter = _connectionTree.Columns[0].Width;
-
-            Assert.That(widthAfter, Is.GreaterThan(widthBefore));
-	    }
-
-        [Test]
-        [Apartment(ApartmentState.STA)]
-        public void RenamingNodeWithNothingSelectedDoesNothing()
-	    {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-	        connectionTreeModel.AddRootNode(root);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.SelectedObject = null;
-
-	        Assert.DoesNotThrow(() => _connectionTree.RenameSelectedNode());
-        }
-    }
-}

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs

@@ -1,224 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Connection.Protocol.RDP;
-using mRemoteNG.Connection.Protocol.VNC;
-using mRemoteNG.Container;
-using mRemoteNG.Tree.Root;
-using mRemoteNG.UI.Window;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.UI.Window.ConfigWindowTests
-{
-    public class ConfigWindowGeneralTests
-    {
-        private ConfigWindow _configWindow;
-
-        [SetUp]
-        public void Setup()
-        {
-            _configWindow = new ConfigWindow
-            {
-                PropertiesVisible = true
-            };
-        }
-
-        [TestCaseSource(nameof(ConnectionInfoGeneralTestCases))]
-        public void PropertyGridShowCorrectPropertiesForConnectionInfo(ConnectionInfo connectionInfo, IEnumerable<string> expectedVisibleProperties)
-        {
-            _configWindow.SelectedTreeNode = connectionInfo;
-            Assert.That(_configWindow.VisibleObjectProperties, Is.EquivalentTo(expectedVisibleProperties));
-        }
-
-        [Test]
-        public void PropertyGridShowCorrectPropertiesForRootConnectionInfo()
-        {
-            var expectedVisibleProperties = new[]
-            {
-                nameof(RootNodeInfo.Name),
-                nameof(RootNodeInfo.Password),
-            };
-
-            _configWindow.SelectedTreeNode = new RootNodeInfo(RootNodeType.Connection);
-            Assert.That(_configWindow.VisibleObjectProperties, Is.EquivalentTo(expectedVisibleProperties));
-        }
-
-        [Test]
-        public void PropertyGridShowCorrectPropertiesForRootPuttyInfo()
-        {
-            var expectedVisibleProperties = new[]
-            {
-                nameof(RootNodeInfo.Name),
-            };
-
-            _configWindow.SelectedTreeNode = new RootPuttySessionsNodeInfo();
-            Assert.That(_configWindow.VisibleObjectProperties, Is.EquivalentTo(expectedVisibleProperties));
-        }
-
-        private static IEnumerable<TestCaseData> ConnectionInfoGeneralTestCases()
-        {
-            var protocolTypes = typeof(ProtocolType).GetEnumValues().OfType<ProtocolType>();
-            var testCases = new List<TestCaseData>();
-
-            foreach (var protocol in protocolTypes)
-            {
-                var expectedPropertyListConnection = BuildExpectedConnectionInfoPropertyList(protocol, false);
-                var connectionInfo = ConstructConnectionInfo(protocol, false);
-                var testCaseConnection = new TestCaseData(connectionInfo, expectedPropertyListConnection)
-                    .SetName(protocol + ", ConnectionInfo");
-                testCases.Add(testCaseConnection);
-
-                var expectedPropertyListContainer = BuildExpectedConnectionInfoPropertyList(protocol, true);
-                var containerInfo = ConstructConnectionInfo(protocol, true);
-                var testCaseContainer = new TestCaseData(containerInfo, expectedPropertyListContainer)
-                    .SetName(protocol + ", ContainerInfo");
-                testCases.Add(testCaseContainer);
-            }
-
-            return testCases;
-        }
-
-        internal static ConnectionInfo ConstructConnectionInfo(ProtocolType protocol, bool isContainer)
-        {
-            // build connection info. set certain connection properties so
-            // that toggled properties are hidden in the property grid. We
-            // will test those separately in the special protocol tests.
-            var node = isContainer 
-                ? new ContainerInfo()
-                : new ConnectionInfo();
-
-            node.Protocol = protocol;
-            node.Resolution = RdpProtocol.RDPResolutions.Res800x600;
-            node.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Never;
-            node.RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.Yes;
-            node.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
-            node.VNCAuthMode = ProtocolVNC.AuthMode.AuthVNC;
-            node.VNCProxyType = ProtocolVNC.ProxyType.ProxyNone;
-            node.Inheritance.TurnOffInheritanceCompletely();
-
-            return node;
-        }
-
-        internal static List<string> BuildExpectedConnectionInfoPropertyList(ProtocolType protocol, bool isContainer)
-        {
-            var expectedProperties = new List<string>
-            {
-                nameof(ConnectionInfo.Name),
-                nameof(ConnectionInfo.Description),
-                nameof(ConnectionInfo.Icon),
-                nameof(ConnectionInfo.Panel),
-                nameof(ConnectionInfo.Protocol),
-                nameof(ConnectionInfo.PreExtApp),
-                nameof(ConnectionInfo.PostExtApp),
-                nameof(ConnectionInfo.MacAddress),
-                nameof(ConnectionInfo.UserField),
-            };
-
-            if (!isContainer)
-            {
-                expectedProperties.AddRange(new []
-                {
-                    nameof(ConnectionInfo.Hostname),
-                });
-            }
-
-            switch (protocol)
-            {
-                case ProtocolType.RDP:
-                    expectedProperties.AddRange(new []
-                    {
-                        nameof(ConnectionInfo.Username),
-                        nameof(ConnectionInfo.Password),
-                        nameof(ConnectionInfo.Domain),
-                        nameof(ConnectionInfo.Port),
-                        nameof(ConnectionInfo.UseConsoleSession),
-                        nameof(ConnectionInfo.RDPAuthenticationLevel),
-                        nameof(ConnectionInfo.RDPMinutesToIdleTimeout),
-                        nameof(ConnectionInfo.LoadBalanceInfo),
-                        nameof(ConnectionInfo.UseCredSsp),
-                        nameof(ConnectionInfo.RDGatewayUsageMethod),
-                        nameof(ConnectionInfo.Resolution),
-                        nameof(ConnectionInfo.Colors),
-                        nameof(ConnectionInfo.CacheBitmaps),
-                        nameof(ConnectionInfo.DisplayWallpaper),
-                        nameof(ConnectionInfo.DisplayThemes),
-                        nameof(ConnectionInfo.EnableFontSmoothing),
-                        nameof(ConnectionInfo.EnableDesktopComposition),
-                        nameof(ConnectionInfo.RedirectKeys),
-                        nameof(ConnectionInfo.RedirectDiskDrives),
-                        nameof(ConnectionInfo.RedirectPrinters),
-                        nameof(ConnectionInfo.RedirectPorts),
-                        nameof(ConnectionInfo.RedirectSmartCards),
-                        nameof(ConnectionInfo.RedirectSound),
-                    });
-                    break;
-                case ProtocolType.VNC:
-                    expectedProperties.AddRange(new []
-                    {
-                        nameof(ConnectionInfo.Password),
-                        nameof(ConnectionInfo.Port),
-                        nameof(ConnectionInfo.VNCSmartSizeMode),
-                        nameof(ConnectionInfo.VNCViewOnly),
-                    });
-                    break;
-                case ProtocolType.SSH1:
-                case ProtocolType.SSH2:
-                    expectedProperties.AddRange(new []
-                    {
-                        nameof(ConnectionInfo.Username),
-                        nameof(ConnectionInfo.Password),
-                        nameof(ConnectionInfo.Port),
-                        nameof(ConnectionInfo.PuttySession)
-                    });
-                    break;
-                case ProtocolType.Telnet:
-                case ProtocolType.Rlogin:
-                case ProtocolType.RAW:
-                    expectedProperties.AddRange(new[]
-                    {
-                        nameof(ConnectionInfo.Port),
-                        nameof(ConnectionInfo.PuttySession),
-                    });
-                    break;
-                case ProtocolType.HTTP:
-                case ProtocolType.HTTPS:
-                    expectedProperties.AddRange(new []
-                    {
-                        nameof(ConnectionInfo.Username),
-                        nameof(ConnectionInfo.Password),
-                        nameof(ConnectionInfo.Port),
-                        nameof(ConnectionInfo.RenderingEngine),
-                    });
-                    break;
-                case ProtocolType.ICA:
-                    expectedProperties.AddRange(new []
-                    {
-                        nameof(ConnectionInfo.Username),
-                        nameof(ConnectionInfo.Password),
-                        nameof(ConnectionInfo.Domain),
-                        nameof(ConnectionInfo.ICAEncryptionStrength),
-                        nameof(ConnectionInfo.Resolution),
-                        nameof(ConnectionInfo.Colors),
-                        nameof(ConnectionInfo.CacheBitmaps),
-                    });
-                    break;
-                case ProtocolType.IntApp:
-                    expectedProperties.AddRange(new[]
-                    {
-                        nameof(ConnectionInfo.Username),
-                        nameof(ConnectionInfo.Password),
-                        nameof(ConnectionInfo.Domain),
-                        nameof(ConnectionInfo.Port),
-                        nameof(ConnectionInfo.ExtApp),
-                    });
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(protocol), protocol, null);
-            }
-
-            return expectedProperties;
-        }
-    }
-}

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs

@@ -1,73 +0,0 @@
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Connection.Protocol.RDP;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.UI.Window.ConfigWindowTests
-{
-    public class ConfigWindowRdpSpecialTests : ConfigWindowSpecialTestsBase
-    {
-        protected override ProtocolType Protocol => ProtocolType.RDP;
-
-        [Test]
-        public void PropertyShownWhenActive_RdpMinutesToIdleTimeout()
-        {
-            ConnectionInfo.RDPMinutesToIdleTimeout = 1;
-            ExpectedPropertyList.Add(nameof(mRemoteNG.Connection.ConnectionInfo.RDPAlertIdleTimeout));
-
-            RunVerification();
-        }
-
-        [TestCase(RdpProtocol.RDGatewayUsageMethod.Always)]
-        [TestCase(RdpProtocol.RDGatewayUsageMethod.Detect)]
-        public void RdGatewayPropertiesShown_WhenRdGatewayUsageMethodIsNotNever(RdpProtocol.RDGatewayUsageMethod gatewayUsageMethod)
-        {
-            ConnectionInfo.RDGatewayUsageMethod = gatewayUsageMethod;
-            ConnectionInfo.RDGatewayUseConnectionCredentials = RdpProtocol.RDGatewayUseConnectionCredentials.Yes;
-            ExpectedPropertyList.AddRange(new []
-            {
-                nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayHostname),
-                nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUseConnectionCredentials)
-            });
-
-            RunVerification();
-        }
-
-        [TestCase(RdpProtocol.RDGatewayUseConnectionCredentials.No)]
-        [TestCase(RdpProtocol.RDGatewayUseConnectionCredentials.SmartCard)]
-        public void RdGatewayPropertiesShown_WhenRDGatewayUseConnectionCredentialsIsNotYes(RdpProtocol.RDGatewayUseConnectionCredentials useConnectionCredentials)
-        {
-            ConnectionInfo.RDGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
-            ConnectionInfo.RDGatewayUseConnectionCredentials = useConnectionCredentials;
-            ExpectedPropertyList.AddRange(new []
-            {
-                nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayHostname),
-                nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUsername),
-                nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayPassword),
-                nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayDomain),
-                nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUseConnectionCredentials)
-            });
-
-            RunVerification();
-        }
-
-        [Test]
-        public void SoundQualityPropertyShown_WhenRdpSoundsSetToBringToThisComputer()
-        {
-            ConnectionInfo.RedirectSound = RdpProtocol.RDPSounds.BringToThisComputer;
-            ExpectedPropertyList.Add(nameof(mRemoteNG.Connection.ConnectionInfo.SoundQuality));
-
-            RunVerification();
-        }
-
-        [TestCase(RdpProtocol.RDPResolutions.FitToWindow)]
-        [TestCase(RdpProtocol.RDPResolutions.Fullscreen)]
-        public void AutomaticResizePropertyShown_WhenResolutionIsDynamic(RdpProtocol.RDPResolutions resolution)
-        {
-            ConnectionInfo.Resolution = resolution;
-            ExpectedPropertyList.Add(nameof(mRemoteNG.Connection.ConnectionInfo.AutomaticResize));
-
-            RunVerification();
-        }
-    }
-}

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowSpecialTestsBase.cs

@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.UI.Window;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.UI.Window.ConfigWindowTests
-{
-    public abstract class ConfigWindowSpecialTestsBase
-    {
-        protected abstract ProtocolType Protocol { get; }
-        protected bool TestAgainstContainerInfo { get; set; } = false;
-        protected ConfigWindow ConfigWindow;
-        protected ConnectionInfo ConnectionInfo;
-        protected List<string> ExpectedPropertyList;
-
-        [SetUp]
-        public virtual void Setup()
-        {
-            ConnectionInfo = ConfigWindowGeneralTests.ConstructConnectionInfo(Protocol, TestAgainstContainerInfo);
-            ExpectedPropertyList = ConfigWindowGeneralTests.BuildExpectedConnectionInfoPropertyList(Protocol, TestAgainstContainerInfo);
-
-            ConfigWindow = new ConfigWindow
-            {
-                PropertiesVisible = true,
-            };
-        }
-
-        public void RunVerification()
-        {
-            ConfigWindow.SelectedTreeNode = ConnectionInfo;
-            Assert.That(
-                ConfigWindow.VisibleObjectProperties,
-                Is.EquivalentTo(ExpectedPropertyList));
-        }
-    }
-}

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowVncSpecialTests.cs

@@ -1,37 +0,0 @@
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Connection.Protocol.VNC;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.UI.Window.ConfigWindowTests
-{
-    public class ConfigWindowVncSpecialTests : ConfigWindowSpecialTestsBase
-    {
-        protected override ProtocolType Protocol => ProtocolType.VNC;
-
-        [Test]
-        public void UserDomainPropertiesShown_WhenAuthModeIsWindows()
-        {
-            ConnectionInfo.VNCAuthMode = ProtocolVNC.AuthMode.AuthWin;
-            ExpectedPropertyList.AddRange(new []
-            {
-                nameof(ConnectionInfo.Username),
-                nameof(ConnectionInfo.Domain),
-            });
-        }
-
-        [TestCase(ProtocolVNC.ProxyType.ProxyHTTP)]
-        [TestCase(ProtocolVNC.ProxyType.ProxySocks5)]
-        [TestCase(ProtocolVNC.ProxyType.ProxyUltra)]
-        public void ProxyPropertiesShown_WhenProxyModeIsNotNone(ProtocolVNC.ProxyType proxyType)
-        {
-            ConnectionInfo.VNCProxyType = proxyType;
-            ExpectedPropertyList.AddRange(new[]
-            {
-                nameof(ConnectionInfo.VNCProxyIP),
-                nameof(ConnectionInfo.VNCProxyPort),
-                nameof(ConnectionInfo.VNCProxyUsername),
-                nameof(ConnectionInfo.VNCProxyPassword),
-            });
-        }
-    }
-}

mRemoteNGTests/mRemoteNGTests.csproj

@@ -114,7 +114,6 @@
     <Compile Include="Config\DataProviders\FileBackupCreatorTests.cs" />
     <Compile Include="Config\DataProviders\FileDataProviderTests.cs" />
     <Compile Include="Config\DataProviders\FileDataProviderWithRollingBackupTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\ValidateXmlSchemas.cs" />
     <Compile Include="Config\Serializers\DataTableDeserializerTests.cs" />
     <Compile Include="Config\CredentialHarvesterTests.cs" />
     <Compile Include="Config\CredentialRecordLoaderTests.cs" />
@@ -122,21 +121,21 @@
     <Compile Include="Config\Serializers\CredentialProviderSerializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialPasswordDecryptorDecoratorTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialPasswordEncryptorDecoratorTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsDeserializerMremotengFormatTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsSerializerMremotengFormatTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\CsvConnectionsDeserializerMremotengFormatTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\CsvConnectionsSerializerMremotengFormatTests.cs" />
     <Compile Include="Config\Serializers\DataTableSerializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\PortScanDeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\PuttyConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionDeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManager27DeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentCompilerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentEncryptorTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsSerializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentCompilerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentEncryptorTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsSerializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialRecordDeserializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialSerializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlRootNodeSerializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlRootNodeSerializerTests.cs" />
     <Compile Include="Config\Serializers\Versioning\SqlVersion22To23UpgraderTests.cs" />
     <Compile Include="Config\Serializers\Versioning\SqlVersion23To24UpgraderTests.cs" />
     <Compile Include="Config\Serializers\Versioning\SqlVersion24To25UpgraderTests.cs" />
@@ -146,7 +145,6 @@
     <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" />
@@ -170,14 +168,12 @@
     <Compile Include="Security\PasswordCreation\PasswordLengthConstraintTests.cs" />
     <Compile Include="Security\RandomGeneratorTests.cs" />
     <Compile Include="Security\SecureStringExtensionsTests.cs" />
-    <Compile Include="TestHelpers\ConnectionInfoHelpers.cs" />
     <Compile Include="TestHelpers\ConnectionTreeModelBuilder.cs" />
     <Compile Include="Security\XmlCryptoProviderBuilderTests.cs" />
     <Compile Include="TestHelpers\FileTestHelpers.cs" />
-    <Compile Include="TestHelpers\SerializableConnectionInfoAllPropertiesOfType.cs" />
     <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
     <Compile Include="Tools\FullyObservableCollectionTests.cs" />
-    <Compile Include="Tools\OptionalTests.cs" />
+    <Compile Include="Tools\MaybeTests.cs" />
     <Compile Include="Tree\ClickHandlers\TreeNodeCompositeClickHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeDragAndDropHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeModelTests.cs" />
@@ -207,7 +203,6 @@
     <Compile Include="Tree\RootNodeInfoTests.cs" />
     <Compile Include="Tree\ClickHandlers\SwitchToConnectionClickHandlerTests.cs" />
     <Compile Include="Tree\SelectedConnectionDeletionConfirmerTests.cs" />
-    <Compile Include="UI\Controls\ConnectionTreeTests.cs" />
     <Compile Include="UI\Controls\PageSequenceTests.cs" />
     <Compile Include="UI\Controls\SecureTextBoxTestForm.cs">
       <SubType>Form</SubType>
@@ -232,10 +227,6 @@
     <Compile Include="UI\Forms\OptionsFormSetupAndTeardown.cs" />
     <Compile Include="UI\Forms\PasswordFormTests.cs" />
     <Compile Include="UI\WindowListTests.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowGeneralTests.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowRdpSpecialTests.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowSpecialTestsBase.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowVncSpecialTests.cs" />
     <Compile Include="UI\Window\ConnectionTreeWindowTests.cs" />
   </ItemGroup>
   <ItemGroup>

mRemoteV1.sln

@@ -33,19 +33,16 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.Build.0 = Debug Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.ActiveCfg = Debug|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.Build.0 = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.ActiveCfg = Release|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.Build.0 = Release|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.ActiveCfg = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.Build.0 = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|x86
@@ -53,26 +50,24 @@ Global
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.ActiveCfg = Release|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.Build.0 = Debug Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.ActiveCfg = Debug|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.Build.0 = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.ActiveCfg = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.Build.0 = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x86.ActiveCfg = Debug|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.ActiveCfg = Debug|x86
@@ -82,6 +77,7 @@ Global
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.ActiveCfg = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x86.ActiveCfg = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86
@@ -90,8 +86,8 @@ Global
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x86.ActiveCfg = Debug|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release Portable|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.ActiveCfg = Release|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.Build.0 = Release|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86

mRemoteV1/App/Export.cs

@@ -4,8 +4,6 @@ using System.Windows.Forms;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Csv;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;

mRemoteV1/App/Runtime.cs

@@ -4,6 +4,8 @@ using System.Security;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.App.Info;
+using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection;
 using mRemoteNG.Credential;
@@ -18,7 +20,7 @@ using mRemoteNG.UI.TaskDialog;
 
 namespace mRemoteNG.App
 {
-    public static class Runtime
+	public static class Runtime
     {
         public static bool IsPortableEdition
         {
@@ -77,6 +79,12 @@ namespace mRemoteNG.App
                     {
                         connectionFileName = ConnectionsService.GetStartupConnectionFileName();
                     }
+
+                    var backupFileCreator = new FileBackupCreator();
+                    backupFileCreator.CreateBackupFile(connectionFileName);
+
+                    var backupPruner = new FileBackupPruner();
+                    backupPruner.PruneBackupFiles(connectionFileName);
                 }
 
                 ConnectionsService.LoadConnections(Settings.Default.UseSQLServer, false, connectionFileName);
@@ -85,6 +93,18 @@ namespace mRemoteNG.App
                 {
                     ConnectionsService.LastSqlUpdate = DateTime.Now;
                 }
+                else
+                {
+                    if (connectionFileName == ConnectionsService.GetDefaultStartupConnectionFileName())
+                    {
+                        Settings.Default.LoadConsFromCustomLocation = false;
+                    }
+                    else
+                    {
+                        Settings.Default.LoadConsFromCustomLocation = true;
+                        Settings.Default.CustomConsPath = connectionFileName;
+                    }
+                }
 
                 // re-enable sql update checking after updates are loaded
                 ConnectionsService.RemoteConnectionsSyncronizer?.Enable();

mRemoteV1/App/Windows.cs

@@ -1,8 +1,8 @@
-using System;
+using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.Window;
+using System;
 using mRemoteNG.Messages;
 using mRemoteNG.UI;
-using mRemoteNG.UI.Forms;
-using mRemoteNG.UI.Window;
 
 namespace mRemoteNG.App
 {
@@ -15,14 +15,8 @@ namespace mRemoteNG.App
         private static PortScanWindow _portscanForm;
         private static UltraVNCWindow _ultravncscForm;
         private static ComponentsCheckWindow _componentscheckForm;
-        private static ConnectionTreeWindow _treeForm;
-
-        internal static ConnectionTreeWindow TreeForm
-        {
-            get => _treeForm ?? (_treeForm = new ConnectionTreeWindow());
-            set => _treeForm = value;
-        }
 
+        internal static ConnectionTreeWindow TreeForm { get; set; } = new ConnectionTreeWindow();
         internal static ConfigWindow ConfigForm { get; set; } = new ConfigWindow();
         internal static ErrorAndInfoWindow ErrorsForm { get; set; } = new ErrorAndInfoWindow();
         internal static ScreenshotManagerWindow ScreenshotForm { get; set; } = new ScreenshotManagerWindow();

mRemoteV1/Config/Connections/ConnectionsLoadedEventArgs.cs

@@ -10,7 +10,7 @@ namespace mRemoteNG.Config.Connections
         /// The previous <see cref="ConnectionTreeModel"/> that is being
         /// unloaded.
         /// </summary>
-        public Optional<ConnectionTreeModel> PreviousConnectionTreeModel { get; }
+        public Maybe<ConnectionTreeModel> PreviousConnectionTreeModel { get; }
 
         /// <summary>
         /// True if the previous <see cref="ConnectionTreeModel"/> was loaded from
@@ -37,7 +37,7 @@ namespace mRemoteNG.Config.Connections
         public string NewSourcePath { get; }
 
         public ConnectionsLoadedEventArgs(
-            Optional<ConnectionTreeModel> previousTreeModelModel, ConnectionTreeModel newTreeModelModel,
+            Maybe<ConnectionTreeModel> previousTreeModelModel, ConnectionTreeModel newTreeModelModel,
             bool previousSourceWasDatabase, bool newSourceIsDatabase,
             string newSourcePath)
         {

mRemoteV1/Config/Connections/CsvConnectionsSaver.cs

@@ -2,7 +2,6 @@
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Csv;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 

mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs

@@ -20,9 +20,10 @@ namespace mRemoteNG.Config.Connections
 
         private void ConnectionsServiceOnConnectionsLoaded(object sender, ConnectionsLoadedEventArgs connectionsLoadedEventArgs)
         {
+            
+
             connectionsLoadedEventArgs.NewConnectionTreeModel.CollectionChanged += ConnectionTreeModelOnCollectionChanged;
             connectionsLoadedEventArgs.NewConnectionTreeModel.PropertyChanged += ConnectionTreeModelOnPropertyChanged;
-
             foreach (var oldTree in connectionsLoadedEventArgs.PreviousConnectionTreeModel)
             {
                 oldTree.CollectionChanged -= ConnectionTreeModelOnCollectionChanged;
@@ -44,8 +45,7 @@ namespace mRemoteNG.Config.Connections
         {
             if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
-
-            _connectionsService.SaveConnectionsAsync();
+            _connectionsService.SaveConnections();
         }
     }
 }

mRemoteV1/Config/Connections/XmlConnectionsLoader.cs

@@ -1,14 +1,14 @@
 using System;
-using System.IO;
 using System.Security;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
+using System.IO;
 
 namespace mRemoteNG.Config.Connections
 {
-    public class XmlConnectionsLoader
+	public class XmlConnectionsLoader
     {
         private readonly string _connectionFilePath;
 
@@ -31,7 +31,7 @@ namespace mRemoteNG.Config.Connections
             return deserializer.Deserialize(xmlString);
         }
 
-        private Optional<SecureString> PromptForPassword()
+        private SecureString PromptForPassword()
         {
             var password = MiscTools.PasswordDialog("", false);
             return password;

mRemoteV1/Config/Connections/XmlConnectionsSaver.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;

mRemoteV1/Config/DataProviders/FileBackupPruner.cs

@@ -1,29 +1,26 @@
-using System.IO;
-using System.Linq;
+using System;
+using System.IO;
 
 namespace mRemoteNG.Config.DataProviders
 {
     public class FileBackupPruner
     {
-        public void PruneBackupFiles(string filePath, int maxBackupsToKeep)
+        public void PruneBackupFiles(string baseName)
         {
-            var fileName = Path.GetFileName(filePath);
-            var directoryName = Path.GetDirectoryName(filePath);
+            var fileName = Path.GetFileName(baseName);
+            var directoryName = Path.GetDirectoryName(baseName);
 
-            if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName))
-                return;
+            if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName)) return;
 
             var searchPattern = string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, "*");
             var files = Directory.GetFiles(directoryName, searchPattern);
 
-            if (files.Length <= maxBackupsToKeep)
-                return;
+            if (files.Length <= mRemoteNG.Settings.Default.BackupFileKeepCount) return;
 
-            var filesToDelete = files
-                .OrderByDescending(s => s)
-                .Skip(maxBackupsToKeep);
+            Array.Sort(files);
+            Array.Resize(ref files, files.Length - mRemoteNG.Settings.Default.BackupFileKeepCount);
 
-            foreach (var file in filesToDelete)
+            foreach (var file in files)
             {
                 File.Delete(file);
             }

mRemoteV1/Config/Import/MRemoteNGCsvImporter.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Config.Serializers.MiscSerializers;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 

mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 

mRemoteV1/Config/Putty/PuttySessionsManager.cs

@@ -1,13 +1,13 @@
+using mRemoteNG.Tools;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using mRemoteNG.Tools;
 using mRemoteNG.Tree.Root;
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.Config.Putty
 {
-    public class PuttySessionsManager
+	public class PuttySessionsManager
 	{
         public static PuttySessionsManager Instance { get; } = new PuttySessionsManager();
 
@@ -35,12 +35,10 @@ namespace mRemoteNG.Config.Putty
 			}
 		}
 
-	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider puttySessionProvider)
+	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider provider)
 	    {
-	        puttySessionProvider.ThrowIfNull(nameof(puttySessionProvider));
-
-            var rootTreeNode = puttySessionProvider.RootInfo;
-	        puttySessionProvider.GetSessions();
+            var rootTreeNode = provider.RootInfo;
+	        provider.GetSessions();
 
             if (!RootPuttySessionsNodes.Contains(rootTreeNode) && rootTreeNode.HasChildren())
                 RootPuttySessionsNodes.Add(rootTreeNode);

mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs

@@ -1,19 +1,19 @@
+using Microsoft.Win32;
+using mRemoteNG.App;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Messages;
 using System;
 using System.Collections.Generic;
 using System.Management;
 using System.Security.Principal;
 using System.Text;
 using System.Web;
-using Microsoft.Win32;
-using mRemoteNG.App;
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Messages;
 
 
 namespace mRemoteNG.Config.Putty
 {
-    public class PuttySessionsRegistryProvider : AbstractPuttySessionsProvider
+	public class PuttySessionsRegistryProvider : AbstractPuttySessionsProvider
 	{
         private const string PuttySessionsKey = "Software\\SimonTatham\\PuTTY\\Sessions";
         private static ManagementEventWatcher _eventWatcher;
@@ -39,10 +39,7 @@ namespace mRemoteNG.Config.Putty
 		}
         
         public override PuttySessionInfo GetSession(string sessionName)
-        {
-            if (string.IsNullOrEmpty(sessionName))
-                return null;
-
+		{
             var sessionsKey = Registry.CurrentUser.OpenSubKey(PuttySessionsKey);
             var sessionKey = sessionsKey?.OpenSubKey(sessionName);
 			if (sessionKey == null)	return null;
@@ -53,15 +50,10 @@ namespace mRemoteNG.Config.Putty
 		    {
 		        PuttySession = sessionName,
 		        Name = sessionName,
-		        Hostname = sessionKey.GetValue("HostName")?.ToString() ?? "",
-		        Username = sessionKey.GetValue("UserName")?.ToString() ?? ""
+		        Hostname = Convert.ToString(sessionKey.GetValue("HostName")),
+		        Username = Convert.ToString(sessionKey.GetValue("UserName"))
 		    };
-
-
-		    var protocol = string.IsNullOrEmpty(sessionKey.GetValue("Protocol")?.ToString())
-		        ? "ssh"
-                : sessionKey.GetValue("Protocol").ToString();
-
+            var protocol = Convert.ToString(sessionKey.GetValue("Protocol")) ?? "ssh";
 		    switch (protocol.ToLowerInvariant())
 			{
 				case "raw":
@@ -73,15 +65,16 @@ namespace mRemoteNG.Config.Putty
 				case "serial":
 					return null;
 				case "ssh":
-				    int.TryParse(sessionKey.GetValue("SshProt")?.ToString(), out var sshVersion);
-                    /* Per PUTTY.H in PuTTYNG & PuTTYNG Upstream (PuTTY proper currently)
-                     * expect 0 for SSH1, 3 for SSH2 ONLY
-                     * 1 for SSH1 with a 2 fallback
-                     * 2 for SSH2 with a 1 fallback
-                     *
-                     * default to SSH2 if any other value is received
-                     */
-                    sessionInfo.Protocol = sshVersion == 1 || sshVersion == 0 ? ProtocolType.SSH1 : ProtocolType.SSH2;
+                    var sshVersionObject = sessionKey.GetValue("SshProt");
+					if (sshVersionObject != null)
+					{
+					    var sshVersion = Convert.ToInt32(sshVersionObject);
+					    sessionInfo.Protocol = sshVersion >= 2 ? ProtocolType.SSH2 : ProtocolType.SSH1;
+					}
+					else
+					{
+						sessionInfo.Protocol = ProtocolType.SSH2;
+					}
 					break;
 				case "telnet":
 					sessionInfo.Protocol = ProtocolType.Telnet;
@@ -89,12 +82,7 @@ namespace mRemoteNG.Config.Putty
 				default:
 					return null;
 			}
-
-            int.TryParse(sessionKey.GetValue("PortNumber")?.ToString(), out var portNumber);
-            if (portNumber == default(int))
-                sessionInfo.SetDefaultPort();
-            else
-                sessionInfo.Port = portNumber;
+			sessionInfo.Port = Convert.ToInt32(sessionKey.GetValue("PortNumber"));
 				
 			return sessionInfo;
 		}

mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs

@@ -33,7 +33,6 @@ namespace mRemoteNG.Config.Putty
 			foreach (var sessionName in Directory.GetFiles(sessionsFolderPath))
 			{
 			    var sessionFileName = Path.GetFileName(sessionName);
-			    // ReSharper disable once ConstantConditionalAccessQualifier
 			    sessionNames.Add(raw ? sessionFileName : System.Web.HttpUtility.UrlDecode(sessionFileName?.Replace("+", "%2B")));
 			}
 
@@ -126,6 +125,9 @@ namespace mRemoteNG.Config.Putty
 			
 		public override void StartWatcher()
 		{
+			PuttySessionsRegistryProvider.StartWatcher();
+			PuttySessionsRegistryProvider.PuttySessionChanged += OnRegistrySessionChanged;
+				
 			if (_eventWatcher != null)
 			{
 				return;
@@ -134,22 +136,18 @@ namespace mRemoteNG.Config.Putty
 			try
 			{
                 var sessionsFolderPath = GetSessionsFolderPath();
-
-			    if (!Directory.Exists(sessionsFolderPath))
-			    {
-			        Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, $"XmingPortablePuttySessions.Watcher.StartWatching() failed: '{sessionsFolderPath}' does not exist.", true);
-			        return;
-			    }
-
-			    _eventWatcher = new FileSystemWatcher(sessionsFolderPath)
-			    {
-			        NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite
-			    };
-			    _eventWatcher.Changed += OnFileSystemEventArrived;
-			    _eventWatcher.Created += OnFileSystemEventArrived;
-			    _eventWatcher.Deleted += OnFileSystemEventArrived;
-			    _eventWatcher.Renamed += OnFileSystemEventArrived;
-			    _eventWatcher.EnableRaisingEvents = true;
+                if (Directory.Exists(sessionsFolderPath))
+                {
+                    _eventWatcher = new FileSystemWatcher(sessionsFolderPath)
+                    {
+                        NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite
+                    };
+                    _eventWatcher.Changed += OnFileSystemEventArrived;
+                    _eventWatcher.Created += OnFileSystemEventArrived;
+                    _eventWatcher.Deleted += OnFileSystemEventArrived;
+                    _eventWatcher.Renamed += OnFileSystemEventArrived;
+                    _eventWatcher.EnableRaisingEvents = true;
+                }
 			}
 			catch (Exception ex)
 			{
@@ -175,8 +173,7 @@ namespace mRemoteNG.Config.Putty
 		private static string GetPuttyConfPath()
 		{
 		    var puttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : App.Info.GeneralAppInfo.PuttyPath;
-		    puttyPath = Path.GetDirectoryName(puttyPath);
-            return string.IsNullOrEmpty(puttyPath) ? null : Path.Combine(puttyPath, "putty.conf");
+		    return Path.Combine(Path.GetDirectoryName(puttyPath), "putty.conf");
 		}
 			
 		private static string GetSessionsFolderPath()
@@ -203,9 +200,6 @@ namespace mRemoteNG.Config.Putty
 			
 		private static PuttySessionInfo ModifyRegistrySessionInfo(PuttySessionInfo sessionInfo)
 		{
-		    if (sessionInfo == null)
-		        return null;
-
 			sessionInfo.Name = string.Format(RegistrySessionNameFormat, sessionInfo.Name);
 			sessionInfo.PuttySession = string.Format(RegistrySessionNameFormat, sessionInfo.PuttySession);
 			return sessionInfo;

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

@@ -1,211 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
-using mRemoteNG.Credential;
-using mRemoteNG.Security;
-using mRemoteNG.Tools;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-
-namespace mRemoteNG.Config.Serializers.Csv
-{
-	public class CsvConnectionsSerializerMremotengFormat : ISerializer<ConnectionInfo,string>
-    {
-        private readonly SaveFilter _saveFilter;
-        private readonly ICredentialRepositoryList _credentialRepositoryList;
-
-        public CsvConnectionsSerializerMremotengFormat(SaveFilter saveFilter, ICredentialRepositoryList credentialRepositoryList)
-        {
-            saveFilter.ThrowIfNull(nameof(saveFilter));
-            credentialRepositoryList.ThrowIfNull(nameof(credentialRepositoryList));
-
-            _saveFilter = saveFilter;
-            _credentialRepositoryList = credentialRepositoryList;
-        }
-
-        public string Serialize(ConnectionTreeModel connectionTreeModel)
-        {
-            connectionTreeModel.ThrowIfNull(nameof(connectionTreeModel));
-
-            var rootNode = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
-            return Serialize(rootNode);
-        }
-
-        public string Serialize(ConnectionInfo serializationTarget)
-        {
-            serializationTarget.ThrowIfNull(nameof(serializationTarget));
-            var sb = new StringBuilder();
-
-            WriteCsvHeader(sb);
-            SerializeNodesRecursive(serializationTarget, sb);
-            return sb.ToString();
-        }
-
-        private void WriteCsvHeader(StringBuilder sb)
-        {
-            sb.Append("Name;Id;Parent;NodeType;Description;Icon;Panel;");
-            if (_saveFilter.SaveUsername)
-                sb.Append("Username;");
-            if (_saveFilter.SavePassword)
-                sb.Append("Password;");
-            if (_saveFilter.SaveDomain)
-                sb.Append("Domain;");
-            sb.Append("Hostname;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;");
-            if (_saveFilter.SaveInheritance)
-                sb.Append("InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;InheritUseConsoleSession;InheritUseCredSsp;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain;InheritRDPAlertIdleTimeout;InheritRDPMinutesToIdleTimeout;InheritSoundQuality");
-        }
-
-        private void SerializeNodesRecursive(ConnectionInfo node, StringBuilder sb)
-        {
-            var nodeAsContainer = node as ContainerInfo;
-            if (nodeAsContainer != null)
-            {
-                foreach (var child in nodeAsContainer.Children)
-                {
-                    SerializeNodesRecursive(child, sb);
-                }
-            }
-
-            // dont serialize the root node
-            if (node is RootNodeInfo)
-                return;
-
-            SerializeConnectionInfo(node, sb);
-        }
-
-        private void SerializeConnectionInfo(ConnectionInfo con, StringBuilder sb)
-        {
-            sb.AppendLine();
-            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(FormatForCsv(con.Username));
-
-            if (_saveFilter.SavePassword)
-                sb.Append(FormatForCsv(con.Password));
-
-            if (_saveFilter.SaveDomain)
-                sb.Append(FormatForCsv(con.Domain));
-
-            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(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));
-        }
-
-        private string FormatForCsv(object value)
-        {
-            var cleanedString = value.ToString().Replace(";", "");
-            return cleanedString + ";";
-        }
-    }
-}

mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionNodeSerializer26.cs

@@ -5,7 +5,8 @@ using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 
-namespace mRemoteNG.Config.Serializers.Xml
+
+namespace mRemoteNG.Config.Serializers
 {
 	// ReSharper disable once InconsistentNaming
 	public class XmlConnectionNodeSerializer26 : ISerializer<ConnectionInfo,XElement>
@@ -42,7 +43,7 @@ namespace mRemoteNG.Config.Serializers.Xml
             element.Add(new XAttribute("Name", connectionInfo.Name));
             element.Add(new XAttribute("Type", connectionInfo.GetTreeNodeType().ToString()));
             if (nodeAsContainer != null)
-                element.Add(new XAttribute("Expanded", nodeAsContainer.IsExpanded.ToString().ToLowerInvariant()));
+                element.Add(new XAttribute("Expanded", nodeAsContainer.IsExpanded.ToString()));
             element.Add(new XAttribute("Descr", connectionInfo.Description));
             element.Add(new XAttribute("Icon", connectionInfo.Icon));
             element.Add(new XAttribute("Panel", connectionInfo.Panel));
@@ -65,30 +66,30 @@ namespace mRemoteNG.Config.Serializers.Xml
             element.Add(new XAttribute("Protocol", connectionInfo.Protocol));
             element.Add(new XAttribute("PuttySession", connectionInfo.PuttySession));
             element.Add(new XAttribute("Port", connectionInfo.Port));
-            element.Add(new XAttribute("ConnectToConsole", connectionInfo.UseConsoleSession.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("UseCredSsp", connectionInfo.UseCredSsp.ToString().ToLowerInvariant()));
+            element.Add(new XAttribute("ConnectToConsole", connectionInfo.UseConsoleSession.ToString()));
+            element.Add(new XAttribute("UseCredSsp", connectionInfo.UseCredSsp.ToString()));
             element.Add(new XAttribute("RenderingEngine", connectionInfo.RenderingEngine));
             element.Add(new XAttribute("ICAEncryptionStrength", connectionInfo.ICAEncryptionStrength));
             element.Add(new XAttribute("RDPAuthenticationLevel", connectionInfo.RDPAuthenticationLevel));
             element.Add(new XAttribute("RDPMinutesToIdleTimeout", connectionInfo.RDPMinutesToIdleTimeout));
-            element.Add(new XAttribute("RDPAlertIdleTimeout", connectionInfo.RDPAlertIdleTimeout.ToString().ToLowerInvariant()));
+            element.Add(new XAttribute("RDPAlertIdleTimeout", connectionInfo.RDPAlertIdleTimeout));
             element.Add(new XAttribute("LoadBalanceInfo", connectionInfo.LoadBalanceInfo));
             element.Add(new XAttribute("Colors", connectionInfo.Colors));
             element.Add(new XAttribute("Resolution", connectionInfo.Resolution));
-            element.Add(new XAttribute("AutomaticResize", connectionInfo.AutomaticResize.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisplayWallpaper", connectionInfo.DisplayWallpaper.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisplayThemes", connectionInfo.DisplayThemes.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("EnableFontSmoothing", connectionInfo.EnableFontSmoothing.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("EnableDesktopComposition", connectionInfo.EnableDesktopComposition.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("CacheBitmaps", connectionInfo.CacheBitmaps.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectDiskDrives", connectionInfo.RedirectDiskDrives.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectPorts", connectionInfo.RedirectPorts.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectPrinters", connectionInfo.RedirectPrinters.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectSmartCards", connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant()));
+            element.Add(new XAttribute("AutomaticResize", connectionInfo.AutomaticResize.ToString()));
+            element.Add(new XAttribute("DisplayWallpaper", connectionInfo.DisplayWallpaper.ToString()));
+            element.Add(new XAttribute("DisplayThemes", connectionInfo.DisplayThemes.ToString()));
+            element.Add(new XAttribute("EnableFontSmoothing", connectionInfo.EnableFontSmoothing.ToString()));
+            element.Add(new XAttribute("EnableDesktopComposition", connectionInfo.EnableDesktopComposition.ToString()));
+            element.Add(new XAttribute("CacheBitmaps", connectionInfo.CacheBitmaps.ToString()));
+            element.Add(new XAttribute("RedirectDiskDrives", connectionInfo.RedirectDiskDrives.ToString()));
+            element.Add(new XAttribute("RedirectPorts", connectionInfo.RedirectPorts.ToString()));
+            element.Add(new XAttribute("RedirectPrinters", connectionInfo.RedirectPrinters.ToString()));
+            element.Add(new XAttribute("RedirectSmartCards", connectionInfo.RedirectSmartCards.ToString()));
             element.Add(new XAttribute("RedirectSound", connectionInfo.RedirectSound.ToString()));
             element.Add(new XAttribute("SoundQuality", connectionInfo.SoundQuality.ToString()));
-            element.Add(new XAttribute("RedirectKeys", connectionInfo.RedirectKeys.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("Connected", (connectionInfo.OpenConnections.Count > 0).ToString().ToLowerInvariant()));
+            element.Add(new XAttribute("RedirectKeys", connectionInfo.RedirectKeys.ToString()));
+            element.Add(new XAttribute("Connected", (connectionInfo.OpenConnections.Count > 0).ToString()));
             element.Add(new XAttribute("PreExtApp", connectionInfo.PreExtApp));
             element.Add(new XAttribute("PostExtApp", connectionInfo.PostExtApp));
             element.Add(new XAttribute("MacAddress", connectionInfo.MacAddress));
@@ -112,7 +113,7 @@ namespace mRemoteNG.Config.Serializers.Xml
 
             element.Add(new XAttribute("VNCColors", connectionInfo.VNCColors));
             element.Add(new XAttribute("VNCSmartSizeMode", connectionInfo.VNCSmartSizeMode));
-            element.Add(new XAttribute("VNCViewOnly", connectionInfo.VNCViewOnly.ToString().ToLowerInvariant()));
+            element.Add(new XAttribute("VNCViewOnly", connectionInfo.VNCViewOnly.ToString()));
             element.Add(new XAttribute("RDGatewayUsageMethod", connectionInfo.RDGatewayUsageMethod));
             element.Add(new XAttribute("RDGatewayHostname", connectionInfo.RDGatewayHostname));
             element.Add(new XAttribute("RDGatewayUseConnectionCredentials", connectionInfo.RDGatewayUseConnectionCredentials));
@@ -135,118 +136,117 @@ namespace mRemoteNG.Config.Serializers.Xml
         {
             if (_saveFilter.SaveInheritance)
             {
-                element.Add(new XAttribute("InheritCacheBitmaps", connectionInfo.Inheritance.CacheBitmaps.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritColors", connectionInfo.Inheritance.Colors.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritDescription", connectionInfo.Inheritance.Description.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritDisplayThemes", connectionInfo.Inheritance.DisplayThemes.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritDisplayWallpaper", connectionInfo.Inheritance.DisplayWallpaper.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritEnableFontSmoothing", connectionInfo.Inheritance.EnableFontSmoothing.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritEnableDesktopComposition", connectionInfo.Inheritance.EnableDesktopComposition.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritDomain", connectionInfo.Inheritance.Domain.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritIcon", connectionInfo.Inheritance.Icon.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritPanel", connectionInfo.Inheritance.Panel.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritPassword", connectionInfo.Inheritance.Password.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritPort", connectionInfo.Inheritance.Port.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritProtocol", connectionInfo.Inheritance.Protocol.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritPuttySession", connectionInfo.Inheritance.PuttySession.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRedirectDiskDrives", connectionInfo.Inheritance.RedirectDiskDrives.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRedirectKeys", connectionInfo.Inheritance.RedirectKeys.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRedirectPorts", connectionInfo.Inheritance.RedirectPorts.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRedirectPrinters", connectionInfo.Inheritance.RedirectPrinters.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRedirectSmartCards", connectionInfo.Inheritance.RedirectSmartCards.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRedirectSound", connectionInfo.Inheritance.RedirectSound.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritSoundQuality", connectionInfo.Inheritance.SoundQuality.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritResolution", connectionInfo.Inheritance.Resolution.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritAutomaticResize", connectionInfo.Inheritance.AutomaticResize.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritUseConsoleSession", connectionInfo.Inheritance.UseConsoleSession.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritUseCredSsp", connectionInfo.Inheritance.UseCredSsp.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRenderingEngine", connectionInfo.Inheritance.RenderingEngine.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritUsername", connectionInfo.Inheritance.Username.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritICAEncryptionStrength", connectionInfo.Inheritance.ICAEncryptionStrength.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDPAuthenticationLevel", connectionInfo.Inheritance.RDPAuthenticationLevel.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", connectionInfo.Inheritance.RDPMinutesToIdleTimeout.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDPAlertIdleTimeout", connectionInfo.Inheritance.RDPAlertIdleTimeout.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritLoadBalanceInfo", connectionInfo.Inheritance.LoadBalanceInfo.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritPreExtApp", connectionInfo.Inheritance.PreExtApp.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritPostExtApp", connectionInfo.Inheritance.PostExtApp.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritMacAddress", connectionInfo.Inheritance.MacAddress.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritUserField", connectionInfo.Inheritance.UserField.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritExtApp", connectionInfo.Inheritance.ExtApp.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCCompression", connectionInfo.Inheritance.VNCCompression.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCEncoding", connectionInfo.Inheritance.VNCEncoding.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCAuthMode", connectionInfo.Inheritance.VNCAuthMode.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCProxyType", connectionInfo.Inheritance.VNCProxyType.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCProxyIP", connectionInfo.Inheritance.VNCProxyIP.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCProxyPort", connectionInfo.Inheritance.VNCProxyPort.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCProxyUsername", connectionInfo.Inheritance.VNCProxyUsername.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCProxyPassword", connectionInfo.Inheritance.VNCProxyPassword.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCColors", connectionInfo.Inheritance.VNCColors.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCSmartSizeMode", connectionInfo.Inheritance.VNCSmartSizeMode.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritVNCViewOnly", connectionInfo.Inheritance.VNCViewOnly.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDGatewayUsageMethod", connectionInfo.Inheritance.RDGatewayUsageMethod.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDGatewayHostname", connectionInfo.Inheritance.RDGatewayHostname.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", connectionInfo.Inheritance.RDGatewayUseConnectionCredentials.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDGatewayUsername", connectionInfo.Inheritance.RDGatewayUsername.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDGatewayPassword", connectionInfo.Inheritance.RDGatewayPassword.ToString().ToLowerInvariant()));
-                element.Add(new XAttribute("InheritRDGatewayDomain", connectionInfo.Inheritance.RDGatewayDomain.ToString().ToLowerInvariant()));
+                element.Add(new XAttribute("InheritCacheBitmaps", connectionInfo.Inheritance.CacheBitmaps.ToString()));
+                element.Add(new XAttribute("InheritColors", connectionInfo.Inheritance.Colors.ToString()));
+                element.Add(new XAttribute("InheritDescription", connectionInfo.Inheritance.Description.ToString()));
+                element.Add(new XAttribute("InheritDisplayThemes", connectionInfo.Inheritance.DisplayThemes.ToString()));
+                element.Add(new XAttribute("InheritDisplayWallpaper", connectionInfo.Inheritance.DisplayWallpaper.ToString()));
+                element.Add(new XAttribute("InheritEnableFontSmoothing", connectionInfo.Inheritance.EnableFontSmoothing.ToString()));
+                element.Add(new XAttribute("InheritEnableDesktopComposition", connectionInfo.Inheritance.EnableDesktopComposition.ToString()));
+                element.Add(new XAttribute("InheritDomain", connectionInfo.Inheritance.Domain.ToString()));
+                element.Add(new XAttribute("InheritIcon", connectionInfo.Inheritance.Icon.ToString()));
+                element.Add(new XAttribute("InheritPanel", connectionInfo.Inheritance.Panel.ToString()));
+                element.Add(new XAttribute("InheritPassword", connectionInfo.Inheritance.Password.ToString()));
+                element.Add(new XAttribute("InheritPort", connectionInfo.Inheritance.Port.ToString()));
+                element.Add(new XAttribute("InheritProtocol", connectionInfo.Inheritance.Protocol.ToString()));
+                element.Add(new XAttribute("InheritPuttySession", connectionInfo.Inheritance.PuttySession.ToString()));
+                element.Add(new XAttribute("InheritRedirectDiskDrives", connectionInfo.Inheritance.RedirectDiskDrives.ToString()));
+                element.Add(new XAttribute("InheritRedirectKeys", connectionInfo.Inheritance.RedirectKeys.ToString()));
+                element.Add(new XAttribute("InheritRedirectPorts", connectionInfo.Inheritance.RedirectPorts.ToString()));
+                element.Add(new XAttribute("InheritRedirectPrinters", connectionInfo.Inheritance.RedirectPrinters.ToString()));
+                element.Add(new XAttribute("InheritRedirectSmartCards", connectionInfo.Inheritance.RedirectSmartCards.ToString()));
+                element.Add(new XAttribute("InheritRedirectSound", connectionInfo.Inheritance.RedirectSound.ToString()));
+                element.Add(new XAttribute("InheritSoundQuality", connectionInfo.Inheritance.SoundQuality.ToString()));
+                element.Add(new XAttribute("InheritResolution", connectionInfo.Inheritance.Resolution.ToString()));
+                element.Add(new XAttribute("InheritAutomaticResize", connectionInfo.Inheritance.AutomaticResize.ToString()));
+                element.Add(new XAttribute("InheritUseConsoleSession", connectionInfo.Inheritance.UseConsoleSession.ToString()));
+                element.Add(new XAttribute("InheritUseCredSsp", connectionInfo.Inheritance.UseCredSsp.ToString()));
+                element.Add(new XAttribute("InheritRenderingEngine", connectionInfo.Inheritance.RenderingEngine.ToString()));
+                element.Add(new XAttribute("InheritUsername", connectionInfo.Inheritance.Username.ToString()));
+                element.Add(new XAttribute("InheritICAEncryptionStrength", connectionInfo.Inheritance.ICAEncryptionStrength.ToString()));
+                element.Add(new XAttribute("InheritRDPAuthenticationLevel", connectionInfo.Inheritance.RDPAuthenticationLevel.ToString()));
+                element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", connectionInfo.Inheritance.RDPMinutesToIdleTimeout.ToString()));
+                element.Add(new XAttribute("InheritRDPAlertIdleTimeout", connectionInfo.Inheritance.RDPAlertIdleTimeout.ToString()));
+                element.Add(new XAttribute("InheritLoadBalanceInfo", connectionInfo.Inheritance.LoadBalanceInfo.ToString()));
+                element.Add(new XAttribute("InheritPreExtApp", connectionInfo.Inheritance.PreExtApp.ToString()));
+                element.Add(new XAttribute("InheritPostExtApp", connectionInfo.Inheritance.PostExtApp.ToString()));
+                element.Add(new XAttribute("InheritMacAddress", connectionInfo.Inheritance.MacAddress.ToString()));
+                element.Add(new XAttribute("InheritUserField", connectionInfo.Inheritance.UserField.ToString()));
+                element.Add(new XAttribute("InheritExtApp", connectionInfo.Inheritance.ExtApp.ToString()));
+                element.Add(new XAttribute("InheritVNCCompression", connectionInfo.Inheritance.VNCCompression.ToString()));
+                element.Add(new XAttribute("InheritVNCEncoding", connectionInfo.Inheritance.VNCEncoding.ToString()));
+                element.Add(new XAttribute("InheritVNCAuthMode", connectionInfo.Inheritance.VNCAuthMode.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyType", connectionInfo.Inheritance.VNCProxyType.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyIP", connectionInfo.Inheritance.VNCProxyIP.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyPort", connectionInfo.Inheritance.VNCProxyPort.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyUsername", connectionInfo.Inheritance.VNCProxyUsername.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyPassword", connectionInfo.Inheritance.VNCProxyPassword.ToString()));
+                element.Add(new XAttribute("InheritVNCColors", connectionInfo.Inheritance.VNCColors.ToString()));
+                element.Add(new XAttribute("InheritVNCSmartSizeMode", connectionInfo.Inheritance.VNCSmartSizeMode.ToString()));
+                element.Add(new XAttribute("InheritVNCViewOnly", connectionInfo.Inheritance.VNCViewOnly.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayUsageMethod", connectionInfo.Inheritance.RDGatewayUsageMethod.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayHostname", connectionInfo.Inheritance.RDGatewayHostname.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", connectionInfo.Inheritance.RDGatewayUseConnectionCredentials.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayUsername", connectionInfo.Inheritance.RDGatewayUsername.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayPassword", connectionInfo.Inheritance.RDGatewayPassword.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayDomain", connectionInfo.Inheritance.RDGatewayDomain.ToString()));
             }
             else
             {
-                var falseString = false.ToString().ToLowerInvariant();
-                element.Add(new XAttribute("InheritCacheBitmaps", falseString));
-                element.Add(new XAttribute("InheritColors", falseString));
-                element.Add(new XAttribute("InheritDescription", falseString));
-                element.Add(new XAttribute("InheritDisplayThemes", falseString));
-                element.Add(new XAttribute("InheritDisplayWallpaper", falseString));
-                element.Add(new XAttribute("InheritEnableFontSmoothing", falseString));
-                element.Add(new XAttribute("InheritEnableDesktopComposition", falseString));
-                element.Add(new XAttribute("InheritDomain", falseString));
-                element.Add(new XAttribute("InheritIcon", falseString));
-                element.Add(new XAttribute("InheritPanel", falseString));
-                element.Add(new XAttribute("InheritPassword", falseString));
-                element.Add(new XAttribute("InheritPort", falseString));
-                element.Add(new XAttribute("InheritProtocol", falseString));
-                element.Add(new XAttribute("InheritPuttySession", falseString));
-                element.Add(new XAttribute("InheritRedirectDiskDrives", falseString));
-                element.Add(new XAttribute("InheritRedirectKeys", falseString));
-                element.Add(new XAttribute("InheritRedirectPorts", falseString));
-                element.Add(new XAttribute("InheritRedirectPrinters", falseString));
-                element.Add(new XAttribute("InheritRedirectSmartCards", falseString));
-                element.Add(new XAttribute("InheritRedirectSound", falseString));
-                element.Add(new XAttribute("InheritSoundQuality", falseString));
-                element.Add(new XAttribute("InheritResolution", falseString));
-                element.Add(new XAttribute("InheritAutomaticResize", falseString));
-                element.Add(new XAttribute("InheritUseConsoleSession", falseString));
-                element.Add(new XAttribute("InheritUseCredSsp", falseString));
-                element.Add(new XAttribute("InheritRenderingEngine", falseString));
-                element.Add(new XAttribute("InheritUsername", falseString));
-                element.Add(new XAttribute("InheritICAEncryptionStrength", falseString));
-                element.Add(new XAttribute("InheritRDPAuthenticationLevel", falseString));
-                element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", falseString));
-                element.Add(new XAttribute("InheritRDPAlertIdleTimeout", falseString));
-                element.Add(new XAttribute("InheritLoadBalanceInfo", falseString));
-                element.Add(new XAttribute("InheritPreExtApp", falseString));
-                element.Add(new XAttribute("InheritPostExtApp", falseString));
-                element.Add(new XAttribute("InheritMacAddress", falseString));
-                element.Add(new XAttribute("InheritUserField", falseString));
-                element.Add(new XAttribute("InheritExtApp", falseString));
-                element.Add(new XAttribute("InheritVNCCompression", falseString));
-                element.Add(new XAttribute("InheritVNCEncoding", falseString));
-                element.Add(new XAttribute("InheritVNCAuthMode", falseString));
-                element.Add(new XAttribute("InheritVNCProxyType", falseString));
-                element.Add(new XAttribute("InheritVNCProxyIP", falseString));
-                element.Add(new XAttribute("InheritVNCProxyPort", falseString));
-                element.Add(new XAttribute("InheritVNCProxyUsername", falseString));
-                element.Add(new XAttribute("InheritVNCProxyPassword", falseString));
-                element.Add(new XAttribute("InheritVNCColors", falseString));
-                element.Add(new XAttribute("InheritVNCSmartSizeMode", falseString));
-                element.Add(new XAttribute("InheritVNCViewOnly", falseString));
-                element.Add(new XAttribute("InheritRDGatewayUsageMethod", falseString));
-                element.Add(new XAttribute("InheritRDGatewayHostname", falseString));
-                element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", falseString));
-                element.Add(new XAttribute("InheritRDGatewayUsername", falseString));
-                element.Add(new XAttribute("InheritRDGatewayPassword", falseString));
-                element.Add(new XAttribute("InheritRDGatewayDomain", falseString));
+                element.Add(new XAttribute("InheritCacheBitmaps", false.ToString()));
+                element.Add(new XAttribute("InheritColors", false.ToString()));
+                element.Add(new XAttribute("InheritDescription", false.ToString()));
+                element.Add(new XAttribute("InheritDisplayThemes", false.ToString()));
+                element.Add(new XAttribute("InheritDisplayWallpaper", false.ToString()));
+                element.Add(new XAttribute("InheritEnableFontSmoothing", false.ToString()));
+                element.Add(new XAttribute("InheritEnableDesktopComposition", false.ToString()));
+                element.Add(new XAttribute("InheritDomain", false.ToString()));
+                element.Add(new XAttribute("InheritIcon", false.ToString()));
+                element.Add(new XAttribute("InheritPanel", false.ToString()));
+                element.Add(new XAttribute("InheritPassword", false.ToString()));
+                element.Add(new XAttribute("InheritPort", false.ToString()));
+                element.Add(new XAttribute("InheritProtocol", false.ToString()));
+                element.Add(new XAttribute("InheritPuttySession", false.ToString()));
+                element.Add(new XAttribute("InheritRedirectDiskDrives", false.ToString()));
+                element.Add(new XAttribute("InheritRedirectKeys", false.ToString()));
+                element.Add(new XAttribute("InheritRedirectPorts", false.ToString()));
+                element.Add(new XAttribute("InheritRedirectPrinters", false.ToString()));
+                element.Add(new XAttribute("InheritRedirectSmartCards", false.ToString()));
+                element.Add(new XAttribute("InheritRedirectSound", false.ToString()));
+                element.Add(new XAttribute("InheritSoundQuality", false.ToString()));
+                element.Add(new XAttribute("InheritResolution", false.ToString()));
+                element.Add(new XAttribute("InheritAutomaticResize", false.ToString()));
+                element.Add(new XAttribute("InheritUseConsoleSession", false.ToString()));
+                element.Add(new XAttribute("InheritUseCredSsp", false.ToString()));
+                element.Add(new XAttribute("InheritRenderingEngine", false.ToString()));
+                element.Add(new XAttribute("InheritUsername", false.ToString()));
+                element.Add(new XAttribute("InheritICAEncryptionStrength", false.ToString()));
+                element.Add(new XAttribute("InheritRDPAuthenticationLevel", false.ToString()));
+                element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", false.ToString()));
+                element.Add(new XAttribute("InheritRDPAlertIdleTimeout", false.ToString()));
+                element.Add(new XAttribute("InheritLoadBalanceInfo", false.ToString()));
+                element.Add(new XAttribute("InheritPreExtApp", false.ToString()));
+                element.Add(new XAttribute("InheritPostExtApp", false.ToString()));
+                element.Add(new XAttribute("InheritMacAddress", false.ToString()));
+                element.Add(new XAttribute("InheritUserField", false.ToString()));
+                element.Add(new XAttribute("InheritExtApp", false.ToString()));
+                element.Add(new XAttribute("InheritVNCCompression", false.ToString()));
+                element.Add(new XAttribute("InheritVNCEncoding", false.ToString()));
+                element.Add(new XAttribute("InheritVNCAuthMode", false.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyType", false.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyIP", false.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyPort", false.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyUsername", false.ToString()));
+                element.Add(new XAttribute("InheritVNCProxyPassword", false.ToString()));
+                element.Add(new XAttribute("InheritVNCColors", false.ToString()));
+                element.Add(new XAttribute("InheritVNCSmartSizeMode", false.ToString()));
+                element.Add(new XAttribute("InheritVNCViewOnly", false.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayUsageMethod", false.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayHostname", false.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", false.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayUsername", false.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayPassword", false.ToString()));
+                element.Add(new XAttribute("InheritRDGatewayDomain", false.ToString()));
             }
         }
     }

mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializer.cs

@@ -19,9 +19,9 @@ using mRemoteNG.Tree.Root;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.TaskDialog;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers
 {
-    public class XmlConnectionsDeserializer : IDeserializer<string, ConnectionTreeModel>
+	public class XmlConnectionsDeserializer : IDeserializer<string, ConnectionTreeModel>
     {
         private XmlDocument _xmlDocument;
         private double _confVersion;
@@ -30,9 +30,9 @@ namespace mRemoteNG.Config.Serializers.Xml
         private const double MaxSupportedConfVersion = 2.8;
         private readonly RootNodeInfo _rootNodeInfo = new RootNodeInfo(RootNodeType.Connection);
 
-        public Func<Optional<SecureString>> AuthenticationRequestor { get; set; }
+        public Func<SecureString> AuthenticationRequestor { get; set; }
 
-        public XmlConnectionsDeserializer(Func<Optional<SecureString>> authenticationRequestor = null)
+        public XmlConnectionsDeserializer(Func<SecureString> authenticationRequestor = null)
         {
             AuthenticationRequestor = authenticationRequestor;
         }
@@ -48,6 +48,8 @@ namespace mRemoteNG.Config.Serializers.Xml
             {
                 LoadXmlConnectionData(xml);
                 ValidateConnectionFileVersion();
+                if (!import)
+                    Runtime.ConnectionsService.IsConnectionsFileLoaded = false;
 
                 var rootXmlElement = _xmlDocument.DocumentElement;
                 InitializeRootNode(rootXmlElement);
@@ -61,14 +63,15 @@ namespace mRemoteNG.Config.Serializers.Xml
                     var protectedString = _xmlDocument.DocumentElement?.Attributes["Protected"].Value;
                     if (!_decryptor.ConnectionsFileIsAuthentic(protectedString, _rootNodeInfo.PasswordString.ConvertToSecureString()))
                     {
+                        mRemoteNG.Settings.Default.LoadConsFromCustomLocation = false;
+                        mRemoteNG.Settings.Default.CustomConsPath = "";
                         return null;
                     }
                 }
 
                 if (_confVersion >= 2.6)
                 {
-                    var fullFileEncryptionValue = rootXmlElement?.Attributes["FullFileEncryption"].Value ?? "";
-                    if (bool.Parse(fullFileEncryptionValue))
+                    if (rootXmlElement?.Attributes["FullFileEncryption"].Value == "True")
                     {
                         var decryptedContent = _decryptor.Decrypt(rootXmlElement.InnerText);
                         rootXmlElement.InnerXml = decryptedContent;
@@ -140,10 +143,10 @@ namespace mRemoteNG.Config.Serializers.Xml
             if (_confVersion >= 2.6)
             {
                 BlockCipherEngines engine;
-                Enum.TryParse(connectionsRootElement?.Attributes["EncryptionEngine"].Value, true, out engine);
+                Enum.TryParse(connectionsRootElement?.Attributes["EncryptionEngine"].Value, out engine);
 
                 BlockCipherModes mode;
-                Enum.TryParse(connectionsRootElement?.Attributes["BlockCipherMode"].Value, true, out mode);
+                Enum.TryParse(connectionsRootElement?.Attributes["BlockCipherMode"].Value, out mode);
 
                 int keyDerivationIterations;
                 int.TryParse(connectionsRootElement?.Attributes["KdfIterations"].Value, out keyDerivationIterations);
@@ -183,10 +186,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                             if (_confVersion >= 0.9)
                                 containerInfo.CopyFrom(GetConnectionInfoFromXml(xmlNode));
                             if (_confVersion >= 0.8)
-                            {
-                                var expandedValue = xmlNode.Attributes?["Expanded"].Value ?? "";
-                                containerInfo.IsExpanded = bool.Parse(expandedValue);
-                            }
+                                containerInfo.IsExpanded = xmlNode.Attributes?["Expanded"].Value == "True";
 
                             parentContainer.AddChild(containerInfo);
                             AddNodesFromXmlRecursive(xmlNode, containerInfo);
@@ -204,9 +204,7 @@ namespace mRemoteNG.Config.Serializers.Xml
         private ConnectionInfo GetConnectionInfoFromXml(XmlNode xmlnode)
         {
             if (xmlnode.Attributes == null) return null;
-
-			var connectionId = xmlnode.Attributes["Id"]?.Value ?? Guid.NewGuid().ToString();
-			var connectionInfo = new ConnectionInfo(connectionId);
+            var connectionInfo = new ConnectionInfo();
 
             try
             {
@@ -221,9 +219,7 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                     if (_confVersion < 1.1) //1.0 - 0.1
                     {
-                        connectionInfo.Resolution = Convert.ToBoolean(xmlnode.Attributes["Fullscreen"].Value)
-                            ? RdpProtocol.RDPResolutions.Fullscreen
-                            : RdpProtocol.RDPResolutions.FitToWindow;
+                        connectionInfo.Resolution = Convert.ToBoolean(xmlnode.Attributes["Fullscreen"].Value) ? RdpResolutions.Fullscreen : RdpResolutions.FitToWindow;
                     }
 
                     if (_confVersion <= 2.6) // 0.2 - 2.6
@@ -253,7 +249,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                 }
                 else
                 {
-                    connectionInfo.Port = (int)RdpProtocol.Defaults.Port;
+                    connectionInfo.Port = (int)RdpProtocol6.Defaults.Port;
                     connectionInfo.Protocol = ProtocolType.RDP;
                 }
 
@@ -261,9 +257,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                 {
                     if (_confVersion < 0.7)
                     {
-                        connectionInfo.Port = Convert.ToInt32(Convert.ToBoolean(xmlnode.Attributes["UseVNC"].Value) 
-                            ? xmlnode.Attributes["VNCPort"].Value 
-                            : xmlnode.Attributes["RDPPort"].Value);
+                        connectionInfo.Port = Convert.ToInt32(Convert.ToBoolean(xmlnode.Attributes["UseVNC"].Value) ? xmlnode.Attributes["VNCPort"].Value : xmlnode.Attributes["RDPPort"].Value);
                     }
 
                     connectionInfo.UseConsoleSession = bool.Parse(xmlnode.Attributes["ConnectToConsole"].Value);
@@ -275,7 +269,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                         if (Convert.ToBoolean(xmlnode.Attributes["UseVNC"].Value))
                             connectionInfo.Port = (int)ProtocolVNC.Defaults.Port;
                         else
-                            connectionInfo.Port = (int)RdpProtocol.Defaults.Port;
+                            connectionInfo.Port = (int)RdpProtocol6.Defaults.Port;
                     }
                     connectionInfo.UseConsoleSession = false;
                 }
@@ -297,9 +291,7 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                 if (_confVersion >= 0.7)
                 {
-	                ProtocolType protocolType;
-	                Enum.TryParse(xmlnode.Attributes["Protocol"].Value, true, out protocolType);
-                    connectionInfo.Protocol = protocolType;
+                    connectionInfo.Protocol = (ProtocolType)MiscTools.StringToEnum(typeof(ProtocolType), xmlnode.Attributes["Protocol"].Value);
                     connectionInfo.Port = Convert.ToInt32(xmlnode.Attributes["Port"].Value);
                 }
 
@@ -315,34 +307,34 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                 if (_confVersion >= 1.3)
                 {
-                    connectionInfo.Colors = (RdpProtocol.RDPColors)Enum.Parse(typeof(RdpProtocol.RDPColors), xmlnode.Attributes["Colors"].Value, true);
-                    connectionInfo.Resolution = (RdpProtocol.RDPResolutions)Enum.Parse(typeof(RdpProtocol.RDPResolutions), xmlnode.Attributes["Resolution"].Value, true);
-                    connectionInfo.RedirectSound = (RdpProtocol.RDPSounds)Enum.Parse(typeof(RdpProtocol.RDPSounds), xmlnode.Attributes["RedirectSound"].Value, true);
+                    connectionInfo.Colors = (RdpColors)MiscTools.StringToEnum(typeof(RdpColors), xmlnode.Attributes["Colors"].Value);
+                    connectionInfo.Resolution = (RdpResolutions)MiscTools.StringToEnum(typeof(RdpResolutions), Convert.ToString(xmlnode.Attributes["Resolution"].Value));
+                    connectionInfo.RedirectSound = (RdpSounds)MiscTools.StringToEnum(typeof(RdpSounds), Convert.ToString(xmlnode.Attributes["RedirectSound"].Value));
                 }
                 else
                 {
                     switch (Convert.ToInt32(xmlnode.Attributes["Colors"].Value))
                     {
                         case 0:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors256;
+                            connectionInfo.Colors = RdpColors.Colors256;
                             break;
                         case 1:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors16Bit;
+                            connectionInfo.Colors = RdpColors.Colors16Bit;
                             break;
                         case 2:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors24Bit;
+                            connectionInfo.Colors = RdpColors.Colors24Bit;
                             break;
                         case 3:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors32Bit;
+                            connectionInfo.Colors = RdpColors.Colors32Bit;
                             break;
                         // ReSharper disable once RedundantCaseLabel
                         case 4:
                         default:
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors15Bit;
+                            connectionInfo.Colors = RdpColors.Colors15Bit;
                             break;
                     }
 
-                    connectionInfo.RedirectSound = (RdpProtocol.RDPSounds)Convert.ToInt32(xmlnode.Attributes["RedirectSound"].Value);
+                    connectionInfo.RedirectSound = (RdpSounds)Convert.ToInt32(xmlnode.Attributes["RedirectSound"].Value);
                 }
 
                 if (_confVersion >= 1.3)
@@ -393,7 +385,7 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                 if (_confVersion >= 1.6)
                 {
-                    connectionInfo.ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Enum.Parse(typeof(IcaProtocol.EncryptionStrength), xmlnode.Attributes["ICAEncryptionStrength"].Value, true);
+                    connectionInfo.ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)MiscTools.StringToEnum(typeof(IcaProtocol.EncryptionStrength), xmlnode.Attributes["ICAEncryptionStrength"].Value);
                     connectionInfo.Inheritance.ICAEncryptionStrength = bool.Parse(xmlnode.Attributes["InheritICAEncryptionStrength"].Value);
                     connectionInfo.PreExtApp = xmlnode.Attributes["PreExtApp"].Value;
                     connectionInfo.PostExtApp = xmlnode.Attributes["PostExtApp"].Value;
@@ -403,16 +395,16 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                 if (_confVersion >= 1.7)
                 {
-                    connectionInfo.VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression), xmlnode.Attributes["VNCCompression"].Value, true);
-                    connectionInfo.VNCEncoding = (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), xmlnode.Attributes["VNCEncoding"].Value, true);
-                    connectionInfo.VNCAuthMode = (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), xmlnode.Attributes["VNCAuthMode"].Value, true);
-                    connectionInfo.VNCProxyType = (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType), xmlnode.Attributes["VNCProxyType"].Value, true);
+                    connectionInfo.VNCCompression = (ProtocolVNC.Compression)MiscTools.StringToEnum(typeof(ProtocolVNC.Compression), xmlnode.Attributes["VNCCompression"].Value);
+                    connectionInfo.VNCEncoding = (ProtocolVNC.Encoding)MiscTools.StringToEnum(typeof(ProtocolVNC.Encoding), Convert.ToString(xmlnode.Attributes["VNCEncoding"].Value));
+                    connectionInfo.VNCAuthMode = (ProtocolVNC.AuthMode)MiscTools.StringToEnum(typeof(ProtocolVNC.AuthMode), xmlnode.Attributes["VNCAuthMode"].Value);
+                    connectionInfo.VNCProxyType = (ProtocolVNC.ProxyType)MiscTools.StringToEnum(typeof(ProtocolVNC.ProxyType), xmlnode.Attributes["VNCProxyType"].Value);
                     connectionInfo.VNCProxyIP = xmlnode.Attributes["VNCProxyIP"].Value;
                     connectionInfo.VNCProxyPort = Convert.ToInt32(xmlnode.Attributes["VNCProxyPort"].Value);
                     connectionInfo.VNCProxyUsername = xmlnode.Attributes["VNCProxyUsername"].Value;
                     connectionInfo.VNCProxyPassword = _decryptor.Decrypt(xmlnode.Attributes["VNCProxyPassword"].Value);
-                    connectionInfo.VNCColors = (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), xmlnode.Attributes["VNCColors"].Value, true);
-                    connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), xmlnode.Attributes["VNCSmartSizeMode"].Value, true);
+                    connectionInfo.VNCColors = (ProtocolVNC.Colors)MiscTools.StringToEnum(typeof(ProtocolVNC.Colors), xmlnode.Attributes["VNCColors"].Value);
+                    connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)MiscTools.StringToEnum(typeof(ProtocolVNC.SmartSizeMode), xmlnode.Attributes["VNCSmartSizeMode"].Value);
                     connectionInfo.VNCViewOnly = bool.Parse(xmlnode.Attributes["VNCViewOnly"].Value);
                     connectionInfo.Inheritance.VNCCompression = bool.Parse(xmlnode.Attributes["InheritVNCCompression"].Value);
                     connectionInfo.Inheritance.VNCEncoding = bool.Parse(xmlnode.Attributes["InheritVNCEncoding"].Value);
@@ -429,13 +421,13 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                 if (_confVersion >= 1.8)
                 {
-                    connectionInfo.RDPAuthenticationLevel = (RdpProtocol.AuthenticationLevel)Enum.Parse(typeof(RdpProtocol.AuthenticationLevel), xmlnode.Attributes["RDPAuthenticationLevel"].Value, true);
+                    connectionInfo.RDPAuthenticationLevel = (RdpAuthenticationLevel)MiscTools.StringToEnum(typeof(RdpAuthenticationLevel), xmlnode.Attributes["RDPAuthenticationLevel"].Value);
                     connectionInfo.Inheritance.RDPAuthenticationLevel = bool.Parse(xmlnode.Attributes["InheritRDPAuthenticationLevel"].Value);
                 }
 
                 if (_confVersion >= 1.9)
                 {
-                    connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), xmlnode.Attributes["RenderingEngine"].Value, true);
+                    connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)MiscTools.StringToEnum(typeof(HTTPBase.RenderingEngine), xmlnode.Attributes["RenderingEngine"].Value);
                     connectionInfo.MacAddress = xmlnode.Attributes["MacAddress"].Value;
                     connectionInfo.Inheritance.RenderingEngine = bool.Parse(xmlnode.Attributes["InheritRenderingEngine"].Value);
                     connectionInfo.Inheritance.MacAddress = bool.Parse(xmlnode.Attributes["InheritMacAddress"].Value);
@@ -456,9 +448,9 @@ namespace mRemoteNG.Config.Serializers.Xml
                 if (_confVersion >= 2.2)
                 {
                     // Get settings
-                    connectionInfo.RDGatewayUsageMethod = (RdpProtocol.RDGatewayUsageMethod)Enum.Parse(typeof(RdpProtocol.RDGatewayUsageMethod), xmlnode.Attributes["RDGatewayUsageMethod"].Value, true);
+                    connectionInfo.RDGatewayUsageMethod = (RDGatewayUsageMethod)MiscTools.StringToEnum(typeof(RDGatewayUsageMethod), Convert.ToString(xmlnode.Attributes["RDGatewayUsageMethod"].Value));
                     connectionInfo.RDGatewayHostname = xmlnode.Attributes["RDGatewayHostname"].Value;
-                    connectionInfo.RDGatewayUseConnectionCredentials = (RdpProtocol.RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RdpProtocol.RDGatewayUseConnectionCredentials), xmlnode.Attributes["RDGatewayUseConnectionCredentials"].Value, true);
+                    connectionInfo.RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials)MiscTools.StringToEnum(typeof(RDGatewayUseConnectionCredentials), Convert.ToString(xmlnode.Attributes["RDGatewayUseConnectionCredentials"].Value));
                     connectionInfo.RDGatewayUsername = xmlnode.Attributes["RDGatewayUsername"].Value;
                     connectionInfo.RDGatewayPassword = _decryptor.Decrypt(Convert.ToString(xmlnode.Attributes["RDGatewayPassword"].Value));
                     connectionInfo.RDGatewayDomain = xmlnode.Attributes["RDGatewayDomain"].Value;
@@ -499,7 +491,8 @@ namespace mRemoteNG.Config.Serializers.Xml
 
                 if (_confVersion >= 2.6)
                 {
-                    connectionInfo.SoundQuality = (RdpProtocol.RDPSoundQuality)Enum.Parse(typeof(RdpProtocol.RDPSoundQuality), xmlnode.Attributes["SoundQuality"].Value, true);
+                    connectionInfo.ConstantID = xmlnode.Attributes["Id"]?.Value ?? connectionInfo.ConstantID;
+                    connectionInfo.SoundQuality = (RdpSoundQuality)MiscTools.StringToEnum(typeof(RdpSoundQuality), Convert.ToString(xmlnode.Attributes["SoundQuality"].Value));
                     connectionInfo.Inheritance.SoundQuality = bool.Parse(xmlnode.Attributes["InheritSoundQuality"].Value);
                     connectionInfo.RDPMinutesToIdleTimeout = Convert.ToInt32(xmlnode.Attributes["RDPMinutesToIdleTimeout"]?.Value ?? "0");
                     connectionInfo.Inheritance.RDPMinutesToIdleTimeout = bool.Parse(xmlnode.Attributes["InheritRDPMinutesToIdleTimeout"]?.Value ?? "False");

mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompiler.cs

@@ -8,7 +8,8 @@ using mRemoteNG.Security;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Xml
+
+namespace mRemoteNG.Config.Serializers
 {
     public class XmlConnectionsDocumentCompiler
     {

mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptor.cs

@@ -2,7 +2,8 @@
 using System.Xml.Linq;
 using mRemoteNG.Security;
 
-namespace mRemoteNG.Config.Serializers.Xml
+
+namespace mRemoteNG.Config.Serializers
 {
     public class XmlConnectionsDocumentEncryptor
     {

mRemoteV1/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializer.cs

@@ -10,7 +10,7 @@ using mRemoteNG.Security;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Xml
+namespace mRemoteNG.Config.Serializers
 {
     public class XmlConnectionsSerializer : ISerializer<ConnectionTreeModel,string>, ISerializer<ConnectionInfo, string>
     {

mRemoteV1/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializer.cs

@@ -2,21 +2,19 @@
 using mRemoteNG.Security;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Xml
+
+namespace mRemoteNG.Config.Serializers
 {
-	public class XmlRootNodeSerializer
+    public class XmlRootNodeSerializer
     {
         public XElement SerializeRootNodeInfo(RootNodeInfo rootNodeInfo, ICryptographyProvider cryptographyProvider, bool fullFileEncryption = false)
         {
-            XNamespace xmlNamespace = "http://mremoteng.org";
-            var element = new XElement(xmlNamespace + "Connections");
-            element.Add(new XAttribute(XNamespace.Xmlns+"mrng", xmlNamespace));
+            var element = new XElement("Connections");
             element.Add(new XAttribute(XName.Get("Name"), rootNodeInfo.Name));
-			element.Add(new XAttribute(XName.Get("Export"), "false"));
-			element.Add(new XAttribute(XName.Get("EncryptionEngine"), cryptographyProvider.CipherEngine));
+            element.Add(new XAttribute(XName.Get("EncryptionEngine"), cryptographyProvider.CipherEngine));
             element.Add(new XAttribute(XName.Get("BlockCipherMode"), cryptographyProvider.CipherMode));
             element.Add(new XAttribute(XName.Get("KdfIterations"), cryptographyProvider.KeyDerivationIterations));
-            element.Add(new XAttribute(XName.Get("FullFileEncryption"), fullFileEncryption.ToString().ToLowerInvariant()));
+            element.Add(new XAttribute(XName.Get("FullFileEncryption"), fullFileEncryption.ToString()));
             element.Add(CreateProtectedAttribute(rootNodeInfo, cryptographyProvider));
             element.Add(new XAttribute(XName.Get("ConfVersion"), "2.6"));
             return element;

mRemoteV1/Config/Serializers/DataTableDeserializer.cs

@@ -46,16 +46,14 @@ namespace mRemoteNG.Config.Serializers
 
         private ConnectionInfo DeserializeConnectionInfo(DataRow row)
         {
-	        var connectionId = row["ConstantID"] as string ?? Guid.NewGuid().ToString();
-			var connectionInfo = new ConnectionInfo(connectionId);
+            var connectionInfo = new ConnectionInfo();
             PopulateConnectionInfoFromDatarow(row, connectionInfo);
             return connectionInfo;
         }
 
         private ContainerInfo DeserializeContainerInfo(DataRow row)
         {
-	        var containerId = row["ConstantID"] as string ?? Guid.NewGuid().ToString();
-            var containerInfo = new ContainerInfo(containerId);
+            var containerInfo = new ContainerInfo();
             PopulateConnectionInfoFromDatarow(row, containerInfo);
             return containerInfo;
         }
@@ -63,6 +61,7 @@ namespace mRemoteNG.Config.Serializers
         private void PopulateConnectionInfoFromDatarow(DataRow dataRow, ConnectionInfo connectionInfo)
         {
             connectionInfo.Name = (string)dataRow["Name"];
+            connectionInfo.ConstantID = (string)dataRow["ConstantID"];
 
             // This throws a NPE - Parent is a connectionInfo object which will be null at this point.
             // The Parent object is linked properly later in CreateNodeHierarchy()
@@ -86,12 +85,12 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.UseCredSsp = (bool)dataRow["UseCredSsp"];
             connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), (string)dataRow["RenderingEngine"]);
             connectionInfo.ICAEncryptionStrength = (IcaProtocol.EncryptionStrength)Enum.Parse(typeof(IcaProtocol.EncryptionStrength), (string)dataRow["ICAEncryptionStrength"]);
-            connectionInfo.RDPAuthenticationLevel = (RdpProtocol.AuthenticationLevel)Enum.Parse(typeof(RdpProtocol.AuthenticationLevel), (string)dataRow["RDPAuthenticationLevel"]);
+            connectionInfo.RDPAuthenticationLevel = (RdpAuthenticationLevel)Enum.Parse(typeof(RdpAuthenticationLevel), (string)dataRow["RDPAuthenticationLevel"]);
             connectionInfo.RDPMinutesToIdleTimeout = (int)dataRow["RDPMinutesToIdleTimeout"];
             connectionInfo.RDPAlertIdleTimeout = (bool)dataRow["RDPAlertIdleTimeout"];
             connectionInfo.LoadBalanceInfo = (string)dataRow["LoadBalanceInfo"];
-            connectionInfo.Colors = (RdpProtocol.RDPColors)Enum.Parse(typeof(RdpProtocol.RDPColors) ,(string)dataRow["Colors"]);
-            connectionInfo.Resolution = (RdpProtocol.RDPResolutions)Enum.Parse(typeof(RdpProtocol.RDPResolutions), (string)dataRow["Resolution"]);
+            connectionInfo.Colors = (RdpColors)Enum.Parse(typeof(RdpColors) ,(string)dataRow["Colors"]);
+            connectionInfo.Resolution = (RdpResolutions)Enum.Parse(typeof(RdpResolutions), (string)dataRow["Resolution"]);
             connectionInfo.AutomaticResize = (bool)dataRow["AutomaticResize"];
             connectionInfo.DisplayWallpaper = (bool)dataRow["DisplayWallpaper"];
             connectionInfo.DisplayThemes = (bool)dataRow["DisplayThemes"];
@@ -102,8 +101,8 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.RedirectPorts = (bool)dataRow["RedirectPorts"];
             connectionInfo.RedirectPrinters = (bool)dataRow["RedirectPrinters"];
             connectionInfo.RedirectSmartCards = (bool)dataRow["RedirectSmartCards"];
-            connectionInfo.RedirectSound = (RdpProtocol.RDPSounds)Enum.Parse(typeof(RdpProtocol.RDPSounds), (string)dataRow["RedirectSound"]);
-            connectionInfo.SoundQuality = (RdpProtocol.RDPSoundQuality)Enum.Parse(typeof(RdpProtocol.RDPSoundQuality), (string)dataRow["SoundQuality"]);
+            connectionInfo.RedirectSound = (RdpSounds)Enum.Parse(typeof(RdpSounds), (string)dataRow["RedirectSound"]);
+            connectionInfo.SoundQuality = (RdpSoundQuality)Enum.Parse(typeof(RdpSoundQuality), (string)dataRow["SoundQuality"]);
             connectionInfo.RedirectKeys = (bool)dataRow["RedirectKeys"];
             connectionInfo.PleaseConnect = (bool)dataRow["Connected"];
             connectionInfo.PreExtApp = (string)dataRow["PreExtApp"];
@@ -122,9 +121,9 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.VNCColors = (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), (string)dataRow["VNCColors"]);
             connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), (string)dataRow["VNCSmartSizeMode"]);
             connectionInfo.VNCViewOnly = (bool)dataRow["VNCViewOnly"];
-            connectionInfo.RDGatewayUsageMethod = (RdpProtocol.RDGatewayUsageMethod)Enum.Parse(typeof(RdpProtocol.RDGatewayUsageMethod), (string)dataRow["RDGatewayUsageMethod"]);
+            connectionInfo.RDGatewayUsageMethod = (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod), (string)dataRow["RDGatewayUsageMethod"]);
             connectionInfo.RDGatewayHostname = (string)dataRow["RDGatewayHostname"];
-            connectionInfo.RDGatewayUseConnectionCredentials = (RdpProtocol.RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RdpProtocol.RDGatewayUseConnectionCredentials), (string)dataRow["RDGatewayUseConnectionCredentials"]);
+            connectionInfo.RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RDGatewayUseConnectionCredentials), (string)dataRow["RDGatewayUseConnectionCredentials"]);
             connectionInfo.RDGatewayUsername = (string)dataRow["RDGatewayUsername"];
             connectionInfo.RDGatewayPassword = (string)dataRow["RDGatewayPassword"];
             connectionInfo.RDGatewayDomain = (string)dataRow["RDGatewayDomain"];
@@ -188,7 +187,7 @@ namespace mRemoteNG.Config.Serializers
         private ConnectionTreeModel CreateNodeHierarchy(List<ConnectionInfo> connectionList, DataTable dataTable)
         {
             var connectionTreeModel = new ConnectionTreeModel();
-            var rootNode = new RootNodeInfo(RootNodeType.Connection, "0");
+            var rootNode = new RootNodeInfo(RootNodeType.Connection) {ConstantID = "0"};
             connectionTreeModel.AddRootNode(rootNode);
 
             foreach (DataRow row in dataTable.Rows)

mRemoteV1/Config/Serializers/MiscSerializers/CsvConnectionsDeserializerMremotengFormat.cs

@@ -11,16 +11,16 @@ using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
-namespace mRemoteNG.Config.Serializers.Csv
+namespace mRemoteNG.Config.Serializers.MiscSerializers
 {
-    public class CsvConnectionsDeserializerMremotengFormat : IDeserializer<string, ConnectionTreeModel>
+	public class CsvConnectionsDeserializerMremotengFormat : IDeserializer<string, ConnectionTreeModel>
     {
         public ConnectionTreeModel Deserialize(string serializedData)
         {
+            var root = new RootNodeInfo(RootNodeType.Connection);
+
             var lines = serializedData.Split(new []{"\r\n", "\r", "\n"}, StringSplitOptions.RemoveEmptyEntries);
             var csvHeaders = new List<string>();
-            // used to map a connectioninfo to it's parent's GUID
-            var parentMapping = new Dictionary<ConnectionInfo, string>();
 
             for (var lineNumber = 0; lineNumber < lines.Length; lineNumber++)
             {
@@ -30,61 +30,39 @@ namespace mRemoteNG.Config.Serializers.Csv
                 else
                 {
                     var connectionInfo = ParseConnectionInfo(csvHeaders, line);
-                    parentMapping.Add(connectionInfo, line[csvHeaders.IndexOf("Parent")]);
+                    var folder = ParseConnectionFolder(line[csvHeaders.IndexOf("Folder")], root);
+                    folder.AddChild(connectionInfo);
                 }
             }
 
-            var root = CreateTreeStructure(parentMapping);
             var connectionTreeModel = new ConnectionTreeModel();
             connectionTreeModel.AddRootNode(root);
             return connectionTreeModel;
         }
 
-        private RootNodeInfo CreateTreeStructure(Dictionary<ConnectionInfo, string> parentMapping)
+        private ContainerInfo ParseConnectionFolder(string folderString, ContainerInfo rootContainer)
         {
-            var root = new RootNodeInfo(RootNodeType.Connection);
+            var containerNames = folderString.Split('\\');
+            var parentContainer = rootContainer;
 
-            foreach (var node in parentMapping)
+            for (var i = containerNames.Length - 2; i >= 0; i--)
             {
-                // no parent mapped, add to root
-                if (string.IsNullOrEmpty(node.Value))
+                var containerName = containerNames[i];
+                var container = parentContainer.Children.OfType<ContainerInfo>().FirstOrDefault(info => info.Name == containerName);
+                if (container == null)
                 {
-                    root.AddChild(node.Key);
-                    continue;
-                }
-
-                // search for parent in the list by GUID
-                var parent = parentMapping
-                    .Keys
-                    .OfType<ContainerInfo>()
-                    .FirstOrDefault(info => info.ConstantID == node.Value);
-
-                if (parent != null)
-                {
-                    parent.AddChild(node.Key);
-                }
-                else
-                {
-                    root.AddChild(node.Key);
+                    container = new ContainerInfo {Name = containerName};
+                    parentContainer.AddChild(container);
                 }
+                parentContainer = container;
             }
 
-            return root;
+            return parentContainer;
         }
 
         private ConnectionInfo ParseConnectionInfo(IList<string> headers, string[] connectionCsv)
         {
-            var nodeType = headers.Contains("NodeType")
-                ? (TreeNodeType)Enum.Parse(typeof(TreeNodeType), connectionCsv[headers.IndexOf("NodeType")], true) 
-                : TreeNodeType.Connection;
-
-            var nodeId = headers.Contains("Id")
-                ? connectionCsv[headers.IndexOf("Id")]
-                : Guid.NewGuid().ToString();
-
-            var connectionRecord = nodeType == TreeNodeType.Connection
-                ? new ConnectionInfo(nodeId)
-                : new ContainerInfo(nodeId);
+            var connectionRecord = new ConnectionInfo();
 
             connectionRecord.Name = headers.Contains("Name") ? connectionCsv[headers.IndexOf("Name")] : "";
             connectionRecord.Description = headers.Contains("Description") ? connectionCsv[headers.IndexOf("Description")] : "";
@@ -153,21 +131,21 @@ namespace mRemoteNG.Config.Serializers.Csv
 
             if (headers.Contains("RDPAuthenticationLevel"))
             {
-                RdpProtocol.AuthenticationLevel value;
+                RdpAuthenticationLevel value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RDPAuthenticationLevel")], out value))
                     connectionRecord.RDPAuthenticationLevel = value;
             }
 
             if (headers.Contains("Colors"))
             {
-                RdpProtocol.RDPColors value;
+                RdpColors value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("Colors")], out value))
                     connectionRecord.Colors = value;
             }
 
             if (headers.Contains("Resolution"))
             {
-                RdpProtocol.RDPResolutions value;
+                RdpResolutions value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("Resolution")], out value))
                     connectionRecord.Resolution = value;
             }
@@ -244,7 +222,7 @@ namespace mRemoteNG.Config.Serializers.Csv
 
             if (headers.Contains("RedirectSound"))
             {
-                RdpProtocol.RDPSounds value;
+                RdpSounds value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RedirectSound")], out value))
                     connectionRecord.RedirectSound = value;
             }
@@ -314,14 +292,14 @@ namespace mRemoteNG.Config.Serializers.Csv
 
             if (headers.Contains("RDGatewayUsageMethod"))
             {
-                RdpProtocol.RDGatewayUsageMethod value;
+                RDGatewayUsageMethod value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUsageMethod")], out value))
                     connectionRecord.RDGatewayUsageMethod = value;
             }
 
             if (headers.Contains("RDGatewayUseConnectionCredentials"))
             {
-                RdpProtocol.RDGatewayUseConnectionCredentials value;
+                RDGatewayUseConnectionCredentials value;
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("RDGatewayUseConnectionCredentials")], out value))
                     connectionRecord.RDGatewayUseConnectionCredentials = value;
             }

mRemoteV1/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormat.cs

@@ -0,0 +1,238 @@
+using System;
+using System.Linq;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Credential;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+
+namespace mRemoteNG.Config.Serializers
+{
+	public class CsvConnectionsSerializerMremotengFormat : ISerializer<ConnectionInfo,string>
+    {
+        private string _csv = "";
+        private ConnectionInfo _serializationTarget;
+        private readonly SaveFilter _saveFilter;
+        private readonly ICredentialRepositoryList _credentialRepositoryList;
+
+
+        public CsvConnectionsSerializerMremotengFormat(SaveFilter saveFilter, ICredentialRepositoryList credentialRepositoryList)
+        {
+            if (saveFilter == null)
+                throw new ArgumentNullException(nameof(saveFilter));
+            if (credentialRepositoryList == null)
+                throw new ArgumentNullException(nameof(credentialRepositoryList));
+
+            _saveFilter = saveFilter;
+            _credentialRepositoryList = credentialRepositoryList;
+        }
+
+        public string Serialize(ConnectionTreeModel connectionTreeModel)
+        {
+            if (connectionTreeModel == null)
+                throw new ArgumentNullException(nameof(connectionTreeModel));
+
+            var rootNode = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
+            return Serialize(rootNode);
+        }
+
+        public string Serialize(ConnectionInfo serializationTarget)
+        {
+            if (serializationTarget == null)
+                throw new ArgumentNullException(nameof(serializationTarget));
+
+            _csv = "";
+            _serializationTarget = serializationTarget;
+            WriteCsvHeader();
+            SerializeNodesRecursive(serializationTarget);
+            return _csv;
+        }
+
+        private void WriteCsvHeader()
+        {
+            var csvHeader = string.Empty;
+            csvHeader += "Name;Folder;Description;Icon;Panel;";
+            if (_saveFilter.SaveUsername)
+                csvHeader += "Username;";
+            if (_saveFilter.SavePassword)
+                csvHeader += "Password;";
+            if (_saveFilter.SaveDomain)
+                csvHeader += "Domain;";
+            csvHeader += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;";
+            if (_saveFilter.SaveInheritance)
+                csvHeader += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;InheritUseConsoleSession;InheritUseCredSsp;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain;InheritRDPAlertIdleTimeout;InheritRDPMinutesToIdleTimeout;InheritSoundQuality";
+            _csv += csvHeader;
+        }
+
+        private void SerializeNodesRecursive(ConnectionInfo node)
+        {
+            var nodeAsContainer = node as ContainerInfo;
+            if (nodeAsContainer != null)
+            {
+                foreach (var child in nodeAsContainer.Children)
+                {
+                    var info = child as ContainerInfo;
+                    if (info != null)
+                        SerializeNodesRecursive(info);
+                    else
+                        SerializeConnectionInfo(child);
+                }
+            }
+            else
+                SerializeConnectionInfo(node);
+        }
+
+        private void SerializeConnectionInfo(ConnectionInfo con)
+        {
+            var csvLine = Environment.NewLine;
+
+            csvLine += CleanStringForCsv(con.Name) + ";" +
+                        CleanStringForCsv(GetNodePath(con)) + ";" +
+                        CleanStringForCsv(con.Description) + ";" +
+                        CleanStringForCsv(con.Icon) + ";" +
+                        CleanStringForCsv(con.Panel) + ";";
+
+            if (_saveFilter.SaveUsername)
+                csvLine += CleanStringForCsv(con.Username) + ";";
+
+            if (_saveFilter.SavePassword)
+                csvLine += CleanStringForCsv(con.Password) + ";";
+
+            if (_saveFilter.SaveDomain)
+                csvLine += CleanStringForCsv(con.Domain) + ";";
+
+            csvLine += 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) + ";";
+
+
+            if (_saveFilter.SaveInheritance)
+            {
+                csvLine += 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;
+            }
+
+            _csv += csvLine;
+        }
+
+        /// <summary>
+        /// Remove text that is unsafe for use in CSV files
+        /// </summary>
+        /// <param name="text"></param>
+        private string CleanStringForCsv(object text)
+        {
+            return text.ToString().Replace(";", "");
+        }
+
+        private string GetNodePath(ConnectionInfo connectionInfo)
+        {
+            var nodePath = "";
+            var currentItem = connectionInfo;
+            while (currentItem != _serializationTarget)
+            {
+                currentItem = currentItem.Parent;
+                if (currentItem == null)
+                    break;
+                nodePath += $@"{currentItem.Name}\";
+            }
+            nodePath = nodePath.TrimEnd('\\');
+            return nodePath;
+        }
+    }
+}

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs

@@ -6,7 +6,7 @@ using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Serializers
 {
-    public class RemoteDesktopConnectionDeserializer : IDeserializer<string, ConnectionTreeModel>
+	public class RemoteDesktopConnectionDeserializer : IDeserializer<string, ConnectionTreeModel>
     {
         // .rdp file schema: https://technet.microsoft.com/en-us/library/ff393699(v=ws.10).aspx
 
@@ -59,19 +59,19 @@ namespace mRemoteNG.Config.Serializers
                     switch (value)
                     {
                         case "8":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors256;
+                            connectionInfo.Colors = RdpColors.Colors256;
                             break;
                         case "15":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors15Bit;
+                            connectionInfo.Colors = RdpColors.Colors15Bit;
                             break;
                         case "16":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors16Bit;
+                            connectionInfo.Colors = RdpColors.Colors16Bit;
                             break;
                         case "24":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors24Bit;
+                            connectionInfo.Colors = RdpColors.Colors24Bit;
                             break;
                         case "32":
-                            connectionInfo.Colors = RdpProtocol.RDPColors.Colors32Bit;
+                            connectionInfo.Colors = RdpColors.Colors32Bit;
                             break;
                     }
                     break;
@@ -79,7 +79,7 @@ namespace mRemoteNG.Config.Serializers
                     connectionInfo.CacheBitmaps = value == "1";
                     break;
                 case "screen mode id":
-                    connectionInfo.Resolution = value == "2" ? RdpProtocol.RDPResolutions.Fullscreen : RdpProtocol.RDPResolutions.FitToWindow;
+                    connectionInfo.Resolution = value == "2" ? RdpResolutions.Fullscreen : RdpResolutions.FitToWindow;
                     break;
                 case "connect to console":
                     connectionInfo.UseConsoleSession = value == "1";
@@ -112,13 +112,13 @@ namespace mRemoteNG.Config.Serializers
                     switch (value)
                     {
                         case "0":
-                            connectionInfo.RedirectSound = RdpProtocol.RDPSounds.BringToThisComputer;
+                            connectionInfo.RedirectSound = RdpSounds.BringToThisComputer;
                             break;
                         case "1":
-                            connectionInfo.RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer;
+                            connectionInfo.RedirectSound = RdpSounds.LeaveAtRemoteComputer;
                             break;
                         case "2":
-                            connectionInfo.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
+                            connectionInfo.RedirectSound = RdpSounds.DoNotPlay;
                             break;
                     }
                     break;

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs

@@ -13,7 +13,7 @@ using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Serializers
 {
-    public class RemoteDesktopConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel>
+	public class RemoteDesktopConnectionManagerDeserializer : IDeserializer<string, ConnectionTreeModel>
     {
         private static int _schemaVersion; /* 1 = RDCMan v2.2
                                        3 = RDCMan v2.7  */
@@ -60,7 +60,7 @@ namespace mRemoteNG.Config.Serializers
             }
             else
             {
-                var versionNode = rdcManNode?.SelectSingleNode("./version")?.InnerText;
+                var versionNode = rdcManNode.SelectSingleNode("./version")?.InnerText;
                 if (versionNode != null)
                 {
                     var version = new Version(versionNode);
@@ -101,16 +101,15 @@ namespace mRemoteNG.Config.Serializers
         {
             if (_schemaVersion == 1)
             {
-                // Program Version 2.2 wraps all setting inside the Properties tags 
+                // Program Verison 2.2 wraps all setting inside the Properties tags 
                 containerPropertiesNode = containerPropertiesNode.SelectSingleNode("./properties");
             }
             var newContainer = new ContainerInfo();
             var connectionInfo = ConnectionInfoFromXml(containerPropertiesNode);
             newContainer.CopyFrom(connectionInfo);
-
             if (_schemaVersion == 3)
             {
-                // Program Version 2.7 wraps these properties
+                // Program Verison 2.7 wraps these properties
                 containerPropertiesNode = containerPropertiesNode.SelectSingleNode("./properties");
             }
             newContainer.Name = containerPropertiesNode?.SelectSingleNode("./name")?.InnerText ?? Language.strNewFolder;
@@ -131,22 +130,20 @@ namespace mRemoteNG.Config.Serializers
 
 
             var propertiesNode = xmlNode.SelectSingleNode("./properties");
-            if (_schemaVersion == 1) propertiesNode = xmlNode;  // Version 2.2 defines the container name at the root instead
-            connectionInfo.Hostname = propertiesNode?.SelectSingleNode("./name")?.InnerText ?? "";
-            connectionInfo.Name = propertiesNode?.SelectSingleNode("./displayName")?.InnerText ?? connectionInfo.Hostname;
-            connectionInfo.Description = propertiesNode?.SelectSingleNode("./comment")?.InnerText ?? string.Empty;
+            if (_schemaVersion == 1) propertiesNode = xmlNode;  // Version 2.2 defines the container name at the root instead         
+            connectionInfo.Hostname = propertiesNode.SelectSingleNode("./name")?.InnerText;
+            connectionInfo.Name = propertiesNode.SelectSingleNode("./displayName")?.InnerText ?? connectionInfo.Hostname;
+            connectionInfo.Description = propertiesNode.SelectSingleNode("./comment")?.InnerText ?? String.Empty;
 
             var logonCredentialsNode = xmlNode.SelectSingleNode("./logonCredentials");
-            if (logonCredentialsNode?.Attributes?["inherit"]?.Value == "None")
+            if (logonCredentialsNode?.Attributes?["inherit"].Value == "None")
             {
                 connectionInfo.Username = logonCredentialsNode.SelectSingleNode("userName")?.InnerText;
 
                 var passwordNode = logonCredentialsNode.SelectSingleNode("./password");
                 if (_schemaVersion == 1) // Version 2.2 allows clear text passwords
                 {
-                    connectionInfo.Password = passwordNode?.Attributes?["storeAsClearText"]?.Value == "True" 
-                        ? passwordNode.InnerText 
-                        : DecryptRdcManPassword(passwordNode?.InnerText);
+                    connectionInfo.Password = passwordNode?.Attributes?["storeAsClearText"].Value == "True" ? passwordNode.InnerText : DecryptRdcManPassword(passwordNode?.InnerText);
                 }
                 else
                 {
@@ -163,7 +160,7 @@ namespace mRemoteNG.Config.Serializers
             }
 
             var connectionSettingsNode = xmlNode.SelectSingleNode("./connectionSettings");
-            if (connectionSettingsNode?.Attributes?["inherit"]?.Value == "None")
+            if (connectionSettingsNode?.Attributes?["inherit"].Value == "None")
             {
                 connectionInfo.UseConsoleSession = bool.Parse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText ?? "false");
                 // ./startProgram
@@ -177,9 +174,9 @@ namespace mRemoteNG.Config.Serializers
             }
 
             var gatewaySettingsNode = xmlNode.SelectSingleNode("./gatewaySettings");
-            if (gatewaySettingsNode?.Attributes?["inherit"]?.Value == "None")
+            if (gatewaySettingsNode?.Attributes?["inherit"].Value == "None")
             {
-                connectionInfo.RDGatewayUsageMethod = gatewaySettingsNode.SelectSingleNode("./enabled")?.InnerText == "True" ? RdpProtocol.RDGatewayUsageMethod.Always : RdpProtocol.RDGatewayUsageMethod.Never;
+                connectionInfo.RDGatewayUsageMethod = gatewaySettingsNode.SelectSingleNode("./enabled")?.InnerText == "True" ? RDGatewayUsageMethod.Always : RDGatewayUsageMethod.Never;
                 connectionInfo.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName")?.InnerText;
                 connectionInfo.RDGatewayUsername = gatewaySettingsNode.SelectSingleNode("./userName")?.InnerText;
 
@@ -201,31 +198,31 @@ namespace mRemoteNG.Config.Serializers
             }
 
             var remoteDesktopNode = xmlNode.SelectSingleNode("./remoteDesktop");
-            if (remoteDesktopNode?.Attributes?["inherit"]?.Value == "None")
+            if (remoteDesktopNode?.Attributes?["inherit"].Value == "None")
             {
                 var resolutionString = remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", "");
                 try
                 {
-                    connectionInfo.Resolution = (RdpProtocol.RDPResolutions)Enum.Parse(typeof(RdpProtocol.RDPResolutions), "Res" + resolutionString);
+                    connectionInfo.Resolution = (RdpResolutions)Enum.Parse(typeof(RdpResolutions), "Res" + resolutionString);
                 }
                 catch (ArgumentException)
                 {
-                    connectionInfo.Resolution = RdpProtocol.RDPResolutions.FitToWindow;
+                    connectionInfo.Resolution = RdpResolutions.FitToWindow;
                 }
 
                 if (remoteDesktopNode.SelectSingleNode("./sameSizeAsClientArea")?.InnerText == "True")
                 {
-                    connectionInfo.Resolution = RdpProtocol.RDPResolutions.FitToWindow;
+                    connectionInfo.Resolution = RdpResolutions.FitToWindow;
                 }
 
                 if (remoteDesktopNode.SelectSingleNode("./fullScreen")?.InnerText == "True")
                 {
-                    connectionInfo.Resolution = RdpProtocol.RDPResolutions.Fullscreen;
+                    connectionInfo.Resolution = RdpResolutions.Fullscreen;
                 }
 
                 var colorDepth = remoteDesktopNode.SelectSingleNode("./colorDepth")?.InnerText;
                 if (colorDepth != null)
-                    connectionInfo.Colors = (RdpProtocol.RDPColors)Enum.Parse(typeof(RdpProtocol.RDPColors), colorDepth);
+                    connectionInfo.Colors = (RdpColors)Enum.Parse(typeof(RdpColors), colorDepth);
             }
             else
             {
@@ -234,22 +231,22 @@ namespace mRemoteNG.Config.Serializers
             }
 
             var localResourcesNode = xmlNode.SelectSingleNode("./localResources");
-            if (localResourcesNode?.Attributes?["inherit"]?.Value == "None")
+            if (localResourcesNode?.Attributes?["inherit"].Value == "None")
             {
                 // ReSharper disable once SwitchStatementMissingSomeCases
                 switch (localResourcesNode.SelectSingleNode("./audioRedirection")?.InnerText)
                 {
                     case "0": // Bring to this computer
                     case "Client":
-                        connectionInfo.RedirectSound = RdpProtocol.RDPSounds.BringToThisComputer;
+                        connectionInfo.RedirectSound = RdpSounds.BringToThisComputer;
                         break;
                     case "1": // Leave at remote computer
                     case "Remote":
-                        connectionInfo.RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer;
+                        connectionInfo.RedirectSound = RdpSounds.LeaveAtRemoteComputer;
                         break;
                     case "2": // Do not play
                     case "NoSound":
-                        connectionInfo.RedirectSound = RdpProtocol.RDPSounds.DoNotPlay;
+                        connectionInfo.RedirectSound = RdpSounds.DoNotPlay;
                         break;
                 }
 
@@ -274,10 +271,10 @@ namespace mRemoteNG.Config.Serializers
                 }
 
                 // ./redirectClipboard
-                connectionInfo.RedirectDiskDrives = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectDrives")?.InnerText ?? "false");
-                connectionInfo.RedirectPorts = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectPorts")?.InnerText ?? "false");
-                connectionInfo.RedirectPrinters = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectPrinters")?.InnerText ?? "false");
-                connectionInfo.RedirectSmartCards = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectSmartCards")?.InnerText ?? "false");
+                connectionInfo.RedirectDiskDrives = bool.Parse(localResourcesNode.SelectSingleNode("./redirectDrives")?.InnerText ?? "false");
+                connectionInfo.RedirectPorts = bool.Parse(localResourcesNode.SelectSingleNode("./redirectPorts")?.InnerText ?? "false");
+                connectionInfo.RedirectPrinters = bool.Parse(localResourcesNode.SelectSingleNode("./redirectPrinters")?.InnerText ?? "false");
+                connectionInfo.RedirectSmartCards = bool.Parse(localResourcesNode.SelectSingleNode("./redirectSmartCards")?.InnerText ?? "false");
             }
             else
             {
@@ -290,22 +287,22 @@ namespace mRemoteNG.Config.Serializers
             }
 
             var securitySettingsNode = xmlNode.SelectSingleNode("./securitySettings");
-            if (securitySettingsNode?.Attributes?["inherit"]?.Value == "None")
+            if (securitySettingsNode?.Attributes?["inherit"].Value == "None")
             {
                 // ReSharper disable once SwitchStatementMissingSomeCases
                 switch (securitySettingsNode.SelectSingleNode("./authentication")?.InnerText)
                 {
                     case "0": // No authentication
                     case "None":
-                        connectionInfo.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.NoAuth;
+                        connectionInfo.RDPAuthenticationLevel = RdpAuthenticationLevel.NoAuth;
                         break;
                     case "1": // Do not connect if authentication fails
                     case "Required":
-                        connectionInfo.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.AuthRequired;
+                        connectionInfo.RDPAuthenticationLevel = RdpAuthenticationLevel.AuthRequired;
                         break;
                     case "2": // Warn if authentication fails
                     case "Warn":
-                        connectionInfo.RDPAuthenticationLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth;
+                        connectionInfo.RDPAuthenticationLevel = RdpAuthenticationLevel.WarnOnFailedAuth;
                         break;
                 }
             }
@@ -324,7 +321,7 @@ namespace mRemoteNG.Config.Serializers
         private static string DecryptRdcManPassword(string ciphertext)
         {
             if (string.IsNullOrEmpty(ciphertext))
-                return string.Empty;
+                return null;
 
             try
             {
@@ -335,7 +332,7 @@ namespace mRemoteNG.Config.Serializers
             catch (Exception /*ex*/)
             {
                 //Runtime.MessageCollector.AddExceptionMessage("RemoteDesktopConnectionManager.DecryptPassword() failed.", ex, logOnly: true);
-                return string.Empty;
+                return null;
             }
         }
     }

mRemoteV1/Config/Serializers/XmlConnectionsDecryptor.cs

@@ -4,7 +4,6 @@ using mRemoteNG.Security;
 using mRemoteNG.Security.Authentication;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Security.SymmetricEncryption;
-using mRemoteNG.Tools;
 using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Serializers
@@ -14,7 +13,7 @@ namespace mRemoteNG.Config.Serializers
         private readonly ICryptographyProvider _cryptographyProvider;
         private readonly RootNodeInfo _rootNodeInfo;
 
-        public Func<Optional<SecureString>> AuthenticationRequestor { get; set; }
+        public Func<SecureString> AuthenticationRequestor { get; set; }
 
         public int KeyDerivationIterations
         {
@@ -92,14 +91,16 @@ namespace mRemoteNG.Config.Serializers
 
         private bool Authenticate(string cipherText, SecureString password)
         {
-            var authenticator = new PasswordAuthenticator(_cryptographyProvider, cipherText, AuthenticationRequestor);
+            var authenticator = new PasswordAuthenticator(_cryptographyProvider, cipherText)
+            {
+                AuthenticationRequestor = AuthenticationRequestor
+            };
+
             var authenticated = authenticator.Authenticate(password);
 
-            if (!authenticated)
-                return false;
-
+            if (!authenticated) return authenticated;
             _rootNodeInfo.PasswordString = authenticator.LastAuthenticatedPassword.ConvertToUnsecureString();
-            return true;
+            return authenticated;
         }
     }
 }

mRemoteV1/Config/Settings/Providers/ChooseProvider.cs

@@ -1,6 +1,4 @@
-#if !PORTABLE
-using System.Configuration;
-#endif
+using System.Configuration;
 
 namespace mRemoteNG.Config.Settings.Providers
 {

mRemoteV1/Config/Settings/Providers/PortableSettingsProvider.cs

@@ -1,37 +1,37 @@
-// The MIT License (MIT)
-//
-// Copyright(c) crdx
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-// 
-// https://raw.githubusercontent.com/crdx/PortableSettingsProvider
-//
-
+/// The MIT License (MIT)
+///
+/// Copyright(c) crdx
+/// 
+/// Permission is hereby granted, free of charge, to any person obtaining
+/// a copy of this software and associated documentation files (the
+/// "Software"), to deal in the Software without restriction, including
+/// without limitation the rights to use, copy, modify, merge, publish,
+/// distribute, sublicense, and/or sell copies of the Software, and to
+/// permit persons to whom the Software is furnished to do so, subject to
+/// the following conditions:
+/// 
+/// The above copyright notice and this permission notice shall be
+/// included in all copies or substantial portions of the Software.
+/// 
+/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+/// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+/// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+/// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+/// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+/// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+/// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+/// 
+/// https://raw.githubusercontent.com/crdx/PortableSettingsProvider
+///
+using System.Linq;
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Windows.Forms;
 using System.Collections.Specialized;
 using System.Xml;
 using System.IO;
-//using mRemoteNG.App;
 
 namespace mRemoteNG.Config.Settings.Providers
 {
@@ -43,34 +43,63 @@ namespace mRemoteNG.Config.Settings.Providers
         private const string _className = "PortableSettingsProvider";
         private XmlDocument _xmlDocument;
 
-        private string _filePath => Path.Combine(Path.GetDirectoryName(Application.ExecutablePath) ?? throw new InvalidOperationException(), $"{ApplicationName}.settings");
+        private string _filePath
+        {
+            get
+            {
+                return Path.Combine(Path.GetDirectoryName(Application.ExecutablePath),
+                   string.Format("{0}.settings", ApplicationName));
+            }
+        }
 
-        private XmlNode _localSettingsNode => GetSettingsNode(_localSettingsNodeName);
+        private XmlNode _localSettingsNode
+        {
+            get
+            {
+                XmlNode settingsNode = GetSettingsNode(_localSettingsNodeName);
+                XmlNode machineNode = settingsNode.SelectSingleNode(Environment.MachineName.ToLowerInvariant());
 
-        private XmlNode _globalSettingsNode => GetSettingsNode(_globalSettingsNodeName);
+                if (machineNode == null)
+                {
+                    machineNode = _rootDocument.CreateElement(Environment.MachineName.ToLowerInvariant());
+                    settingsNode.AppendChild(machineNode);
+                }
 
-        private XmlNode _rootNode => _rootDocument.SelectSingleNode(_rootNodeName);
+                return machineNode;
+            }
+        }
+
+        private XmlNode _globalSettingsNode
+        {
+            get { return GetSettingsNode(_globalSettingsNodeName); }
+        }
+
+        private XmlNode _rootNode
+        {
+            get { return _rootDocument.SelectSingleNode(_rootNodeName); }
+        }
 
         private XmlDocument _rootDocument
         {
             get
             {
-                if (_xmlDocument != null) return _xmlDocument;
-                try
+                if (_xmlDocument == null)
                 {
-                    _xmlDocument = new XmlDocument();
-                    _xmlDocument.Load(_filePath);
-                }
-                catch (Exception /*ex*/)
-                {
-                    // This casues hundreds of unit tests to fail for some reason...
-                    //Runtime.MessageCollector.AddExceptionStackTrace("PortableSettingsProvider: Error getting XML", ex);
-                }
+                    try
+                    {
+                        _xmlDocument = new XmlDocument();
+                        _xmlDocument.Load(_filePath);
+                    }
+                    catch (Exception)
+                    {
 
-                if (_xmlDocument?.SelectSingleNode(_rootNodeName) != null)
-                    return _xmlDocument;
+                    }
 
-                _xmlDocument = GetBlankXmlDocument();
+                    if (_xmlDocument.SelectSingleNode(_rootNodeName) != null)
+                        return _xmlDocument;
+
+                    _xmlDocument = GetBlankXmlDocument();
+                }
 
                 return _xmlDocument;
             }
@@ -78,11 +107,14 @@ namespace mRemoteNG.Config.Settings.Providers
 
         public override string ApplicationName
         {
-            get => Path.GetFileNameWithoutExtension(Application.ExecutablePath);
+            get { return Path.GetFileNameWithoutExtension(Application.ExecutablePath); }
             set { }
         }
 
-        public override string Name => _className;
+        public override string Name
+        {
+            get { return _className; }
+        }
 
         public override void Initialize(string name, NameValueCollection config)
         {
@@ -111,7 +143,7 @@ namespace mRemoteNG.Config.Settings.Providers
 
         public override SettingsPropertyValueCollection GetPropertyValues(SettingsContext context, SettingsPropertyCollection collection)
         {
-            var values = new SettingsPropertyValueCollection();
+            SettingsPropertyValueCollection values = new SettingsPropertyValueCollection();
 
             foreach (SettingsProperty property in collection)
             {
@@ -126,9 +158,11 @@ namespace mRemoteNG.Config.Settings.Providers
 
         private void SetValue(SettingsPropertyValue propertyValue)
         {
-            var targetNode = IsGlobal(propertyValue.Property) ? _globalSettingsNode : _localSettingsNode;
+            XmlNode targetNode = IsGlobal(propertyValue.Property)
+               ? _globalSettingsNode
+               : _localSettingsNode;
 
-            var settingNode = targetNode.SelectSingleNode($"setting[@name='{propertyValue.Name}']");
+            XmlNode settingNode = targetNode.SelectSingleNode(string.Format("setting[@name='{0}']", propertyValue.Name));
 
             if (settingNode != null)
                 settingNode.InnerText = propertyValue.SerializedValue.ToString();
@@ -136,10 +170,10 @@ namespace mRemoteNG.Config.Settings.Providers
             {
                 settingNode = _rootDocument.CreateElement("setting");
 
-                var nameAttribute = _rootDocument.CreateAttribute("name");
+                XmlAttribute nameAttribute = _rootDocument.CreateAttribute("name");
                 nameAttribute.Value = propertyValue.Name;
 
-                settingNode.Attributes?.Append(nameAttribute);
+                settingNode.Attributes.Append(nameAttribute);
                 settingNode.InnerText = propertyValue.SerializedValue.ToString();
 
                 targetNode.AppendChild(settingNode);
@@ -148,8 +182,8 @@ namespace mRemoteNG.Config.Settings.Providers
 
         private string GetValue(SettingsProperty property)
         {
-            var targetNode = IsGlobal(property) ? _globalSettingsNode : _localSettingsNode;
-            var settingNode = targetNode.SelectSingleNode($"setting[@name='{property.Name}']");
+            XmlNode targetNode = IsGlobal(property) ? _globalSettingsNode : _localSettingsNode;
+            XmlNode settingNode = targetNode.SelectSingleNode(string.Format("setting[@name='{0}']", property.Name));
 
             if (settingNode == null)
                 return property.DefaultValue != null ? property.DefaultValue.ToString() : string.Empty;
@@ -157,7 +191,7 @@ namespace mRemoteNG.Config.Settings.Providers
             return settingNode.InnerText;
         }
 
-        private static bool IsGlobal(SettingsProperty property)
+        private bool IsGlobal(SettingsProperty property)
         {
             foreach (DictionaryEntry attribute in property.Attributes)
             {
@@ -170,18 +204,20 @@ namespace mRemoteNG.Config.Settings.Providers
 
         private XmlNode GetSettingsNode(string name)
         {
-            var settingsNode = _rootNode.SelectSingleNode(name);
+            XmlNode settingsNode = _rootNode.SelectSingleNode(name);
 
-            if (settingsNode != null) return settingsNode;
-            settingsNode = _rootDocument.CreateElement(name);
-            _rootNode.AppendChild(settingsNode);
+            if (settingsNode == null)
+            {
+                settingsNode = _rootDocument.CreateElement(name);
+                _rootNode.AppendChild(settingsNode);
+            }
 
             return settingsNode;
         }
 
-        private static XmlDocument GetBlankXmlDocument()
+        public XmlDocument GetBlankXmlDocument()
         {
-            var blankXmlDocument = new XmlDocument();
+            XmlDocument blankXmlDocument = new XmlDocument();
             blankXmlDocument.AppendChild(blankXmlDocument.CreateXmlDeclaration("1.0", "utf-8", string.Empty));
             blankXmlDocument.AppendChild(blankXmlDocument.CreateElement(_rootNodeName));
 

mRemoteV1/Config/Settings/SettingsLoader.cs

@@ -19,7 +19,6 @@ namespace mRemoteNG.Config.Settings
 	{
         private readonly ExternalAppsLoader _externalAppsLoader;
         private readonly MessageCollector _messageCollector;
-	    private readonly MenuStrip _mainMenu;
         private readonly QuickConnectToolStrip _quickConnectToolStrip;
         private readonly ExternalToolsToolStrip _externalToolsToolStrip;
 	    private readonly MultiSshToolStrip _multiSshToolStrip;
@@ -32,8 +31,7 @@ namespace mRemoteNG.Config.Settings
             MessageCollector messageCollector, 
             QuickConnectToolStrip quickConnectToolStrip, 
             ExternalToolsToolStrip externalToolsToolStrip,
-            MultiSshToolStrip multiSshToolStrip,
-            MenuStrip mainMenu)
+            MultiSshToolStrip multiSshToolStrip)
 		{
             if (mainForm == null)
                 throw new ArgumentNullException(nameof(mainForm));
@@ -45,16 +43,13 @@ namespace mRemoteNG.Config.Settings
                 throw new ArgumentNullException(nameof(externalToolsToolStrip));
             if (multiSshToolStrip == null)
                 throw new ArgumentNullException(nameof(multiSshToolStrip));
-		    if (mainMenu == null)
-		        throw new ArgumentNullException(nameof(mainMenu));
 
             MainForm = mainForm;
 	        _messageCollector = messageCollector;
 	        _quickConnectToolStrip = quickConnectToolStrip;
 	        _externalToolsToolStrip = externalToolsToolStrip;
 		    _multiSshToolStrip = multiSshToolStrip;
-		    _mainMenu = mainMenu;
-		    _externalAppsLoader = new ExternalAppsLoader(MainForm, messageCollector, _externalToolsToolStrip);
+            _externalAppsLoader = new ExternalAppsLoader(MainForm, messageCollector, _externalToolsToolStrip);
         }
         
         #region Public Methods
@@ -202,7 +197,6 @@ namespace mRemoteNG.Config.Settings
 	    private void LoadToolbarsFromSettings()
 		{
             ResetAllToolbarLocations();
-		    AddMainMenuPanel();
             AddExternalAppsPanel();
 		    AddQuickConnectPanel();
 		    AddMultiSshPanel();
@@ -216,49 +210,31 @@ namespace mRemoteNG.Config.Settings
 	    private void ResetAllToolbarLocations()
 	    {
 	        var tempToolStrip = new ToolStripPanel();
-            tempToolStrip.Join(_mainMenu);
 	        tempToolStrip.Join(_quickConnectToolStrip);
 	        tempToolStrip.Join(_externalToolsToolStrip);
 	        tempToolStrip.Join(_multiSshToolStrip);
         }
 
-	    private void AddMainMenuPanel()
-	    {
-	        SetToolstripGripStyle(_mainMenu);
-            var toolStripPanel = ToolStripPanelFromString("top");
-	        toolStripPanel.Join(_mainMenu, new Point(3, 0));
-        }
-
 		private void AddQuickConnectPanel()
 		{
-		    SetToolstripGripStyle(_quickConnectToolStrip);
-            _quickConnectToolStrip.Visible = mRemoteNG.Settings.Default.QuickyTBVisible;
             var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.QuickyTBParentDock);
             toolStripPanel.Join(_quickConnectToolStrip, mRemoteNG.Settings.Default.QuickyTBLocation);
+            _quickConnectToolStrip.Visible = mRemoteNG.Settings.Default.QuickyTBVisible;
 		}
 		
 		private void AddExternalAppsPanel()
 		{
-		    SetToolstripGripStyle(_externalToolsToolStrip);
-            _externalToolsToolStrip.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible;
-            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
+		    var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
             toolStripPanel.Join(_externalToolsToolStrip, mRemoteNG.Settings.Default.ExtAppsTBLocation);
+            _externalToolsToolStrip.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible;
 		}
 
 	    private void AddMultiSshPanel()
 	    {
-	        SetToolstripGripStyle(_multiSshToolStrip);
-	        _multiSshToolStrip.Visible = mRemoteNG.Settings.Default.MultiSshToolbarVisible;
-            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.MultiSshToolbarParentDock);
+	        var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
             toolStripPanel.Join(_multiSshToolStrip, mRemoteNG.Settings.Default.MultiSshToolbarLocation);
+	        _multiSshToolStrip.Visible = mRemoteNG.Settings.Default.MultiSshToolbarVisible;
 	    }
-
-	    private void SetToolstripGripStyle(ToolStrip toolbar)
-	    {
-	        toolbar.GripStyle = mRemoteNG.Settings.Default.LockToolbars
-	            ? ToolStripGripStyle.Hidden
-	            : ToolStripGripStyle.Visible;
-        }
 		
 		private ToolStripPanel ToolStripPanelFromString(string panel)
 		{

mRemoteV1/Connection/AbstractConnectionRecord.cs

@@ -26,28 +26,29 @@ namespace mRemoteNG.Connection
         private string _domain = "";
 
         private ProtocolType _protocol;
+	    private RdpVersionEnum _rdpProtocolVersion;
         private string _extApp;
         private int _port;
         private string _puttySession;
         private IcaProtocol.EncryptionStrength _icaEncryption;
         private bool _useConsoleSession;
-        private RdpProtocol.AuthenticationLevel _rdpAuthenticationLevel;
+        private RdpAuthenticationLevel _rdpAuthenticationLevel;
         private int _rdpMinutesToIdleTimeout;
         private bool _rdpAlertIdleTimeout;
         private string _loadBalanceInfo;
         private HTTPBase.RenderingEngine _renderingEngine;
         private bool _useCredSsp;
 
-        private RdpProtocol.RDGatewayUsageMethod _rdGatewayUsageMethod;
+        private RDGatewayUsageMethod _rdGatewayUsageMethod;
         private string _rdGatewayHostname;
-        private RdpProtocol.RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials;
+        private RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials;
         private string _rdGatewayUsername;
         private string _rdGatewayPassword;
         private string _rdGatewayDomain;
 
-        private RdpProtocol.RDPResolutions _resolution;
+        private RdpResolutions _resolution;
         private bool _automaticResize;
-        private RdpProtocol.RDPColors _colors;
+        private RdpColors _colors;
         private bool _cacheBitmaps;
         private bool _displayWallpaper;
         private bool _displayThemes;
@@ -59,8 +60,8 @@ namespace mRemoteNG.Connection
         private bool _redirectPrinters;
         private bool _redirectPorts;
         private bool _redirectSmartCards;
-        private RdpProtocol.RDPSounds _redirectSound;
-        private RdpProtocol.RDPSoundQuality _soundQuality;
+        private RdpSounds _redirectSound;
+        private RdpSoundQuality _soundQuality;
 
         private string _preExtApp;
         private string _postExtApp;
@@ -87,8 +88,8 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionName")]
         public virtual string Name
         {
-            get => _name;
-            set => SetField(ref _name, value, "Name");
+            get { return _name; }
+            set { SetField(ref _name, value, "Name"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"),
@@ -96,8 +97,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDescription")]
         public virtual string Description
         {
-            get => GetPropertyValue("Description", _description);
-            set => SetField(ref _description, value, "Description");
+            get { return GetPropertyValue("Description", _description); }
+            set { SetField(ref _description, value, "Description"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"),
@@ -106,8 +107,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionIcon")]
         public virtual string Icon
         {
-            get => GetPropertyValue("Icon", _icon);
-            set => SetField(ref _icon, value, "Icon");
+            get { return GetPropertyValue("Icon", _icon); }
+            set { SetField(ref _icon, value, "Icon"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"),
@@ -115,8 +116,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPanel")]
         public virtual string Panel
         {
-            get => GetPropertyValue("Panel", _panel);
-            set => SetField(ref _panel, value, "Panel");
+            get { return GetPropertyValue("Panel", _panel); }
+            set { SetField(ref _panel, value, "Panel"); }
         }
         #endregion
 
@@ -126,8 +127,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAddress")]
         public virtual string Hostname
         {
-            get => _hostname.Trim();
-            set => SetField(ref _hostname, value?.Trim(), "Hostname");
+            get { return _hostname.Trim(); }
+            set { SetField(ref _hostname, value?.Trim(), "Hostname"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
@@ -135,8 +136,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUsername")]
         public virtual string Username
         {
-            get => GetPropertyValue("Username", _username);
-            set => SetField(ref _username, value?.Trim(), "Username");
+            get { return GetPropertyValue("Username", _username); }
+            set { SetField(ref _username, value?.Trim(), "Username"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
@@ -145,8 +146,8 @@ namespace mRemoteNG.Connection
             PasswordPropertyText(true)]
         public virtual string Password
         {
-            get => GetPropertyValue("Password", _password);
-            set => SetField(ref _password, value, "Password");
+            get { return GetPropertyValue("Password", _password); }
+            set { SetField(ref _password, value, "Password"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
@@ -154,8 +155,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDomain")]
         public string Domain
         {
-            get => GetPropertyValue("Domain", _domain).Trim();
-            set => SetField(ref _domain, value?.Trim(), "Domain");
+            get { return GetPropertyValue("Domain", _domain).Trim(); }
+            set { SetField(ref _domain, value?.Trim(), "Domain"); }
         }
         #endregion
 
@@ -166,18 +167,28 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public virtual ProtocolType Protocol
         {
-            get => GetPropertyValue("Protocol", _protocol);
-            set => SetField(ref _protocol, value, "Protocol");
+            get { return GetPropertyValue("Protocol", _protocol); }
+            set { SetField(ref _protocol, value, "Protocol"); }
         }
 
+	    [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
+	     LocalizedAttributes.LocalizedDisplayName("strPropertyNameRdpProtocolVersion"),
+	     LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRdpProtocolVersion"),
+	     TypeConverter(typeof(MiscTools.EnumTypeConverter))]
+		public virtual RdpVersionEnum RdpProtocolVersion
+	    {
+		    get { return GetPropertyValue(nameof(RdpProtocolVersion), _rdpProtocolVersion); }
+		    set { SetField(ref _rdpProtocolVersion, value, nameof(RdpProtocolVersion)); }
+		}
+
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameExternalTool"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionExternalTool"),
             TypeConverter(typeof(ExternalToolsTypeConverter))]
         public string ExtApp
         {
-            get => GetPropertyValue("ExtApp", _extApp);
-            set => SetField(ref _extApp, value, "ExtApp");
+            get { return GetPropertyValue("ExtApp", _extApp); }
+            set { SetField(ref _extApp, value, "ExtApp"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -185,8 +196,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPort")]
         public virtual int Port
         {
-            get => GetPropertyValue("Port", _port);
-            set => SetField(ref _port, value, "Port");
+            get { return GetPropertyValue("Port", _port); }
+            set { SetField(ref _port, value, "Port"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -195,8 +206,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList))]
         public virtual string PuttySession
         {
-            get => GetPropertyValue("PuttySession", _puttySession);
-            set => SetField(ref _puttySession, value, "PuttySession");
+            get { return GetPropertyValue("PuttySession", _puttySession); }
+            set { SetField(ref _puttySession, value, "PuttySession"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -205,8 +216,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public IcaProtocol.EncryptionStrength ICAEncryptionStrength
         {
-            get => GetPropertyValue("ICAEncryptionStrength", _icaEncryption);
-            set => SetField(ref _icaEncryption, value, "ICAEncryptionStrength");
+            get { return GetPropertyValue("ICAEncryptionStrength", _icaEncryption); }
+            set { SetField(ref _icaEncryption, value, "ICAEncryptionStrength"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -215,18 +226,18 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseConsoleSession
         {
-            get => GetPropertyValue("UseConsoleSession", _useConsoleSession);
-            set => SetField(ref _useConsoleSession, value, "UseConsoleSession");
+            get { return GetPropertyValue("UseConsoleSession", _useConsoleSession); }
+            set { SetField(ref _useConsoleSession, value, "UseConsoleSession"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameAuthenticationLevel"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAuthenticationLevel"),
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public RdpProtocol.AuthenticationLevel RDPAuthenticationLevel
+        public RdpAuthenticationLevel RDPAuthenticationLevel
         {
-            get => GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel);
-            set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel");
+            get { return GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel); }
+            set { SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -234,7 +245,7 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPMinutesToIdleTimeout")]
         public virtual int RDPMinutesToIdleTimeout
         {
-            get => GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout);
+            get { return GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout); }
             set {
                 if(value < 0)
                     value = 0;
@@ -249,8 +260,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPAlertIdleTimeout")]
         public bool RDPAlertIdleTimeout
         {
-            get => GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout);
-            set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout");
+            get { return GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout); }
+            set { SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -258,8 +269,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionLoadBalanceInfo")]
         public string LoadBalanceInfo
         {
-            get => GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim();
-            set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo");
+            get { return GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim(); }
+            set { SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -268,8 +279,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public HTTPBase.RenderingEngine RenderingEngine
         {
-            get => GetPropertyValue("RenderingEngine", _renderingEngine);
-            set => SetField(ref _renderingEngine, value, "RenderingEngine");
+            get { return GetPropertyValue("RenderingEngine", _renderingEngine); }
+            set { SetField(ref _renderingEngine, value, "RenderingEngine"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -278,8 +289,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseCredSsp
         {
-            get => GetPropertyValue("UseCredSsp", _useCredSsp);
-            set => SetField(ref _useCredSsp, value, "UseCredSsp");
+            get { return GetPropertyValue("UseCredSsp", _useCredSsp); }
+            set { SetField(ref _useCredSsp, value, "UseCredSsp"); }
         }
         #endregion
 
@@ -288,10 +299,10 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayUsageMethod"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsageMethod"),
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public RdpProtocol.RDGatewayUsageMethod RDGatewayUsageMethod
+        public RDGatewayUsageMethod RDGatewayUsageMethod
         {
-            get => GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod);
-            set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod");
+            get { return GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod); }
+            set { SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -299,18 +310,18 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayHostname")]
         public string RDGatewayHostname
         {
-            get => GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim();
-            set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname");
+            get { return GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim(); }
+            set { SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayUseConnectionCredentials"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUseConnectionCredentials"),
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public RdpProtocol.RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
+        public RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
         {
-            get => GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials);
-            set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials");
+            get { return GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials); }
+            set { SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -318,8 +329,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsername")]
         public string RDGatewayUsername
         {
-            get => GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim();
-            set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername");
+            get { return GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim(); }
+            set { SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -328,8 +339,8 @@ namespace mRemoteNG.Connection
             PasswordPropertyText(true)]
         public string RDGatewayPassword
         {
-            get => GetPropertyValue("RDGatewayPassword", _rdGatewayPassword);
-            set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword");
+            get { return GetPropertyValue("RDGatewayPassword", _rdGatewayPassword); }
+            set { SetField(ref _rdGatewayPassword, value, "RDGatewayPassword"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -337,8 +348,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayDomain")]
         public string RDGatewayDomain
         {
-            get => GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim();
-            set => SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain");
+            get { return GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim(); }
+            set { SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain"); }
         }
         #endregion
 
@@ -347,10 +358,10 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameResolution"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionResolution"),
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public RdpProtocol.RDPResolutions Resolution
+        public RdpResolutions Resolution
         {
-            get => GetPropertyValue("Resolution", _resolution);
-            set => SetField(ref _resolution, value, "Resolution");
+            get { return GetPropertyValue("Resolution", _resolution); }
+            set { SetField(ref _resolution, value, "Resolution"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -359,18 +370,18 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool AutomaticResize
         {
-            get => GetPropertyValue("AutomaticResize", _automaticResize);
-            set => SetField(ref _automaticResize, value, "AutomaticResize");
+            get { return GetPropertyValue("AutomaticResize", _automaticResize); }
+            set { SetField(ref _automaticResize, value, "AutomaticResize"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameColors"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionColors"),
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public RdpProtocol.RDPColors Colors
+        public RdpColors Colors
         {
-            get => GetPropertyValue("Colors", _colors);
-            set => SetField(ref _colors, value, "Colors");
+            get { return GetPropertyValue("Colors", _colors); }
+            set { SetField(ref _colors, value, "Colors"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -379,8 +390,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool CacheBitmaps
         {
-            get => GetPropertyValue("CacheBitmaps", _cacheBitmaps);
-            set => SetField(ref _cacheBitmaps, value, "CacheBitmaps");
+            get { return GetPropertyValue("CacheBitmaps", _cacheBitmaps); }
+            set { SetField(ref _cacheBitmaps, value, "CacheBitmaps"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -389,8 +400,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayWallpaper
         {
-            get => GetPropertyValue("DisplayWallpaper", _displayWallpaper);
-            set => SetField(ref _displayWallpaper, value, "DisplayWallpaper");
+            get { return GetPropertyValue("DisplayWallpaper", _displayWallpaper); }
+            set { SetField(ref _displayWallpaper, value, "DisplayWallpaper"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -399,8 +410,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayThemes
         {
-            get => GetPropertyValue("DisplayThemes", _displayThemes);
-            set => SetField(ref _displayThemes, value, "DisplayThemes");
+            get { return GetPropertyValue("DisplayThemes", _displayThemes); }
+            set { SetField(ref _displayThemes, value, "DisplayThemes"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -409,8 +420,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableFontSmoothing
         {
-            get => GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing);
-            set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing");
+            get { return GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing); }
+            set { SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -419,8 +430,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableDesktopComposition
         {
-            get => GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition);
-            set => SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition");
+            get { return GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition); }
+            set { SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition"); }
         }
         #endregion
 
@@ -431,8 +442,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectKeys
         {
-            get => GetPropertyValue("RedirectKeys", _redirectKeys);
-            set => SetField(ref _redirectKeys, value, "RedirectKeys");
+            get { return GetPropertyValue("RedirectKeys", _redirectKeys); }
+            set { SetField(ref _redirectKeys, value, "RedirectKeys"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -441,8 +452,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectDiskDrives
         {
-            get => GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives);
-            set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives");
+            get { return GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives); }
+            set { SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -451,8 +462,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPrinters
         {
-            get => GetPropertyValue("RedirectPrinters", _redirectPrinters);
-            set => SetField(ref _redirectPrinters, value, "RedirectPrinters");
+            get { return GetPropertyValue("RedirectPrinters", _redirectPrinters); }
+            set { SetField(ref _redirectPrinters, value, "RedirectPrinters"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -461,8 +472,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPorts
         {
-            get => GetPropertyValue("RedirectPorts", _redirectPorts);
-            set => SetField(ref _redirectPorts, value, "RedirectPorts");
+            get { return GetPropertyValue("RedirectPorts", _redirectPorts); }
+            set { SetField(ref _redirectPorts, value, "RedirectPorts"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -471,34 +482,34 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSmartCards
         {
-            get => GetPropertyValue("RedirectSmartCards", _redirectSmartCards);
-            set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards");
+            get { return GetPropertyValue("RedirectSmartCards", _redirectSmartCards); }
+            set { SetField(ref _redirectSmartCards, value, "RedirectSmartCards"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectSounds"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectSounds"),
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public RdpProtocol.RDPSounds RedirectSound
+        public RdpSounds RedirectSound
         {
-            get => GetPropertyValue("RedirectSound", _redirectSound);
-            set => SetField(ref _redirectSound, value, "RedirectSound");
+            get { return GetPropertyValue("RedirectSound", _redirectSound); }
+            set { SetField(ref _redirectSound, value, "RedirectSound"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameSoundQuality"),
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionSoundQuality"),
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public RdpProtocol.RDPSoundQuality SoundQuality
+        public RdpSoundQuality SoundQuality
         {
-            get => GetPropertyValue("SoundQuality", _soundQuality);
-            set => SetField(ref _soundQuality, value, "SoundQuality");
+            get { return GetPropertyValue("SoundQuality", _soundQuality); }
+            set { SetField(ref _soundQuality, value, "SoundQuality"); }
         }
         #endregion
 
         #region Misc
         [Browsable(false)]
-        public string ConstantID { get; /*set;*/ }
+        public string ConstantID { get; set; }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameExternalToolBefore"),
@@ -506,8 +517,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(ExternalToolsTypeConverter))]
         public virtual string PreExtApp
         {
-            get => GetPropertyValue("PreExtApp", _preExtApp);
-            set => SetField(ref _preExtApp, value, "PreExtApp");
+            get { return GetPropertyValue("PreExtApp", _preExtApp); }
+            set { SetField(ref _preExtApp, value, "PreExtApp"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -516,8 +527,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(ExternalToolsTypeConverter))]
         public virtual string PostExtApp
         {
-            get => GetPropertyValue("PostExtApp", _postExtApp);
-            set => SetField(ref _postExtApp, value, "PostExtApp");
+            get { return GetPropertyValue("PostExtApp", _postExtApp); }
+            set { SetField(ref _postExtApp, value, "PostExtApp"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -525,8 +536,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionMACAddress")]
         public virtual string MacAddress
         {
-            get => GetPropertyValue("MacAddress", _macAddress);
-            set => SetField(ref _macAddress, value, "MacAddress");
+            get { return GetPropertyValue("MacAddress", _macAddress); }
+            set { SetField(ref _macAddress, value, "MacAddress"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -534,8 +545,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUser1")]
         public virtual string UserField
         {
-            get => GetPropertyValue("UserField", _userField);
-            set => SetField(ref _userField, value, "UserField");
+            get { return GetPropertyValue("UserField", _userField); }
+            set { SetField(ref _userField, value, "UserField"); }
         }
         #endregion
 
@@ -547,8 +558,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public ProtocolVNC.Compression VNCCompression
         {
-            get => GetPropertyValue("VNCCompression", _vncCompression);
-            set => SetField(ref _vncCompression, value, "VNCCompression");
+            get { return GetPropertyValue("VNCCompression", _vncCompression); }
+            set { SetField(ref _vncCompression, value, "VNCCompression"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -558,8 +569,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public ProtocolVNC.Encoding VNCEncoding
         {
-            get => GetPropertyValue("VNCEncoding", _vncEncoding);
-            set => SetField(ref _vncEncoding, value, "VNCEncoding");
+            get { return GetPropertyValue("VNCEncoding", _vncEncoding); }
+            set { SetField(ref _vncEncoding, value, "VNCEncoding"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
@@ -569,8 +580,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public ProtocolVNC.AuthMode VNCAuthMode
         {
-            get => GetPropertyValue("VNCAuthMode", _vncAuthMode);
-            set => SetField(ref _vncAuthMode, value, "VNCAuthMode");
+            get { return GetPropertyValue("VNCAuthMode", _vncAuthMode); }
+            set { SetField(ref _vncAuthMode, value, "VNCAuthMode"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -580,8 +591,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public ProtocolVNC.ProxyType VNCProxyType
         {
-            get => GetPropertyValue("VNCProxyType", _vncProxyType);
-            set => SetField(ref _vncProxyType, value, "VNCProxyType");
+            get { return GetPropertyValue("VNCProxyType", _vncProxyType); }
+            set { SetField(ref _vncProxyType, value, "VNCProxyType"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -590,8 +601,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyAddress")]
         public string VNCProxyIP
         {
-            get => GetPropertyValue("VNCProxyIP", _vncProxyIp);
-            set => SetField(ref _vncProxyIp, value, "VNCProxyIP");
+            get { return GetPropertyValue("VNCProxyIP", _vncProxyIp); }
+            set { SetField(ref _vncProxyIp, value, "VNCProxyIP"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -600,8 +611,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyPort")]
         public int VNCProxyPort
         {
-            get => GetPropertyValue("VNCProxyPort", _vncProxyPort);
-            set => SetField(ref _vncProxyPort, value, "VNCProxyPort");
+            get { return GetPropertyValue("VNCProxyPort", _vncProxyPort); }
+            set { SetField(ref _vncProxyPort, value, "VNCProxyPort"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -610,8 +621,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyUsername")]
         public string VNCProxyUsername
         {
-            get => GetPropertyValue("VNCProxyUsername", _vncProxyUsername);
-            set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername");
+            get { return GetPropertyValue("VNCProxyUsername", _vncProxyUsername); }
+            set { SetField(ref _vncProxyUsername, value, "VNCProxyUsername"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -621,8 +632,8 @@ namespace mRemoteNG.Connection
             PasswordPropertyText(true)]
         public string VNCProxyPassword
         {
-            get => GetPropertyValue("VNCProxyPassword", _vncProxyPassword);
-            set => SetField(ref _vncProxyPassword, value, "VNCProxyPassword");
+            get { return GetPropertyValue("VNCProxyPassword", _vncProxyPassword); }
+            set { SetField(ref _vncProxyPassword, value, "VNCProxyPassword"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -632,8 +643,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public ProtocolVNC.Colors VNCColors
         {
-            get => GetPropertyValue("VNCColors", _vncColors);
-            set => SetField(ref _vncColors, value, "VNCColors");
+            get { return GetPropertyValue("VNCColors", _vncColors); }
+            set { SetField(ref _vncColors, value, "VNCColors"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -642,8 +653,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public ProtocolVNC.SmartSizeMode VNCSmartSizeMode
         {
-            get => GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode);
-            set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode");
+            get { return GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode); }
+            set { SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -652,20 +663,15 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool VNCViewOnly
         {
-            get => GetPropertyValue("VNCViewOnly", _vncViewOnly);
-            set => SetField(ref _vncViewOnly, value, "VNCViewOnly");
+            get { return GetPropertyValue("VNCViewOnly", _vncViewOnly); }
+            set { SetField(ref _vncViewOnly, value, "VNCViewOnly"); }
         }
         #endregion
         #endregion
 
-	    protected AbstractConnectionRecord(string uniqueId)
-	    {
-		    ConstantID = uniqueId.ThrowIfNullOrEmpty(nameof(uniqueId));
-	    }
-
         protected virtual TPropertyType GetPropertyValue<TPropertyType>(string propertyName, TPropertyType value)
         {
-            return (TPropertyType)GetType().GetProperty(propertyName)?.GetValue(this, null);
+            return (TPropertyType)GetType().GetProperty(propertyName).GetValue(this, null);
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -674,11 +680,12 @@ namespace mRemoteNG.Connection
             PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(args.PropertyName));
         }
 
-        private void SetField<T>(ref T field, T value, string propertyName = null)
+        protected bool SetField<T>(ref T field, T value, string propertyName = null)
         {
-            if (EqualityComparer<T>.Default.Equals(field, value)) return;
+            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
             field = value;
             RaisePropertyChangedEvent(this, new PropertyChangedEventArgs(propertyName));
+            return true;
         }
     }
 }

mRemoteV1/Connection/ConnectionInfo.cs

@@ -14,7 +14,9 @@ using mRemoteNG.Connection.Protocol.SSH;
 using mRemoteNG.Connection.Protocol.Telnet;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
 
 
 namespace mRemoteNG.Connection
@@ -30,7 +32,7 @@ namespace mRemoteNG.Connection
 	    public ProtocolList OpenConnections { get; protected set; }
 
 	    [Browsable(false)]
-        public virtual bool IsContainer { get; set; }
+        public bool IsContainer { get; set; }
 
 	    [Browsable(false)]
         public bool IsDefault { get; set; }
@@ -50,14 +52,7 @@ namespace mRemoteNG.Connection
 	    #endregion
 
         #region Constructors
-
-	    public ConnectionInfo()
-			: this(Guid.NewGuid().ToString())
-	    {
-	    }
-
-        public ConnectionInfo(string uniqueId)
-			: base(uniqueId)
+        public ConnectionInfo()
 		{
             SetTreeDisplayDefaults();
             SetConnectionDefaults();
@@ -70,6 +65,12 @@ namespace mRemoteNG.Connection
             SetNonBrowsablePropertiesDefaults();
             SetDefaults();
 		}
+			
+		public ConnectionInfo(ContainerInfo parent) : this()
+		{
+			IsContainer = true;
+			parent.AddChild(this);
+		}
         #endregion
 			
         #region Public Methods
@@ -77,9 +78,9 @@ namespace mRemoteNG.Connection
 		{
 		    var newConnectionInfo = new ConnectionInfo();
             newConnectionInfo.CopyFrom(this);
+			newConnectionInfo.ConstantID = MiscTools.CreateConstantID();
 		    newConnectionInfo.Inheritance = Inheritance.Clone();
-            newConnectionInfo.Inheritance.Parent = newConnectionInfo;
-            return newConnectionInfo;
+			return newConnectionInfo;
 		}
 
 	    public void CopyFrom(ConnectionInfo sourceConnectionInfo)
@@ -127,22 +128,19 @@ namespace mRemoteNG.Connection
             return filteredProperties;
         }
 
-	    public virtual IEnumerable<PropertyInfo> GetSerializableProperties()
-	    {
-			var excludedProperties = new[] { "Parent", "Name", "Hostname", "Port", "Inheritance", "OpenConnections",
-				"IsContainer", "IsDefault", "PositionID", "ConstantID", "TreeNode", "IsQuickConnect", "PleaseConnect" };
-
-		    return GetProperties(excludedProperties);
-	    }
-
 	    public virtual void SetParent(ContainerInfo newParent)
 	    {
             RemoveParent();
 		    newParent?.AddChild(this);
+			if (newParent is RootNodeInfo)
+				Inheritance.DisableInheritance();
 	    }
 
         public void RemoveParent()
         {
+			if (Parent is RootNodeInfo)
+				Inheritance.EnableInheritance();
+
             Parent?.RemoveChild(this);
         }
 
@@ -174,7 +172,9 @@ namespace mRemoteNG.Connection
                 return value;
 
             var inheritedValue = GetInheritedPropertyValue<TPropertyType>(propertyName);
-            return inheritedValue.Equals(default(TPropertyType)) ? value : inheritedValue;
+            if (inheritedValue.Equals(default(TPropertyType)))
+                return value;
+            return inheritedValue;
         }
 
 	    private bool ShouldThisPropertyBeInherited(string propertyName)
@@ -222,7 +222,7 @@ namespace mRemoteNG.Connection
                 switch (protocol)
                 {
                     case ProtocolType.RDP:
-                        return (int)RdpProtocol.Defaults.Port;
+                        return (int)RdpProtocol6.Defaults.Port;
                     case ProtocolType.VNC:
                         return (int)ProtocolVNC.Defaults.Port;
                     case ProtocolType.SSH1:
@@ -269,12 +269,13 @@ namespace mRemoteNG.Connection
         private void SetProtocolDefaults()
         {
             Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), Settings.Default.ConDefaultProtocol);
-            ExtApp = Settings.Default.ConDefaultExtApp;
+	        RdpProtocolVersion = RdpVersionEnum.Rdc8;
+			ExtApp = Settings.Default.ConDefaultExtApp;
             Port = 0;
             PuttySession = Settings.Default.ConDefaultPuttySession;
             ICAEncryptionStrength = (IcaProtocol.EncryptionStrength) Enum.Parse(typeof(IcaProtocol.EncryptionStrength), Settings.Default.ConDefaultICAEncryptionStrength);
             UseConsoleSession = Settings.Default.ConDefaultUseConsoleSession;
-            RDPAuthenticationLevel = (RdpProtocol.AuthenticationLevel) Enum.Parse(typeof(RdpProtocol.AuthenticationLevel), Settings.Default.ConDefaultRDPAuthenticationLevel);
+            RDPAuthenticationLevel = (RdpAuthenticationLevel) Enum.Parse(typeof(RdpAuthenticationLevel), Settings.Default.ConDefaultRDPAuthenticationLevel);
             RDPMinutesToIdleTimeout = Settings.Default.ConDefaultRDPMinutesToIdleTimeout;
             RDPAlertIdleTimeout = Settings.Default.ConDefaultRDPAlertIdleTimeout;
             LoadBalanceInfo = Settings.Default.ConDefaultLoadBalanceInfo;
@@ -284,9 +285,9 @@ namespace mRemoteNG.Connection
 
         private void SetRdGatewayDefaults()
         {
-            RDGatewayUsageMethod = (RdpProtocol.RDGatewayUsageMethod) Enum.Parse(typeof(RdpProtocol.RDGatewayUsageMethod), Settings.Default.ConDefaultRDGatewayUsageMethod);
+            RDGatewayUsageMethod = (RDGatewayUsageMethod) Enum.Parse(typeof(RDGatewayUsageMethod), Settings.Default.ConDefaultRDGatewayUsageMethod);
             RDGatewayHostname = Settings.Default.ConDefaultRDGatewayHostname;
-            RDGatewayUseConnectionCredentials = (RdpProtocol.RDGatewayUseConnectionCredentials) Enum.Parse(typeof(RdpProtocol.RDGatewayUseConnectionCredentials), Settings.Default.ConDefaultRDGatewayUseConnectionCredentials);
+            RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials) Enum.Parse(typeof(RDGatewayUseConnectionCredentials), Settings.Default.ConDefaultRDGatewayUseConnectionCredentials);
             RDGatewayUsername = Settings.Default.ConDefaultRDGatewayUsername;
             RDGatewayPassword = Settings.Default.ConDefaultRDGatewayPassword;
             RDGatewayDomain = Settings.Default.ConDefaultRDGatewayDomain;
@@ -294,9 +295,9 @@ namespace mRemoteNG.Connection
 
         private void SetAppearanceDefaults() 
         {
-            Resolution = (RdpProtocol.RDPResolutions) Enum.Parse(typeof(RdpProtocol.RDPResolutions), Settings.Default.ConDefaultResolution);
+            Resolution = (RdpResolutions) Enum.Parse(typeof(RdpResolutions), Settings.Default.ConDefaultResolution);
             AutomaticResize = Settings.Default.ConDefaultAutomaticResize;
-            Colors = (RdpProtocol.RDPColors) Enum.Parse(typeof(RdpProtocol.RDPColors), Settings.Default.ConDefaultColors);
+            Colors = (RdpColors) Enum.Parse(typeof(RdpColors), Settings.Default.ConDefaultColors);
             CacheBitmaps = Settings.Default.ConDefaultCacheBitmaps;
             DisplayWallpaper = Settings.Default.ConDefaultDisplayWallpaper;
             DisplayThemes = Settings.Default.ConDefaultDisplayThemes;
@@ -311,12 +312,13 @@ namespace mRemoteNG.Connection
             RedirectPrinters = Settings.Default.ConDefaultRedirectPrinters;
             RedirectPorts = Settings.Default.ConDefaultRedirectPorts;
             RedirectSmartCards = Settings.Default.ConDefaultRedirectSmartCards;
-            RedirectSound = (RdpProtocol.RDPSounds) Enum.Parse(typeof(RdpProtocol.RDPSounds), Settings.Default.ConDefaultRedirectSound);
-            SoundQuality = (RdpProtocol.RDPSoundQuality)Enum.Parse(typeof(RdpProtocol.RDPSoundQuality), Settings.Default.ConDefaultSoundQuality);
+            RedirectSound = (RdpSounds) Enum.Parse(typeof(RdpSounds), Settings.Default.ConDefaultRedirectSound);
+            SoundQuality = (RdpSoundQuality)Enum.Parse(typeof(RdpSoundQuality), Settings.Default.ConDefaultSoundQuality);
         }
 
         private void SetMiscDefaults()
         {
+            ConstantID = MiscTools.CreateConstantID();
             PreExtApp = Settings.Default.ConDefaultPreExtApp;
             PostExtApp = Settings.Default.ConDefaultPostExtApp;
             MacAddress = Settings.Default.ConDefaultMacAddress;

mRemoteV1/Connection/ConnectionInitiator.cs

@@ -96,12 +96,11 @@ namespace mRemoteNG.Connection
                 var newProtocol = protocolFactory.CreateProtocol(connectionInfo);
 
                 var connectionPanel = SetConnectionPanel(connectionInfo, force);
-                if (string.IsNullOrEmpty(connectionPanel)) return;
                 var connectionForm = SetConnectionForm(conForm, connectionPanel);
                 var connectionContainer = SetConnectionContainer(connectionInfo, connectionForm);
                 SetConnectionFormEventHandlers(newProtocol, connectionForm);
                 SetConnectionEventHandlers(newProtocol);
-                BuildConnectionInterfaceController(connectionInfo, newProtocol, connectionContainer);
+                BuildConnectionInterfaceController(newProtocol, connectionContainer);
 
                 newProtocol.Force = force;
 
@@ -145,7 +144,7 @@ namespace mRemoteNG.Connection
                 {
                     var ic = t.Controls[0] as InterfaceControl;
                     if (ic == null) continue;
-                    if (ic.Info == connectionInfo)
+                    if (ic.Protocol.Info == connectionInfo)
                     {
                         return ic;
                     }
@@ -164,10 +163,6 @@ namespace mRemoteNG.Connection
                 {
                     connectionPanel = frmPnl.Panel;
                 }
-                else
-                {
-                    return null;
-                }
             }
             else
             {
@@ -218,9 +213,9 @@ namespace mRemoteNG.Connection
             newProtocol.ErrorOccured += Prot_Event_ErrorOccured;
         }
 
-        private static void BuildConnectionInterfaceController(ConnectionInfo connectionInfo, ProtocolBase newProtocol, Control connectionContainer)
+        private static void BuildConnectionInterfaceController(ProtocolBase newProtocol, Control connectionContainer)
         {
-            newProtocol.InterfaceControl = new InterfaceControl(connectionContainer, newProtocol, connectionInfo);
+            newProtocol.InterfaceControl = new InterfaceControl(connectionContainer, newProtocol);
         }
         #endregion
 
@@ -238,7 +233,7 @@ namespace mRemoteNG.Connection
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strProtocolEventDisconnected, disconnectedMessage), true);
 
                 var prot = (ProtocolBase)sender;
-                if (prot.InterfaceControl.Info.Protocol != ProtocolType.RDP) return;
+                if (prot.Info.Protocol != ProtocolType.RDP) return;
                 var reasonCode = disconnectedMessage.Split("\r\n".ToCharArray())[0];
                 var desc = disconnectedMessage.Replace("\r\n", " ");
 
@@ -251,26 +246,27 @@ namespace mRemoteNG.Connection
             }
         }
 
-        private static void Prot_Event_Closed(object sender)
+        private static void Prot_Event_Closed(object sender, EventArgs args)
         {
             try
             {
                 var prot = (ProtocolBase)sender;
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnenctionCloseEvent, true);
                 string connDetail;
-                if (prot.InterfaceControl.Info.Hostname == "" && prot.InterfaceControl.Info.Protocol == ProtocolType.IntApp)
-                    connDetail = prot.InterfaceControl.Info.ExtApp;
-                else if (prot.InterfaceControl.Info.Hostname != "")
-                    connDetail = prot.InterfaceControl.Info.Hostname;
+                if (prot.Info.Hostname == "" && prot.Info.Protocol == ProtocolType.IntApp)
+                    connDetail = prot.Info.ExtApp;
+                else if (prot.Info.Hostname != "")
+                    connDetail = prot.Info.Hostname;
                 else
                     connDetail = "UNKNOWN";
 
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strConnenctionClosedByUser, connDetail, prot.InterfaceControl.Info.Protocol, Environment.UserName));
-                prot.InterfaceControl.Info.OpenConnections.Remove(prot);
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, 
+                    string.Format(Language.strConnenctionClosedByUser, connDetail, prot.Info.Protocol, Environment.UserName));
+                prot.Info.OpenConnections.Remove(prot);
 
-                if (prot.InterfaceControl.Info.PostExtApp == "") return;
-                var extA = Runtime.ExternalToolsService.GetExtAppByName(prot.InterfaceControl.Info.PostExtApp);
-                extA?.Start(prot.InterfaceControl.Info);
+                if (prot.Info.PostExtApp == "") return;
+                var extA = Runtime.ExternalToolsService.GetExtAppByName(prot.Info.PostExtApp);
+                extA?.Start(prot.Info);
             }
             catch (Exception ex)
             {
@@ -278,11 +274,12 @@ namespace mRemoteNG.Connection
             }
         }
 
-        private static void Prot_Event_Connected(object sender)
+        private static void Prot_Event_Connected(object sender, EventArgs args)
         {
             var prot = (ProtocolBase)sender;
             Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventConnected, true);
-            Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol, Environment.UserName, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField));
+            Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, 
+                string.Format(Language.strConnectionEventConnectedDetail, prot.Info.Hostname, prot.Info.Protocol, Environment.UserName, prot.Info.Description, prot.Info.UserField));
         }
 
         private static void Prot_Event_ErrorOccured(object sender, string errorMessage)
@@ -292,9 +289,12 @@ namespace mRemoteNG.Connection
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventErrorOccured, true);
                 var prot = (ProtocolBase)sender;
 
-                if (prot.InterfaceControl.Info.Protocol != ProtocolType.RDP) return;
-                if (Convert.ToInt32(errorMessage) > -1)
-                    Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, string.Format(Language.strConnectionRdpErrorDetail, errorMessage, RdpProtocol.FatalErrors.GetError(errorMessage)));
+                if (prot.Info.Protocol != ProtocolType.RDP) return;
+	            var errorMessageAsInt = Convert.ToInt32(errorMessage);
+
+				if (errorMessageAsInt > -1)
+                    Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, 
+                        string.Format(Language.strConnectionRdpErrorDetail, errorMessage, RdpErrorTranslator.Translate(errorMessageAsInt)));
             }
             catch (Exception ex)
             {

mRemoteV1/Connection/ConnectionsService.cs

@@ -8,12 +8,10 @@ using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Messages;
 using mRemoteNG.Security;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using mRemoteNG.UI;
 
 namespace mRemoteNG.Connection
 {
@@ -21,9 +19,6 @@ namespace mRemoteNG.Connection
     {
         private static readonly object SaveLock = new object();
         private readonly PuttySessionsManager _puttySessionsManager;
-        private bool _batchingSaves = false;
-        private bool _saveRequested = false;
-        private bool _saveAsyncRequested = false;
 
         public bool IsConnectionsFileLoaded { get; set; }
         public bool UsingDatabase { get; private set; }
@@ -32,6 +27,11 @@ namespace mRemoteNG.Connection
         public DateTime LastSqlUpdate { get; set; }
 
         public ConnectionTreeModel ConnectionTreeModel { get; private set; }
+        //public ConnectionTreeModel ConnectionTreeModel
+        //{
+        //    get { return Windows.TreeForm.ConnectionTree.ConnectionTreeModel; }
+        //    set { Windows.TreeForm.ConnectionTree.ConnectionTreeModel = value; }
+        //}
 
         public ConnectionsService(PuttySessionsManager puttySessionsManager)
         {
@@ -45,11 +45,11 @@ namespace mRemoteNG.Connection
         {
             try
             {
-                filename.ThrowIfNullOrEmpty(nameof(filename));
                 var newConnectionsModel = new ConnectionTreeModel();
                 newConnectionsModel.AddRootNode(new RootNodeInfo(RootNodeType.Connection));
-                SaveConnections(newConnectionsModel, false, new SaveFilter(), filename, true);
+                SaveConnections(newConnectionsModel, false, new SaveFilter(), filename);
                 LoadConnections(false, false, filename);
+                UpdateCustomConsPathSetting(filename);
             }
             catch (Exception ex)
             {
@@ -79,10 +79,6 @@ namespace mRemoteNG.Connection
                 {
                     newConnectionInfo.Port = uri.Port;
                 }
-
-                if (string.IsNullOrEmpty(newConnectionInfo.Panel))
-                    newConnectionInfo.Panel = Language.strGeneral;
-
                 newConnectionInfo.IsQuickConnect = true;
 
                 return newConnectionInfo;
@@ -101,24 +97,16 @@ namespace mRemoteNG.Connection
         /// <param name="useDatabase"></param>
         /// <param name="import"></param>
         /// <param name="connectionFileName"></param>
-        public void LoadConnections(bool useDatabase, bool import, string connectionFileName)
+        public ConnectionTreeModel LoadConnections(bool useDatabase, bool import, string connectionFileName)
         {
             var oldConnectionTreeModel = ConnectionTreeModel;
             var oldIsUsingDatabaseValue = UsingDatabase;
 
-            var newConnectionTreeModel = useDatabase
-                ? new SqlConnectionsLoader().Load()
-                : new XmlConnectionsLoader(connectionFileName).Load();
-
-            if (newConnectionTreeModel == null)
-            {
-                DialogFactory.ShowLoadConnectionsFailedDialog(connectionFileName, "Decrypting connection file failed", IsConnectionsFileLoaded);
-                return;
-            }
-
-            IsConnectionsFileLoaded = true;
-            ConnectionFileName = connectionFileName;
-            UsingDatabase = useDatabase;
+            var newConnectionTreeModel =
+                (useDatabase
+                    ? new SqlConnectionsLoader().Load()
+                    : new XmlConnectionsLoader(connectionFileName).Load())
+                ?? new ConnectionTreeModel();
 
             if (!import)
             {
@@ -126,35 +114,12 @@ namespace mRemoteNG.Connection
                 newConnectionTreeModel.RootNodes.AddRange(_puttySessionsManager.RootPuttySessionsNodes);
             }
 
+            IsConnectionsFileLoaded = true;
+            ConnectionFileName = connectionFileName;
+            UsingDatabase = useDatabase;
             ConnectionTreeModel = newConnectionTreeModel;
-            UpdateCustomConsPathSetting(connectionFileName);
             RaiseConnectionsLoadedEvent(oldConnectionTreeModel, newConnectionTreeModel, oldIsUsingDatabaseValue, useDatabase, connectionFileName);
-        }
-
-        /// <summary>
-        /// When turned on, calls to <see cref="SaveConnections()"/> or
-        /// <see cref="SaveConnectionsAsync"/> will not immediately execute.
-        /// Instead, they will be deferred until <see cref="EndBatchingSaves"/>
-        /// is called.
-        /// </summary>
-        public void BeginBatchingSaves()
-        {
-            _batchingSaves = true;
-        }
-
-        /// <summary>
-        /// Immediately executes a single <see cref="SaveConnections()"/> or
-        /// <see cref="SaveConnectionsAsync"/> if one has been requested
-        /// since calling <see cref="BeginBatchingSaves"/>.
-        /// </summary>
-        public void EndBatchingSaves()
-        {
-            _batchingSaves = false;
-
-            if (_saveAsyncRequested)
-                SaveConnectionsAsync();
-            else if(_saveRequested)
-                SaveConnections();
+            return newConnectionTreeModel;
         }
 
         /// <summary>
@@ -163,6 +128,8 @@ namespace mRemoteNG.Connection
         /// </summary>
         public void SaveConnections()
         {
+            if (!IsConnectionsFileLoaded)
+                return;
             SaveConnections(ConnectionTreeModel, UsingDatabase, new SaveFilter(), ConnectionFileName);
         }
 
@@ -174,24 +141,12 @@ namespace mRemoteNG.Connection
         /// <param name="useDatabase"></param>
         /// <param name="saveFilter"></param>
         /// <param name="connectionFileName"></param>
-        /// <param name="forceSave">Bypasses safety checks that prevent saving if a connection file isn't loaded.</param>
-        public void SaveConnections(ConnectionTreeModel connectionTreeModel, bool useDatabase, SaveFilter saveFilter, string connectionFileName, bool forceSave = false)
+        public void SaveConnections(ConnectionTreeModel connectionTreeModel, bool useDatabase, SaveFilter saveFilter, string connectionFileName)
         {
-            if (connectionTreeModel == null)
-                return;
-
-            if (!forceSave && !IsConnectionsFileLoaded)
-                return;
-
-            if (_batchingSaves)
-            {
-                _saveRequested = true;
-                return;
-            }
+            if (connectionTreeModel == null) return;
 
             try
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Saving connections...");
                 RemoteConnectionsSyncronizer?.Disable();
 
                 var previouslyUsingDatabase = UsingDatabase;
@@ -206,7 +161,6 @@ namespace mRemoteNG.Connection
                 UsingDatabase = useDatabase;
                 ConnectionFileName = connectionFileName;
                 RaiseConnectionsSavedEvent(connectionTreeModel, previouslyUsingDatabase, UsingDatabase, connectionFileName);
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Successfully saved connections");
             }
             catch (Exception ex)
             {
@@ -220,12 +174,6 @@ namespace mRemoteNG.Connection
 
         public void SaveConnectionsAsync()
         {
-            if (_batchingSaves)
-            {
-                _saveAsyncRequested = true;
-                return;
-            }
-
             var t = new Thread(SaveConnectionsBGd);
             t.SetApartmentState(ApartmentState.STA);
             t.Start();
@@ -233,24 +181,19 @@ namespace mRemoteNG.Connection
 
         private void SaveConnectionsBGd()
         {
-            lock (SaveLock)
-            {
-                SaveConnections();
-            }
+            Monitor.Enter(SaveLock);
+            SaveConnections();
+            Monitor.Exit(SaveLock);
         }
 
         public string GetStartupConnectionFileName()
         {
-            return Settings.Default.LoadConsFromCustomLocation == false 
-                ? GetDefaultStartupConnectionFileName() 
-                : Settings.Default.CustomConsPath;
+            return Settings.Default.LoadConsFromCustomLocation == false ? GetDefaultStartupConnectionFileName() : Settings.Default.CustomConsPath;
         }
 
         public string GetDefaultStartupConnectionFileName()
         {
-            return Runtime.IsPortableEdition 
-                ? GetDefaultStartupConnectionFileNamePortableEdition() 
-                : GetDefaultStartupConnectionFileNameNormalEdition();
+            return Runtime.IsPortableEdition ? GetDefaultStartupConnectionFileNamePortableEdition() : GetDefaultStartupConnectionFileNameNormalEdition();
         }
 
         private void UpdateCustomConsPathSetting(string filename)
@@ -284,7 +227,7 @@ namespace mRemoteNG.Connection
         public event EventHandler<ConnectionsLoadedEventArgs> ConnectionsLoaded;
         public event EventHandler<ConnectionsSavedEventArgs> ConnectionsSaved;
 
-        private void RaiseConnectionsLoadedEvent(Optional<ConnectionTreeModel> previousTreeModel, ConnectionTreeModel newTreeModel,
+        private void RaiseConnectionsLoadedEvent(Maybe<ConnectionTreeModel> previousTreeModel, ConnectionTreeModel newTreeModel,
             bool previousSourceWasDatabase, bool newSourceIsDatabase,
             string newSourcePath)
         {

mRemoteV1/Connection/DefaultConnectionInfo.cs

@@ -1,39 +1,35 @@
 using System;
-using System.Configuration;
+using System.ComponentModel;
 using mRemoteNG.App;
 
 
 namespace mRemoteNG.Connection
 {
-	public class DefaultConnectionInfo : ConnectionInfo
+    public class DefaultConnectionInfo : ConnectionInfo
     {
         public static DefaultConnectionInfo Instance { get; } = new DefaultConnectionInfo();
+        private readonly string[] _excludedProperties = { "Parent", "Name", "Hostname", "Port", "Inheritance",
+            "OpenConnections", "IsContainer", "IsDefault", "PositionID", "ConstantID", "TreeNode", "IsQuickConnect", "PleaseConnect" };
 
         private DefaultConnectionInfo()
         {
             IsDefault = true;
-	        Inheritance = DefaultConnectionInheritance.Instance;
         }
 
         public void LoadFrom<TSource>(TSource sourceInstance, Func<string, string> propertyNameMutator = null)
         {
-            if (propertyNameMutator == null)
-	            propertyNameMutator = a => a;
-
-            var connectionProperties = GetSerializableProperties();
+            if (propertyNameMutator == null) propertyNameMutator = a => a;
+            var connectionProperties = GetProperties(_excludedProperties);
             foreach (var property in connectionProperties)
             {
                 try
                 {
-	                var expectedPropertyName = propertyNameMutator(property.Name);
-					var propertyFromSource = typeof(TSource).GetProperty(expectedPropertyName);
-                    if (propertyFromSource == null)
-						throw new SettingsPropertyNotFoundException($"No property with name '{expectedPropertyName}' found.");
-
-					var valueFromSource = propertyFromSource.GetValue(sourceInstance, null);
-	                var value = Convert.ChangeType(valueFromSource, property.PropertyType);
-
-                    property.SetValue(Instance, value, null);
+                    var propertyFromSource = typeof(TSource).GetProperty(propertyNameMutator(property.Name));
+                    if (propertyFromSource == null) continue;
+                    var valueFromSource = propertyFromSource.GetValue(sourceInstance, null);
+                    var typeConverter = TypeDescriptor.GetConverter(property.PropertyType);
+                    if (typeConverter.CanConvertFrom(valueFromSource.GetType()))
+                        property.SetValue(Instance, typeConverter.ConvertFrom(valueFromSource), null);
                 }
                 catch (Exception ex)
                 {
@@ -44,25 +40,19 @@ namespace mRemoteNG.Connection
 
         public void SaveTo<TDestination>(TDestination destinationInstance, Func<string, string> propertyNameMutator = null)
         {
-            if (propertyNameMutator == null)
-	            propertyNameMutator = (a) => a;
-
-            var connectionProperties = GetSerializableProperties();
-
-            foreach (var property in connectionProperties)
+            if (propertyNameMutator == null) propertyNameMutator = (a) => a;
+            var inheritanceProperties = GetProperties(_excludedProperties);
+            foreach (var property in inheritanceProperties)
             {
                 try
                 {
-	                var expectedPropertyName = propertyNameMutator(property.Name);
-					var propertyFromDestination = typeof(TDestination).GetProperty(expectedPropertyName);
-
-	                if (propertyFromDestination == null)
-		                throw new SettingsPropertyNotFoundException($"No property with name '{expectedPropertyName}' found.");
-
-					// ensure value is of correct type
-	                var value = Convert.ChangeType(property.GetValue(Instance, null), propertyFromDestination.PropertyType);
-
-                    propertyFromDestination.SetValue(destinationInstance, value, null);
+                    var propertyFromDestination = typeof(TDestination).GetProperty(propertyNameMutator(property.Name));
+                    var localValue = property.GetValue(Instance, null);
+                    var typeConverter = TypeDescriptor.GetConverter(property.PropertyType);
+                    if (propertyFromDestination != null && !typeConverter.CanConvertTo(propertyFromDestination.PropertyType)) continue;
+                    if (propertyFromDestination == null) continue;
+                    var convertedValue = typeConverter.ConvertTo(localValue, propertyFromDestination.PropertyType);
+                    propertyFromDestination.SetValue(destinationInstance, convertedValue, null);
                 }
                 catch (Exception ex)
                 {

mRemoteV1/Connection/InterfaceControl.cs

@@ -10,15 +10,12 @@ namespace mRemoteNG.Connection
 	public sealed partial class InterfaceControl
     {
         public ProtocolBase Protocol { get; set; }
-	    public ConnectionInfo Info { get; set; }
 
-
-		public InterfaceControl(Control parent, ProtocolBase protocol, ConnectionInfo info)
+		public InterfaceControl(Control parent, ProtocolBase protocol)
 		{
 			try
 			{
 				Protocol = protocol;
-				Info = info;
                 Parent = parent;
                 Location = new Point(0, 0);
                 Size = Parent.Size;

mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTP.cs

@@ -3,7 +3,8 @@ namespace mRemoteNG.Connection.Protocol.Http
 	public class ProtocolHTTP : HTTPBase
 	{
 				
-		public ProtocolHTTP(RenderingEngine RenderingEngine) : base(RenderingEngine)
+		public ProtocolHTTP(ConnectionInfo connectionInfo, RenderingEngine renderingEngine) 
+            : base(connectionInfo, renderingEngine)
 		{
             httpOrS = "http";
             defaultPort = (int)Defaults.Port;

mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs

@@ -9,20 +9,19 @@ namespace mRemoteNG.Connection.Protocol.Http
 {
 	public class HTTPBase : ProtocolBase
 	{
-        #region Private Properties
 		private Control wBrowser;
+		private string tabTitle;
 	    protected string httpOrS;
 	    protected int defaultPort;
-		private string tabTitle;
-        #endregion
 				
         #region Public Methods
 
-	    protected HTTPBase(RenderingEngine RenderingEngine)
-		{
+	    protected HTTPBase(ConnectionInfo connectionInfo, RenderingEngine renderingEngine) 
+            : base(connectionInfo)
+	    {
 			try
 			{
-				if (RenderingEngine == RenderingEngine.Gecko)
+				if (renderingEngine == RenderingEngine.Gecko)
 				{
                     if(!Xpcom.IsInitialized)
                         Xpcom.Initialize("Firefox");
@@ -58,7 +57,7 @@ namespace mRemoteNG.Connection.Protocol.Http
 			{
                 wBrowser = Control;
 						
-				if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
+				if (Info.RenderingEngine == RenderingEngine.Gecko)
 				{
 				    var GeckoBrowser = (GeckoWebBrowser) wBrowser;
                     if (GeckoBrowser != null)
@@ -96,7 +95,7 @@ namespace mRemoteNG.Connection.Protocol.Http
 		{
 			try
 			{
-				var strHost = InterfaceControl.Info.Hostname;
+				var strHost = Info.Hostname;
                 /* 
                  * Commenting out since this codes doesn't actually do anything at this time...
                  * Possibly related to MR-221 and/or MR-533 ????
@@ -108,7 +107,7 @@ namespace mRemoteNG.Connection.Protocol.Http
 					strAuth = "Authorization: Basic " + Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes(InterfaceControl.Info.Username + ":" + InterfaceControl.Info.Password)) + Environment.NewLine;
 				}
 				*/	
-				if (InterfaceControl.Info.Port != defaultPort)
+				if (Info.Port != defaultPort)
 				{
 					if (strHost.EndsWith("/"))
 					{
@@ -120,13 +119,13 @@ namespace mRemoteNG.Connection.Protocol.Http
 						strHost = httpOrS + "://" + strHost;
 					}
 							
-					if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
+					if (Info.RenderingEngine == RenderingEngine.Gecko)
 					{
-                        ((GeckoWebBrowser)wBrowser).Navigate(strHost + ":" + InterfaceControl.Info.Port);
+                        ((GeckoWebBrowser)wBrowser).Navigate(strHost + ":" + Info.Port);
 					}
 					else
 					{
-                        ((WebBrowser)wBrowser).Navigate(strHost + ":" + InterfaceControl.Info.Port);
+                        ((WebBrowser)wBrowser).Navigate(strHost + ":" + Info.Port);
 					}
 				}
 				else
@@ -136,7 +135,7 @@ namespace mRemoteNG.Connection.Protocol.Http
 						strHost = httpOrS + "://" + strHost;
 					}
 							
-					if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
+					if (Info.RenderingEngine == RenderingEngine.Gecko)
 					{
 						((GeckoWebBrowser)wBrowser).Navigate(strHost);
 					}
@@ -181,7 +180,7 @@ namespace mRemoteNG.Connection.Protocol.Http
 			    if (tabP == null) return;
 			    string shortTitle;
 							
-			    if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
+			    if (Info.RenderingEngine == RenderingEngine.Gecko)
 			    {
 			        if (((GeckoWebBrowser) wBrowser).DocumentTitle.Length >= 15)
 			        {
@@ -229,7 +228,7 @@ namespace mRemoteNG.Connection.Protocol.Http
                 if (tabP == null) return;
                 string shortTitle;
 
-                if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
+                if (Info.RenderingEngine == RenderingEngine.Gecko)
                 {
                     if (((GeckoWebBrowser)wBrowser).DocumentTitle.Length >= 15)
                     {

mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPS.cs

@@ -2,8 +2,8 @@ namespace mRemoteNG.Connection.Protocol.Http
 {
 	public class ProtocolHTTPS : HTTPBase
 	{
-				
-		public ProtocolHTTPS(RenderingEngine RenderingEngine) : base(RenderingEngine)
+		public ProtocolHTTPS(ConnectionInfo connectionInfo, RenderingEngine renderingEngine) 
+            : base(connectionInfo, renderingEngine)
 		{
             httpOrS = "https";
             defaultPort = (int)Defaults.Port;

mRemoteV1/Connection/Protocol/ICA/IcaProtocol.cs

@@ -16,11 +16,11 @@ namespace mRemoteNG.Connection.Protocol.ICA
 	public class IcaProtocol : ProtocolBase
 	{
 		private AxICAClient _icaClient;
-		private ConnectionInfo _info;
         private readonly FrmMain _frmMain = FrmMain.Default;
 		
         #region Public Methods
-		public IcaProtocol()
+		public IcaProtocol(ConnectionInfo connectionInfo)
+            : base(connectionInfo)
 		{
 			try
 			{
@@ -39,7 +39,6 @@ namespace mRemoteNG.Connection.Protocol.ICA
 			try
 			{
 				_icaClient = (AxICAClient)Control;
-				_info = InterfaceControl.Info;
 				_icaClient.CreateControl();
 						
 				while (!_icaClient.Created)
@@ -48,7 +47,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
 					Application.DoEvents();
 				}
 
-				_icaClient.Address = _info.Hostname;
+				_icaClient.Address = Info.Hostname;
 				SetCredentials();
 				SetResolution();
 				SetColors();
@@ -78,8 +77,8 @@ namespace mRemoteNG.Connection.Protocol.ICA
 				_icaClient.Hotkey11Shift = null;
 				_icaClient.Hotkey11Char = null;
 						
-				_icaClient.PersistentCacheEnabled = _info.CacheBitmaps;
-				_icaClient.Title = _info.Name;
+				_icaClient.PersistentCacheEnabled = Info.CacheBitmaps;
+				_icaClient.Title = Info.Name;
 				return true;
 			}
 			catch (Exception ex)
@@ -117,9 +116,9 @@ namespace mRemoteNG.Connection.Protocol.ICA
 					return;
 				}
 
-			    var user = _info?.Username ?? "";
-			    var pass = _info?.Password ?? "";
-			    var dom = _info?.Domain ?? "";
+			    var user = Info?.Username ?? "";
+			    var pass = Info?.Password ?? "";
+			    var dom = Info?.Domain ?? "";
 
 				if (string.IsNullOrEmpty(user))
 				{
@@ -187,22 +186,22 @@ namespace mRemoteNG.Connection.Protocol.ICA
 					return;
 				}
 						
-				if (InterfaceControl.Info.Resolution == RdpProtocol.RDPResolutions.FitToWindow)
+				if (Info.Resolution == RdpResolutions.FitToWindow)
 				{
 					_icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, InterfaceControl.Size.Width, InterfaceControl.Size.Height, 0);
 				}
-				else if (InterfaceControl.Info.Resolution == RdpProtocol.RDPResolutions.SmartSize)
+				else if (Info.Resolution == RdpResolutions.SmartSize)
 				{
 					_icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, InterfaceControl.Size.Width, InterfaceControl.Size.Height, 0);
 				}
-				else if (InterfaceControl.Info.Resolution == RdpProtocol.RDPResolutions.Fullscreen)
+				else if (Info.Resolution == RdpResolutions.Fullscreen)
 				{
 					_icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, Screen.FromControl(_frmMain).Bounds.Width, Screen.FromControl(_frmMain).Bounds.Height, 0);
 					_icaClient.FullScreenWindow();
 				}
 				else
 				{
-					var resolution = RdpProtocol.GetResolutionRectangle(_info.Resolution);
+					var resolution = Info.Resolution.GetResolutionRectangle();
 					_icaClient.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, resolution.Width, resolution.Height, 0);
 				}
 			}
@@ -215,15 +214,15 @@ namespace mRemoteNG.Connection.Protocol.ICA
 		private void SetColors()
 		{
 		    // ReSharper disable once SwitchStatementMissingSomeCases
-			switch (_info.Colors)
+			switch (Info.Colors)
 			{
-				case RdpProtocol.RDPColors.Colors256:
+				case RdpColors.Colors256:
 					_icaClient.SetProp("DesiredColor", "2");
 					break;
-				case RdpProtocol.RDPColors.Colors15Bit:
+				case RdpColors.Colors15Bit:
 					_icaClient.SetProp("DesiredColor", "4");
 					break;
-				case RdpProtocol.RDPColors.Colors16Bit:
+				case RdpColors.Colors16Bit:
 					_icaClient.SetProp("DesiredColor", "4");
 					break;
 				default:
@@ -235,7 +234,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
 		private void SetSecurity()
 		{
 		    // ReSharper disable once SwitchStatementMissingSomeCases
-			switch (_info.ICAEncryptionStrength)
+			switch (Info.ICAEncryptionStrength)
 			{
 				case EncryptionStrength.Encr128BitLogonOnly:
 					_icaClient.Encrypt = true;
@@ -275,22 +274,22 @@ namespace mRemoteNG.Connection.Protocol.ICA
         #region Private Events & Handlers
 		private void ICAEvent_OnConnecting(object sender, EventArgs e)
 		{
-			Event_Connecting(this);
+			RaiseConnectionConnectingEvent(this);
 		}
 				
 		private void ICAEvent_OnConnected(object sender, EventArgs e)
 		{
-			Event_Connected(this);
+			RaiseConnectionConnectedEvent(this);
 		}
 				
 		private void ICAEvent_OnConnectFailed(object sender, EventArgs e)
 		{
-			Event_ErrorOccured(this, e.ToString());
+			RaiseErrorOccuredEvent(this, e.ToString());
 		}
 				
 		private void ICAEvent_OnDisconnect(object sender, EventArgs e)
 		{
-			Event_Disconnected(this, e.ToString());
+			RaiseConnectionDisconnectedEvent(this, e.ToString());
 					
 			if (Settings.Default.ReconnectOnDisconnect)
 			{
@@ -312,7 +311,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
         #region Reconnect Stuff
 		public void tmrReconnect_Elapsed(object sender, ElapsedEventArgs e)
 		{
-			var srvReady = PortScanner.IsPortOpen(_info.Hostname, Convert.ToString(_info.Port));
+			var srvReady = PortScanner.IsPortOpen(Info.Hostname, Convert.ToString(Info.Port));
 					
 			ReconnectGroup.ServerReady = srvReady;
 

mRemoteV1/Connection/Protocol/IntegratedProgram.cs

@@ -11,27 +11,30 @@ namespace mRemoteNG.Connection.Protocol
 {
 	public class IntegratedProgram : ProtocolBase
 	{
-        #region Private Fields
         private ExternalTool _externalTool;
         private IntPtr _handle;
         private Process _process;
-        #endregion
+
+	    public IntegratedProgram(ConnectionInfo connectionInfo)
+            : base(connectionInfo)
+	    {
+	    }
 
         #region Public Methods
 		public override bool Initialize()
 		{
-		    if (InterfaceControl.Info == null)
+		    if (Info == null)
 				return base.Initialize();
 
-		    _externalTool = Runtime.ExternalToolsService.GetExtAppByName(InterfaceControl.Info.ExtApp);
+		    _externalTool = Runtime.ExternalToolsService.GetExtAppByName(Info.ExtApp);
 
 			if (_externalTool == null)
 			{
-				Runtime.MessageCollector?.AddMessage(MessageClass.ErrorMsg, string.Format(Language.CouldNotFindExternalTool, InterfaceControl.Info.ExtApp));
+				Runtime.MessageCollector?.AddMessage(MessageClass.ErrorMsg, string.Format(Language.CouldNotFindExternalTool, Info.ExtApp));
 				return false;
 			}
 
-			_externalTool.ConnectionInfo = InterfaceControl.Info;
+			_externalTool.ConnectionInfo = Info;
 
 		    return base.Initialize();
 		}
@@ -44,7 +47,7 @@ namespace mRemoteNG.Connection.Protocol
 
                 if (_externalTool.TryIntegrate == false)
 				{
-					_externalTool.Start(InterfaceControl.Info);
+					_externalTool.Start(Info);
                     /* Don't call close here... There's nothing for the override to do in this case since 
                      * _process is not created in this scenario. When returning false, ProtocolBase.Close()
                      * will be called - which is just going to call IntegratedProgram.Close() again anyway...
@@ -169,7 +172,7 @@ namespace mRemoteNG.Connection.Protocol
         #region Private Methods
 		private void ProcessExited(object sender, EventArgs e)
 		{
-			Event_Closed(this);
+			RaiseConnectionClosedEvent(this);
 		}
         #endregion