fixed an incomplete merge

# Conflicts:
#	mRemoteV1/UI/Controls/MultiSshToolStrip.cs
#	mRemoteV1/UI/Forms/frmMain.cs
#	mRemoteV1/UI/Panels/PanelAdder.cs
#	mRemoteV1/UI/Window/ConnectionTreeWindow.cs

CHANGELOG.TXT

@@ -1,3 +1,92 @@
+1.77.0 (2018-xx-xx):
+
+Features/Enhancements:
+----------------------
+#1072: Russian translation improvements
+#1016: Chinese (simplified) translation improvements
+#928: Add context menu items to 'Close all but this' and 'Close all tabs to the right'
+
+
+1.76.11 (2018-10-18):
+
+Fixes:
+------
+#1139: Feature "Reconnect to previously opened sessions" not working
+#1136: Putty window not maximized
+
+
+1.76.10 (2018-10-07):
+
+Fixes:
+------
+#1124: Enabling themes causes an exception
+
+
+1.76.9 (2018-10-07):
+
+Fixes:
+------
+#1117: Duplicate panel created when "Reconnect on Startup" and "Create Empty Panel" settings enabled
+#1115: Exception when changing from xml data storage to SQL
+#1110: Pressing Delete button during connection rename attempts to delete the connection instead of the text
+#1106: Inheritance does not work when parent has C# default type set
+#1092: Invalid Cast Exceptions loading default connectioninfo 
+#1091: Minor themeing issues
+#853: Added some additional safety checks and logging to help address RDP crashes
+
+
+1.76.8 (2018-08-25):
+
+Fixes:
+------
+#1088: Delete and Launch buttons are not disabled when last external tool deleted
+#1087: 'Save connections after every edit' setting not honored
+#1082: Connections not given GUID if Id is empty in connection xml
+
+
+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:

CREDITS.TXT

@@ -24,6 +24,8 @@ github.com/pfjason
 github.com/sirLoaf
 github.com/Fyers
 Vladimir Semenov (github.com/sli-pro)
+Stephan (github.com/st-schuler)
+Aleksey Reytsman (github.com/areytsman)
 
 
 Past Contributors
@@ -62,6 +64,7 @@ Stefan (github.com/polluks)
 github.com/emazv72
 Vladimir Semenov (github.com/sli-pro)
 Marco Sousa (github.com/marcomsousa)
+github.com/wwj402
 
 
 Included Source Code

Jenkinsfile_publish.groovy

@@ -1,9 +1,13 @@
 node('windows') {
 	def jobDir = pwd()
 	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
-	def vsToolsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools"
+    def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
-	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 nunitTestAdapterPath = "C:\\Users\\Administrator\\AppData\\Local\\Microsoft\\VisualStudio\\14.0\\Extensions"
+    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"
 
 	
 	stage ('Clean output dir') {
@@ -32,24 +36,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 "\"${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\""
+                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\""
                 archiveArtifacts artifacts: "Release\\*.msi", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
             }
         
             stage ('Build mRemoteNG (Portable)') {
-                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\""
+                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\""
                 archiveArtifacts artifacts: "Release\\*.zip", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
             }
         }
     }
 	
-	stage ('Run Unit Tests (Normal - MSI)') {
+    stage ('Run Unit Tests (Normal - MSI)') {
-    	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /logger:trx /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\Release\\mRemoteNGTests.dll\""
+        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86"
-	}
+    }
-
+    
-	stage ('Run Unit Tests (Portable)') {
+    stage ('Run Unit Tests (Portable)') {
-    	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /logger:trx /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\Release Portable\\mRemoteNGTests.dll\""
+        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86"
-	}
+    }
 
     stage ('Generate UpdateCheck Files') {
         bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\create_upg_chk_files.ps1\" -TagName \"${env.TagName}\" -UpdateChannel \"${env.UpdateChannel}\""
@@ -58,11 +62,10 @@ node('windows') {
 	
     stage ('Publish to GitHub') {
         withCredentials([string(credentialsId: '5443a369-dbe8-42d3-b4e8-04d0b4e9039a', variable: 'GH_AUTH_TOKEN')]) {
-            def zipPath = "${jobDir}\\Release\\*.zip"
+            def releaseFolder = "${jobDir}\\Release"
-            def msiPath = "${jobDir}\\Release\\*.msi"
             // because batch files suck at handling newline characters, we have to convert to base64 in groovy and back to text in powershell
             def base64Description = env.ReleaseDescription.bytes.encodeBase64().toString()
-            bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ZipFilePath \"${zipPath}\" -MsiFilePath \"${msiPath}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded"
+            bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ReleaseFolderPath \"${releaseFolder}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded"
         }
     }
 }

Tools/7zip/License.txt

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

Tools/7zip/history.txt

@@ -1,6 +1,25 @@
 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 16.02
+7-Zip Extra 18.05
 -----------------
 
 7-Zip Extra is package of extra modules of 7-Zip. 
 
-7-Zip Copyright (C) 1999-2016 Igor Pavlov.
+7-Zip Copyright (C) 1999-2018 Igor Pavlov.
 
 7-Zip is free software. Read License.txt for more information about license.
 

Tools/github_functions.ps1

@@ -171,13 +171,27 @@ function Upload-GitHubReleaseAsset {
         [string]
         [Parameter(Mandatory=$true)]
         # The OAuth2 token to use for authentication.
-        $AuthToken
+        $AuthToken,
+
+        [string]
+        # A short description label for the asset
+        $Label = ""
     )
 
     $UploadUri = $UploadUri -replace "(\{[\w,\?]*\})$"
-    $file = Get-Item -Path $FilePath
+    $files = Get-Item -Path $FilePath
 
-    $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
+    $labelParam = ""
+    if ($Label -ne "") {
+        $labelParam = "&label=$Label"
+    }
+
+    # 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)$labelParam" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
+    }
 }
 
 

Tools/postbuild_mremotev1.ps1

@@ -46,4 +46,5 @@ Format-Table -AutoSize -Wrap -InputObject @{
 & "$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\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/publish_to_github.ps1

@@ -43,13 +43,8 @@ param (
 
     [string]
     [Parameter(Mandatory=$true)]
-    # Path to the zip file to upload with the release
+    # Path to the folder which contains release assets to upload
-    $ZipFilePath,
+    $ReleaseFolderPath,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    #Path to the msi file to upload with the release
-    $MsiFilePath,
 
     [string]
     [Parameter(Mandatory=$true)]
@@ -70,7 +65,17 @@ if ($DescriptionIsBase64Encoded) {
 . "$PSScriptRoot\github_functions.ps1"
 
 
+$releaseFolderItems = Get-ChildItem -Path $ReleaseFolderPath
+$mrngPortablePath = ($releaseFolderItems | ?{$_.Name -match "portable-[\d\.]+\.zip"}).FullName
+$mrngNormalPath = ($releaseFolderItems | ?{$_.Name -match "installer-[\d\.]+\.msi"}).FullName
+$mrngPortableSymbolsPath = ($releaseFolderItems | ?{$_.Name -match "mremoteng-portable-symbols-[\d\.]+\.zip"}).FullName
+$mrngNormalSymbolsPath = ($releaseFolderItems | ?{$_.Name -match "mremoteng-symbols-[\d\.]+\.zip"}).FullName
+
+
 $release = Publish-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseTitle $ReleaseTitle -TagName $TagName -TargetCommitish $TargetCommitish -Description $Description -IsDraft ([bool]::Parse($IsDraft)) -IsPrerelease ([bool]::Parse($IsPrerelease)) -AuthToken $AuthToken
-$zipUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $ZipFilePath -ContentType "application/zip" -AuthToken $AuthToken
+$zipUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngPortablePath -ContentType "application/zip" -AuthToken $AuthToken -Label "Portable Edition (zip)"
-$msiUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $MsiFilePath -ContentType "application/octet-stream" -AuthToken $AuthToken
+$msiUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngNormalPath -ContentType "application/octet-stream" -AuthToken $AuthToken -Label "Normal Edition (msi)"
+
+$portableEditionSymbols = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngPortableSymbolsPath -ContentType "application/zip" -AuthToken $AuthToken -Label "Portable Edition Debug Symbols"
+$normalEditionSymbols = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $mrngNormalSymbolsPath -ContentType "application/zip" -AuthToken $AuthToken -Label "Normal Edition Debug Symbols"
 Write-Output (Get-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseId $release.id -AuthToken $AuthToken)

Tools/tidy_files_for_release.ps1

@@ -15,7 +15,6 @@ 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/zip_portable_files.ps1

@@ -13,13 +13,49 @@ 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 -match "Release" -and $ConfigurationName -match "Portable") {
+if ($ConfigurationName -eq "Release Portable") {
     Write-Output "Packaging Release Portable ZIP"
-    & $path_packageZipScript
+   
+    $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"
 }
 else {
     Write-Output "We will not zip anything - this isnt a portable release build."

Tools/zip_portable_files_appv.ps1

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,56 @@
+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,10 +1,11 @@
-version: 1.0.{build}
+version: 1.76.{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:
@@ -14,7 +15,14 @@ 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
+    - mRemoteNGTests\bin\$(configuration)\mRemoteNGTests.dll
+artifacts:
+- path: Release\*.msi
+  name: mRemoteNG-installer.msi
+- path: Release\*.zip
+  name: mRemoteNG-portable.zip

mRemoteNGTests/AssemblyTestSetup.cs

@@ -0,0 +1,17 @@
+using System.Windows.Forms;
+using NUnit.Framework;
+
+
+// Dont put this in a namespace. Leaving it by itself tells NUnit
+// to run it on assembly load
+[SetUpFixture]
+public class AssemblyTestSetup
+{
+    [OneTimeSetUp]
+    public void AssemblySetup()
+    {
+        // ensure window options set before any test window created
+        Application.EnableVisualStyles();
+        Application.SetCompatibleTextRenderingDefault(false);
+    }
+}

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

@@ -1,13 +1,16 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using mRemoteNG.Config.Serializers;
+using System.Windows.Forms;
+using mRemoteNG.App;
+using mRemoteNG.Config.Putty;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
+using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
@@ -19,7 +22,10 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 
         public void Setup(string confCons, string password)
         {
-            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(password.ConvertToSecureString);
+            var connectionsService = new ConnectionsService(PuttySessionsManager.Instance, 
+                new Import(Substitute.For<IWin32Window>()), 
+                Substitute.For<IWin32Window>());
+            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(connectionsService, Substitute.For<IWin32Window>(), () => password.ConvertToSecureString());
             _connectionTreeModel = _xmlConnectionsDeserializer.Deserialize(confCons);
         }
 

mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs

@@ -5,6 +5,7 @@ using mRemoteNG.Connection;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 using mRemoteNGTests.TestHelpers;
+using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers
@@ -18,7 +19,7 @@ namespace mRemoteNGTests.Config.Serializers
         {
             var model = CreateConnectionTreeModel();
             var dataTable = CreateDataTable(model.RootNodes[0]);
-            _deserializer = new DataTableDeserializer();
+            _deserializer = new DataTableDeserializer(Substitute.For<IConnectionsService>());
             var output = _deserializer.Deserialize(dataTable);
             Assert.That(output.GetRecursiveChildList().Count(), Is.EqualTo(model.GetRecursiveChildList().Count()));
         }
@@ -27,7 +28,7 @@ namespace mRemoteNGTests.Config.Serializers
         public void WeCanDeserializeASingleEntry()
         {
             var dataTable = CreateDataTable(new ConnectionInfo());
-            _deserializer = new DataTableDeserializer();
+            _deserializer = new DataTableDeserializer(Substitute.For<IConnectionsService>());
             var output = _deserializer.Deserialize(dataTable);
             Assert.That(output.GetRecursiveChildList().Count(), Is.EqualTo(1));
         }

mRemoteNGTests/Connection/ConnectionInfoInheritanceTests.cs

@@ -1,8 +1,9 @@
 using mRemoteNG.Connection;
+using mRemoteNG.Container;
 using NUnit.Framework;
-using System.Reflection;
 using System.Collections;
 using System.Linq;
+using System.Reflection;
 
 namespace mRemoteNGTests.Connection
 {
@@ -74,6 +75,22 @@ namespace mRemoteNGTests.Connection
             Assert.That(hasEverythingInheritedProperty, Is.False);
         }
 
+        [Test]
+        public void AlwaysReturnInheritedValueIfRequested()
+        {
+            var expectedSetting = false;
+
+            var container = new ContainerInfo { AutomaticResize = expectedSetting };
+            var con1 = new ConnectionInfo
+            {
+                AutomaticResize = true,
+                Inheritance = {AutomaticResize = true}
+            };
+            container.AddChild(con1);
+
+            Assert.That(con1.AutomaticResize, Is.EqualTo(expectedSetting));
+        }
+
         private bool AllInheritancePropertiesAreTrue()
         {
             var allPropertiesTrue = true;

mRemoteNGTests/Connection/ConnectionInfoTests.cs

@@ -5,6 +5,7 @@ using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.SSH;
 using mRemoteNG.Container;
 using mRemoteNG.Tree.Root;
+using NSubstitute;
 using NUnit.Framework;
 
 
@@ -13,11 +14,13 @@ namespace mRemoteNGTests.Connection
 	public class ConnectionInfoTests
     {
         private ConnectionInfo _connectionInfo;
+        private IConnectionsService _connectionsService;
         private const string TestDomain = "somedomain";
 
         [SetUp]
         public void Setup()
         {
+            _connectionsService = Substitute.For<IConnectionsService>();
             _connectionInfo = new ConnectionInfo();
         }
 
@@ -43,6 +46,20 @@ 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()
         {
@@ -65,7 +82,7 @@ namespace mRemoteNGTests.Connection
         {
             var eventWasCalled = false;
             _connectionInfo.PropertyChanged += (sender, args) => eventWasCalled = true;
-            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionsService));
             Assert.That(eventWasCalled);
         }
 
@@ -74,7 +91,7 @@ namespace mRemoteNGTests.Connection
         {
             var nameOfModifiedProperty = "";
             _connectionInfo.PropertyChanged += (sender, args) => nameOfModifiedProperty = args.PropertyName;
-            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionsService));
             Assert.That(nameOfModifiedProperty, Is.EqualTo("OpenConnections"));
         }
 

mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs

@@ -1,31 +1,50 @@
-using System.Collections.ObjectModel;
+using System;
+using System.Security;
+using System.Threading;
+using System.Windows.Forms;
 using mRemoteNG.App;
+using mRemoteNG.App.Update;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Config.Putty;
+using mRemoteNG.Config.Settings;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Tools;
-using mRemoteNG.Tools.CustomCollections;
+using mRemoteNG.UI.Controls;
+using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Window;
+using NSubstitute;
 using NUnit.Framework;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNGTests.Connection.Protocol
 {
-	public class IntegratedProgramTests
+    public class IntegratedProgramTests
-	{
+    {
-		private readonly ExternalTool _extTool = new ExternalTool
+        private ExternalToolsService _externalToolsService;
-		{
+        private IConnectionInitiator _connectionInitiator;
-			DisplayName = "notepad",
-			FileName = @"%windir%\system32\notepad.exe",
-			Arguments = "",
-			TryIntegrate = true
-		};
 
-		
+        [OneTimeSetUp]
-		[Test]
+        public void OneTimeSetUp()
+        {
+            _connectionInitiator = Substitute.For<IConnectionInitiator>();
+            var extTool = new ExternalTool(_connectionInitiator, Substitute.For<IConnectionsService>())
+            {
+                DisplayName = "notepad",
+                FileName = @"%windir%\system32\notepad.exe",
+                Arguments = "",
+                TryIntegrate = true
+            };
+            _externalToolsService = new ExternalToolsService();
+            _externalToolsService.ExternalTools.Add(extTool);
+        }
+
+        [Test]
+		[Apartment(ApartmentState.STA)]
 		public void CanStartExternalApp()
 		{
-			SetExternalToolList(_extTool);
+			var sut = new IntegratedProgram(_externalToolsService, Substitute.For<IConnectionsService>());
-			var sut = new IntegratedProgram();
 			sut.InterfaceControl = BuildInterfaceControl("notepad", sut);
 			sut.Initialize();
 			var appStarted = sut.Connect();
@@ -34,23 +53,42 @@ namespace mRemoteNGTests.Connection.Protocol
 		}
 
 		[Test]
+		[Apartment(ApartmentState.STA)]
 		public void ConnectingToExternalAppThatDoesntExistDoesNothing()
 		{
-			SetExternalToolList(_extTool);
+			var sut = new IntegratedProgram(_externalToolsService, Substitute.For<IConnectionsService>());
-			var sut = new IntegratedProgram();
 			sut.InterfaceControl = BuildInterfaceControl("doesntExist", sut);
 			var appInitialized = sut.Initialize();
 			Assert.That(appInitialized, Is.False);
 		}
 
-		private void SetExternalToolList(ExternalTool externalTool)
-		{
-			Runtime.ExternalToolsService.ExternalTools = new FullyObservableCollection<ExternalTool> {externalTool};
-		}
-
 		private InterfaceControl BuildInterfaceControl(string extAppName, ProtocolBase sut)
 		{
-			var connectionWindow = new ConnectionWindow(new DockContent());
+            var frmMain = new FrmMain();
+            var import = new Import(Substitute.For<IWin32Window>());
+            var connectionsService = new ConnectionsService(PuttySessionsManager.Instance, import, frmMain);
+			var configWindow = new ConfigWindow(new DockContent(), connectionsService);
+			var sshTransferWindow = new SSHTransferWindow();
+			var connectionTreeWindow = new ConnectionTreeWindow(new DockContent(), _connectionInitiator, connectionsService);
+		    Func<SecureString> encryptionKeySelectionFunc = () => connectionsService.EncryptionKey;
+            var connectionTree = connectionTreeWindow.ConnectionTree;
+            var export = new Export(new CredentialRepositoryList(), connectionsService, frmMain);
+			var connectionTreeContextMenu = new ConnectionContextMenu(connectionTree, _connectionInitiator, sshTransferWindow, export, _externalToolsService, import, connectionsService);
+			connectionTreeWindow.ConnectionTreeContextMenu = connectionTreeContextMenu;
+			var errorAndInfoWindow = new ErrorAndInfoWindow(new DockContent(), new DockPanel(), connectionTreeWindow);
+			var screenshotManagerWindow = new ScreenshotManagerWindow(new DockContent(), new DockPanel());
+		    var shutdown = new Shutdown(new SettingsSaver(new ExternalToolsService()), new ConnectionsService(PuttySessionsManager.Instance, import, frmMain), frmMain);
+		    var appUpdater = new AppUpdater(encryptionKeySelectionFunc);
+		    Func<UpdateWindow> updateWindowBuilder = () => new UpdateWindow(new DockContent(), shutdown, appUpdater);
+            Func<NotificationAreaIcon> notificationAreaIconBuilder = () => new NotificationAreaIcon(frmMain, _connectionInitiator, shutdown, connectionsService);
+		    Func<ExternalToolsWindow> externalToolsWindowBuilder = () => new ExternalToolsWindow(_connectionInitiator, _externalToolsService, () => connectionTree.SelectedNode, frmMain, connectionsService);
+		    Func<PortScanWindow> portScanWindowBuilder = () => new PortScanWindow(connectionTreeWindow, import);
+		    Func<ActiveDirectoryImportWindow> activeDirectoryImportWindowBuilder = () => new ActiveDirectoryImportWindow(() => connectionTreeWindow.SelectedNode, import, connectionsService);
+		    var databaseConnectorFactory = new DatabaseConnectorFactory(encryptionKeySelectionFunc);
+            var windows = new Windows(_connectionInitiator, connectionTreeWindow, configWindow, errorAndInfoWindow, screenshotManagerWindow, 
+                sshTransferWindow, updateWindowBuilder, notificationAreaIconBuilder, externalToolsWindowBuilder, 
+                connectionsService, portScanWindowBuilder, activeDirectoryImportWindowBuilder, appUpdater, databaseConnectorFactory, frmMain);
+			var connectionWindow = new ConnectionWindow(new DockContent(), _connectionInitiator, windows, _externalToolsService, frmMain);
 			var connectionInfo = new ConnectionInfo {ExtApp = extAppName};
 			return new InterfaceControl(connectionWindow, sut, connectionInfo);
 		}

mRemoteNGTests/Connection/Protocol/ProtocolListTests.cs

@@ -1,9 +1,12 @@
 using System.Collections;
 using System.Collections.Specialized;
+using mRemoteNG.Config.Putty;
+using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.SSH;
 using mRemoteNG.Connection.Protocol.Telnet;
 using mRemoteNG.Connection.Protocol.VNC;
+using NSubstitute;
 using NUnit.Framework;
 
 
@@ -20,9 +23,10 @@ namespace mRemoteNGTests.Connection.Protocol
         [SetUp]
         public void Setup()
         {
+            var connectionService = Substitute.For<IConnectionsService>();
             _protocolList = new ProtocolList();
-            _protocol1 = new ProtocolTelnet();
+            _protocol1 = new ProtocolTelnet(connectionService);
-            _protocol2 = new ProtocolSSH2();
+            _protocol2 = new ProtocolSSH2(connectionService);
             _protocol3 = new ProtocolVNC();
         }
 

mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs

@@ -1,5 +1,8 @@
-using System.Linq;
+using System;
-using mRemoteNG.Config.Serializers;
+using System.Linq;
+using System.Windows.Forms;
+using mRemoteNG.App;
+using mRemoteNG.Config.Putty;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
@@ -7,6 +10,7 @@ using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using NSubstitute;
 using NUnit.Framework;
 
 
@@ -29,20 +33,20 @@ namespace mRemoteNGTests.IntegrationTests
                 _originalModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());
             _serializer = new XmlConnectionsSerializer(cryptoProvider, nodeSerializer);
+            var mockWindow = Substitute.For<IWin32Window>();
+            _deserializer = new XmlConnectionsDeserializer(new ConnectionsService(PuttySessionsManager.Instance, new Import(mockWindow), mockWindow), mockWindow);
         }
 
         [TearDown]
         public void Teardown()
         {
             _serializer = null;
-            _deserializer = null;
         }
 
         [Test]
         public void SerializeThenDeserialize()
         {
             var serializedContent = _serializer.Serialize(_originalModel);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
             var nodeNamesFromOriginalModel = _originalModel.GetRecursiveChildList().Select(node => node.Name);
@@ -54,7 +58,6 @@ namespace mRemoteNGTests.IntegrationTests
         {
             _serializer.UseFullEncryption = true;
             var serializedContent = _serializer.Serialize(_originalModel);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
             var nodeNamesFromOriginalModel = _originalModel.GetRecursiveChildList().Select(node => node.Name);
@@ -66,7 +69,6 @@ namespace mRemoteNGTests.IntegrationTests
         {
             var originalConnectionInfo = new ConnectionInfo {Name = "con1", Description = "£°úg¶┬ä" };
             var serializedContent = _serializer.Serialize(originalConnectionInfo);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var deserializedConnectionInfo = deserializedModel.GetRecursiveChildList().First(node => node.Name == originalConnectionInfo.Name);
             Assert.That(deserializedConnectionInfo.Description, Is.EqualTo(originalConnectionInfo.Description));
@@ -84,13 +86,26 @@ namespace mRemoteNGTests.IntegrationTests
                 new SaveFilter());
             _serializer = new XmlConnectionsSerializer(cryptoProvider, nodeSerializer);
             var serializedContent = _serializer.Serialize(_originalModel);
-            _deserializer = new XmlConnectionsDeserializer();
             var deserializedModel = _deserializer.Deserialize(serializedContent);
             var nodeNamesFromDeserializedModel = deserializedModel.GetRecursiveChildList().Select(node => node.Name);
             var nodeNamesFromOriginalModel = _originalModel.GetRecursiveChildList().Select(node => node.Name);
             Assert.That(nodeNamesFromDeserializedModel, Is.EquivalentTo(nodeNamesFromOriginalModel));
         }
 
+        [Test]
+        public void GuidCreatedIfNonExistedInXml()
+        {
+            var originalConnectionInfo = new ConnectionInfo { Name = "con1" };
+            var serializedContent = _serializer.Serialize(originalConnectionInfo);
+
+            // remove GUID from connection xml
+            serializedContent = serializedContent.Replace(originalConnectionInfo.ConstantID, "");
+
+            var deserializedModel = _deserializer.Deserialize(serializedContent);
+            var deserializedConnectionInfo = deserializedModel.GetRecursiveChildList().First(node => node.Name == originalConnectionInfo.Name);
+            Assert.That(Guid.TryParse(deserializedConnectionInfo.ConstantID, out var guid));
+        }
+
 
         private ConnectionTreeModel SetupConnectionTreeModel()
         {
@@ -127,4 +142,4 @@ namespace mRemoteNGTests.IntegrationTests
             return connectionTreeModel;
         }
     }
-}
+}

mRemoteNGTests/Security/Authentication/PasswordAuthenticatorTests.cs

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

mRemoteNGTests/TestHelpers/ConnectionInfoHelpers.cs

@@ -8,7 +8,7 @@ using mRemoteNG.Connection.Protocol.VNC;
 
 namespace mRemoteNGTests.TestHelpers
 {
-	internal class ConnectionInfoHelpers
+    internal static class ConnectionInfoHelpers
 	{
 		private static readonly Random _random = new Random();
 
@@ -128,5 +128,5 @@ namespace mRemoteNGTests.TestHelpers
 			var values = Enum.GetValues(typeof(T));
 			return (T)values.GetValue(_random.Next(values.Length));
 		}
-	}
+    }
 }

mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs

@@ -40,7 +40,8 @@
 		public TType RedirectKeys { get; set; }
 		public TType RedirectDiskDrives { get; set; }
 		public TType RedirectPrinters { get; set; }
-		public TType RedirectPorts { get; set; }
+        public TType RedirectClipboard { get; set; }
+        public TType RedirectPorts { get; set; }
 		public TType RedirectSmartCards { get; set; }
 		public TType RedirectSound { get; set; }
 		public TType SoundQuality { get; set; }

mRemoteNGTests/Tools/ExternalToolsArgumentParserTests.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using mRemoteNG.Connection;
 using mRemoteNG.Tools;
+using NSubstitute;
 using NUnit.Framework;
 
 
@@ -34,7 +35,7 @@ namespace mRemoteNGTests.Tools
                 MacAddress = TestString,
                 UserField = TestString
             };
-            _argumentParser = new ExternalToolArgumentParser(connectionInfo);
+            _argumentParser = new ExternalToolArgumentParser(connectionInfo, Substitute.For<IConnectionsService>());
         }
 
         [OneTimeTearDown]
@@ -52,7 +53,7 @@ namespace mRemoteNGTests.Tools
         [Test]
         public void NullConnectionInfoResultsInEmptyVariables()
         {
-            var parser = new ExternalToolArgumentParser(null);
+            var parser = new ExternalToolArgumentParser(null, Substitute.For<IConnectionsService>());
             var parsedText = parser.ParseArguments("test %USERNAME% test");
             Assert.That(parsedText, Is.EqualTo("test  test"));
         }

mRemoteNGTests/Tools/Registry/WindowsRegistryTests.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Linq;
+using mRemoteNG.Tools.WindowsRegistry;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Tools.Registry
+{
+    public class WindowsRegistryTests
+    {
+        private WindowsRegistry _registry;
+
+        [SetUp]
+        public void Setup()
+        {
+            _registry = new WindowsRegistry();
+        }
+
+        [Test]
+        public void CanGetSubkeyNames()
+        {
+            var subKeyNames = _registry.GetSubKeyNames(RegistryHive.CurrentUser, "Software");
+            Assert.That(subKeyNames, Does.Contain("Microsoft"));
+        }
+
+        [Test]
+        public void GetSubkeyNamesThrowsIfGivenNullKeyPath()
+        {
+            Assert.Throws<ArgumentNullException>(() => _registry.GetSubKeyNames(RegistryHive.CurrentUser, null));
+        }
+
+        [Test]
+        public void CanGetKeyValue()
+        {
+            var keyValue = _registry.GetKeyValue(RegistryHive.ClassesRoot, @".dll\PersistentHandler", "");
+            Assert.That(keyValue.FirstOrDefault(), Is.EqualTo("{098f2470-bae0-11cd-b579-08002b30bfeb}"));
+        }
+
+        [Test]
+        public void GetKeyValueThrowsIfGivenNullKeyPath()
+        {
+            Assert.Throws<ArgumentNullException>(() => _registry.GetKeyValue(RegistryHive.CurrentUser, null, ""));
+        }
+
+        [Test]
+        public void GetKeyValueThrowsIfGivenNullPropertyName()
+        {
+            Assert.Throws<ArgumentNullException>(() => _registry.GetKeyValue(RegistryHive.CurrentUser, "", null));
+        }
+    }
+}

mRemoteNGTests/Tree/RootNodeInfoTests.cs

@@ -1,4 +1,5 @@
-using mRemoteNG.Tree.Root;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
 using NUnit.Framework;
 
 
@@ -46,5 +47,13 @@ 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

@@ -0,0 +1,202 @@
+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/Controls/ExternalToolsToolStripTests.cs

@@ -0,0 +1,49 @@
+using System;
+using mRemoteNG.Connection;
+using mRemoteNG.Tools;
+using mRemoteNG.UI.Controls;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.UI.Controls
+{
+    public class ExternalToolsToolStripTests
+    {
+        private ExternalToolsToolStrip _externalToolsToolStrip;
+
+        [SetUp]
+        public void Setup()
+        {
+            _externalToolsToolStrip = new ExternalToolsToolStrip();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _externalToolsToolStrip.Dispose();
+        }
+
+        [Test]
+        public void SettingExternalToolsServiceToNullThrowsException()
+        {
+            Assert.Throws<ArgumentNullException>(() => _externalToolsToolStrip.ExternalToolsService = null);
+        }
+
+        [Test]
+        public void AddExternalToolsToToolBarCreatesControlsForAllExternalTools()
+        {
+            var externaltoolsService = new ExternalToolsService();
+            externaltoolsService.ExternalTools.Add(BuildExternalTool());
+            externaltoolsService.ExternalTools.Add(BuildExternalTool());
+
+            _externalToolsToolStrip.ExternalToolsService = externaltoolsService;
+            _externalToolsToolStrip.AddExternalToolsToToolBar();
+            Assert.That(_externalToolsToolStrip.Items.Count, Is.EqualTo(2));
+        }
+
+        private ExternalTool BuildExternalTool()
+        {
+            return new ExternalTool(Substitute.For<IConnectionInitiator>(), Substitute.For<IConnectionsService>());
+        }
+    }
+}

mRemoteNGTests/UI/Controls/TextBoxExtensionsTestForm.cs

@@ -6,7 +6,6 @@ namespace mRemoteNGTests.UI.Controls
     {
         public TextBoxExtensionsTestForm()
         {
-            Application.EnableVisualStyles();
             InitializeComponent();
         }
     }

mRemoteNGTests/UI/Controls/TextBoxExtensionsTests.cs

@@ -30,7 +30,8 @@ namespace mRemoteNGTests.UI.Controls
         {
             const string text = "Type Here";
             var textBox = new TextBoxTester(_textBoxExtensionsTestForm.textBox1.Name);
-            Assert.That(textBox.Properties.SetCueBannerText(text), Is.True);
+            var textWasSet = textBox.Properties.SetCueBannerText(text);
+            Assert.That(textWasSet, Is.True);
         }
 
         [Test]

mRemoteNGTests/UI/Forms/FrmMainTests.cs

@@ -0,0 +1,16 @@
+using System.Threading;
+using mRemoteNG.UI.Forms;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.UI.Forms
+{
+    public class FrmMainTests
+    {
+        [Test]
+        [Apartment(ApartmentState.STA)]
+        public void CanCreateFrmMain()
+        {
+            var frmMain = new FrmMain();
+        }
+    }
+}

mRemoteNGTests/UI/Forms/OptionsFormSetupAndTeardown.cs

@@ -1,9 +1,24 @@
-using NUnit.Framework;
+using System;
+using System.Security;
+using System.Windows.Forms;
+using System.Xml.Linq;
+using mRemoteNG.App;
+using mRemoteNG.App.Update;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Config.Putty;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Settings;
+using mRemoteNG.Connection;
+using mRemoteNG.Security;
+using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
+using NSubstitute;
+using NUnit.Framework;
 
 namespace mRemoteNGTests.UI.Forms
 {
-    public class OptionsFormSetupAndTeardown
+	public class OptionsFormSetupAndTeardown
     {
         protected frmOptions _optionsForm;
 
@@ -15,7 +30,16 @@ namespace mRemoteNGTests.UI.Forms
         [SetUp]
         public void Setup()
         {
-            _optionsForm = new frmOptions();
+            var frmMain = new FrmMain();
+	        var connectionInitiator = Substitute.For<IConnectionInitiator>();
+            var import = new Import(Substitute.For<IWin32Window>());
+            var shutdown = new Shutdown(new SettingsSaver(new ExternalToolsService()), new ConnectionsService(PuttySessionsManager.Instance, import, frmMain), frmMain);
+            var connectionsService = new ConnectionsService(PuttySessionsManager.Instance, import, frmMain);
+            Func<NotificationAreaIcon> notificationIconBuilder = () => new NotificationAreaIcon(frmMain, connectionInitiator, shutdown, connectionsService);
+            Func<SecureString> encryptionKeySelectionFunc = () => connectionsService.EncryptionKey;
+            var databaseConnectorFactory = new DatabaseConnectorFactory(encryptionKeySelectionFunc);
+            var appUpdater = new AppUpdater(encryptionKeySelectionFunc);
+            _optionsForm = new frmOptions(connectionInitiator, type => {}, notificationIconBuilder, connectionsService, appUpdater, databaseConnectorFactory, frmMain);
             _optionsForm.Show();
         }
 

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs

@@ -0,0 +1,227 @@
+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 NSubstitute;
+using NUnit.Framework;
+using WeifenLuo.WinFormsUI.Docking;
+
+namespace mRemoteNGTests.UI.Window.ConfigWindowTests
+{
+    public class ConfigWindowGeneralTests
+    {
+        private ConfigWindow _configWindow;
+
+        [SetUp]
+        public void Setup()
+        {
+            _configWindow = new ConfigWindow(new DockContent(), Substitute.For<IConnectionsService>())
+            {
+                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.RedirectClipboard),
+                        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

@@ -0,0 +1,73 @@
+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

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.UI.Window;
+using NSubstitute;
+using NUnit.Framework;
+using WeifenLuo.WinFormsUI.Docking;
+
+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(new DockContent(), Substitute.For<IConnectionsService>())
+            {
+                PropertiesVisible = true,
+            };
+        }
+
+        public void RunVerification()
+        {
+            ConfigWindow.SelectedTreeNode = ConnectionInfo;
+            Assert.That(
+                ConfigWindow.VisibleObjectProperties,
+                Is.EquivalentTo(ExpectedPropertyList));
+        }
+    }
+}

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowVncSpecialTests.cs

@@ -0,0 +1,37 @@
+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/UI/Window/ConnectionTreeWindowTests.cs

@@ -1,19 +1,38 @@
-using System.Threading;
+using System.Security;
+using System.Threading;
+using System.Windows.Forms;
+using mRemoteNG.App;
+using mRemoteNG.Config.Putty;
+using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Connection;
+using mRemoteNG.Credential.Repositories;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tools;
+using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Window;
+using NSubstitute;
 using NUnit.Framework;
 using WeifenLuo.WinFormsUI.Docking;
 
-
 namespace mRemoteNGTests.UI.Window
 {
-    public class ConnectionTreeWindowTests
+	public class ConnectionTreeWindowTests
     {
         private ConnectionTreeWindow _connectionTreeWindow;
 
         [SetUp]
         public void Setup()
         {
-            _connectionTreeWindow = new ConnectionTreeWindow(new DockContent());
+	        var connectionInitiator = Substitute.For<IConnectionInitiator>();
+	        var connectionTree = new ConnectionTree();
+			var sshTransferWindow = new SSHTransferWindow();
+            var externalToolsService = new ExternalToolsService();
+            var import = new Import(Substitute.For<IWin32Window>());
+            var connectionsService = new ConnectionsService(PuttySessionsManager.Instance, import, connectionTree);
+            var export = new Export(new CredentialRepositoryList(), connectionsService, connectionTree);
+            var connectionContextMenu = new ConnectionContextMenu(connectionTree, connectionInitiator, sshTransferWindow, export, externalToolsService, import, connectionsService);
+            _connectionTreeWindow = new ConnectionTreeWindow(new DockContent(), connectionInitiator, connectionsService) {ConnectionTreeContextMenu = connectionContextMenu};
         }
 
         [TearDown]

mRemoteNGTests/mRemoteNGTests.csproj

@@ -109,6 +109,7 @@
   </Choose>
   <ItemGroup>
     <Compile Include="App\UpdaterTests.cs" />
+    <Compile Include="AssemblyTestSetup.cs" />
     <Compile Include="BinaryFileTests.cs" />
     <Compile Include="Config\Connections\Multiuser\ConnectionsUpdateAvailableEventArgsTests.cs" />
     <Compile Include="Config\DataProviders\FileBackupCreatorTests.cs" />
@@ -178,6 +179,7 @@
     <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
     <Compile Include="Tools\FullyObservableCollectionTests.cs" />
     <Compile Include="Tools\OptionalTests.cs" />
+    <Compile Include="Tools\Registry\WindowsRegistryTests.cs" />
     <Compile Include="Tree\ClickHandlers\TreeNodeCompositeClickHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeDragAndDropHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeModelTests.cs" />
@@ -207,6 +209,8 @@
     <Compile Include="Tree\RootNodeInfoTests.cs" />
     <Compile Include="Tree\ClickHandlers\SwitchToConnectionClickHandlerTests.cs" />
     <Compile Include="Tree\SelectedConnectionDeletionConfirmerTests.cs" />
+    <Compile Include="UI\Controls\ExternalToolsToolStripTests.cs" />
+    <Compile Include="UI\Controls\ConnectionTreeTests.cs" />
     <Compile Include="UI\Controls\PageSequenceTests.cs" />
     <Compile Include="UI\Controls\SecureTextBoxTestForm.cs">
       <SubType>Form</SubType>
@@ -228,9 +232,14 @@
       <DependentUpon>TextBoxExtensionsTestForm.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Controls\TextBoxExtensionsTests.cs" />
+    <Compile Include="UI\Forms\FrmMainTests.cs" />
     <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,16 +33,19 @@ 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 Portable|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 Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release|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
@@ -50,24 +53,26 @@ 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 Portable|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 Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|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 = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|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
@@ -77,7 +82,6 @@ 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
@@ -86,8 +90,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 Portable|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 Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release|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/CompatibilityChecker.cs

@@ -6,25 +6,35 @@ using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 using mRemoteNG.Messages;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.App
 {
-    public static class CompatibilityChecker
+    public class CompatibilityChecker
     {
-        public static void CheckCompatibility(MessageCollector messageCollector)
+        private readonly MessageCollector _messageCollector;
+        private readonly IWin32Window _dialogWindowParent;
+
+        public CompatibilityChecker(MessageCollector messageCollector, IWin32Window dialogWindowParent)
         {
-            CheckFipsPolicy(messageCollector);
+            _messageCollector = messageCollector.ThrowIfNull(nameof(messageCollector));
-            CheckLenovoAutoScrollUtility(messageCollector);
+            _dialogWindowParent = dialogWindowParent.ThrowIfNull(nameof(dialogWindowParent));
         }
 
-        private static void CheckFipsPolicy(MessageCollector messageCollector)
+        public void CheckCompatibility()
         {
-            messageCollector.AddMessage(MessageClass.InformationMsg, "Checking FIPS Policy...", true);
+            CheckFipsPolicy();
+            CheckLenovoAutoScrollUtility();
+        }
+
+        private void CheckFipsPolicy()
+        {
+            _messageCollector.AddMessage(MessageClass.InformationMsg, "Checking FIPS Policy...", true);
             if (!FipsPolicyEnabledForServer2003() && !FipsPolicyEnabledForServer2008AndNewer()) return;
             var errorText = string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName,
                 GeneralAppInfo.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
-            messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);
+            _messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);
-            MessageBox.Show(FrmMain.Default, errorText);
+            MessageBox.Show(_dialogWindowParent, errorText);
             Environment.Exit(1);
         }
 
@@ -46,9 +56,9 @@ namespace mRemoteNG.App
             return (int)fipsPolicy != 0;
         }
 
-        private static void CheckLenovoAutoScrollUtility(MessageCollector messageCollector)
+        private void CheckLenovoAutoScrollUtility()
         {
-            messageCollector.AddMessage(MessageClass.InformationMsg, "Checking Lenovo AutoScroll Utility...", true);
+            _messageCollector.AddMessage(MessageClass.InformationMsg, "Checking Lenovo AutoScroll Utility...", true);
 
             if (!Settings.Default.CompatibilityWarnLenovoAutoScrollUtility)
                 return;
@@ -60,7 +70,7 @@ namespace mRemoteNG.App
             }
             catch (InvalidOperationException ex)
             {
-                messageCollector.AddExceptionMessage("Error in CheckLenovoAutoScrollUtility", ex);
+                _messageCollector.AddExceptionMessage("Error in CheckLenovoAutoScrollUtility", ex);
             }
 
             if (proccesses.Length <= 0) return;

mRemoteV1/App/Export.cs

@@ -8,8 +8,10 @@ using mRemoteNG.Config.Serializers.Csv;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
+using mRemoteNG.Credential;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using mRemoteNG.UI.Forms;
@@ -17,9 +19,20 @@ using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
-	public static class Export
+	public class Export
 	{
-		public static void ExportToFile(ConnectionInfo selectedNode, ConnectionTreeModel connectionTreeModel)
+	    private readonly IConnectionsService _connectionsService;
+	    private readonly ICredentialRepositoryList _credentialRepositoryList;
+	    private readonly IWin32Window _dialogWindowParent;
+
+	    public Export(ICredentialRepositoryList credentialRepositoryList, IConnectionsService connectionsService, IWin32Window dialogWindowParent)
+	    {
+	        _credentialRepositoryList = credentialRepositoryList.ThrowIfNull(nameof(credentialRepositoryList));
+	        _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+	        _dialogWindowParent = dialogWindowParent.ThrowIfNull(nameof(dialogWindowParent));
+	    }
+
+		public void ExportToFile(ConnectionInfo selectedNode, ConnectionTreeModel connectionTreeModel)
 		{
 			try
 			{
@@ -36,7 +49,7 @@ namespace mRemoteNG.App
 						exportForm.SelectedConnection = selectedNode;
 					}
 						
-					if (exportForm.ShowDialog(FrmMain.Default) != DialogResult.OK)
+					if (exportForm.ShowDialog(_dialogWindowParent) != DialogResult.OK)
 						return;
 
 				    ConnectionInfo exportTarget;
@@ -69,7 +82,7 @@ namespace mRemoteNG.App
 			}
 		}
 			
-		private static void SaveExportFile(string fileName, SaveFormat saveFormat, SaveFilter saveFilter, ConnectionInfo exportTarget)
+		private void SaveExportFile(string fileName, SaveFormat saveFormat, SaveFilter saveFilter, ConnectionInfo exportTarget)
 		{
 			try
 			{
@@ -79,14 +92,14 @@ namespace mRemoteNG.App
 			        case SaveFormat.mRXML:
                         var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
 			            var rootNode = exportTarget.GetRootParent() as RootNodeInfo;
-                        var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
+                        var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
                             cryptographyProvider, 
                             rootNode?.PasswordString.ConvertToSecureString() ?? new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString(),
                             saveFilter);
 			            serializer = new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer);
 			            break;
 			        case SaveFormat.mRCSV:
-			            serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter, Runtime.CredentialProviderCatalog);
+			            serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter, _credentialRepositoryList);
                         break;
 			        default:
 			            throw new ArgumentOutOfRangeException(nameof(saveFormat), saveFormat, null);
@@ -101,7 +114,7 @@ namespace mRemoteNG.App
 			}
 			finally
 			{
-			    Runtime.ConnectionsService.RemoteConnectionsSyncronizer?.Enable();
+			    _connectionsService.RemoteConnectionsSyncronizer?.Enable();
 			}
 		}
 	}

mRemoteV1/App/Import.cs

@@ -3,15 +3,26 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using mRemoteNG.Config.Import;
+using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.App
 {
-    public static class Import
+    public class Import
     {
-        public static void ImportFromFile(ContainerInfo importDestinationContainer)
+        private readonly IWin32Window _dialogWindowParent;
+
+        public Import(IWin32Window dialogWindowParent)
+        {
+            _dialogWindowParent = dialogWindowParent.ThrowIfNull(nameof(dialogWindowParent));
+        }
+
+        // TODO - this is only a property to break up a circular dependency. move this to ctor when able
+        public IConnectionsService ConnectionsService { get; set; }
+
+        public void ImportFromFile(ContainerInfo importDestinationContainer)
         {
             try
             {
@@ -50,7 +61,7 @@ namespace mRemoteNG.App
                         }
                     }
 
-                    Runtime.ConnectionsService.SaveConnectionsAsync();
+                    ConnectionsService.SaveConnectionsAsync();
                 }
             }
             catch (Exception ex)
@@ -59,12 +70,12 @@ namespace mRemoteNG.App
             }
         }
 
-        public static void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOu)
+        public void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOu)
         {
             try
             {
                 ActiveDirectoryImporter.Import(ldapPath, importDestinationContainer, importSubOu);
-                Runtime.ConnectionsService.SaveConnectionsAsync();
+                ConnectionsService.SaveConnectionsAsync();
             }
             catch (Exception ex)
             {
@@ -72,13 +83,13 @@ namespace mRemoteNG.App
             }
         }
 
-        public static void ImportFromPortScan(IEnumerable<ScanHost> hosts, ProtocolType protocol, ContainerInfo importDestinationContainer)
+        public void ImportFromPortScan(IEnumerable<ScanHost> hosts, ProtocolType protocol, ContainerInfo importDestinationContainer)
         {
             try
             {
                 var importer = new PortScanImporter(protocol);
                 importer.Import(hosts, importDestinationContainer);
-                Runtime.ConnectionsService.SaveConnectionsAsync();
+                ConnectionsService.SaveConnectionsAsync();
             }
             catch (Exception ex)
             {
@@ -86,14 +97,14 @@ namespace mRemoteNG.App
             }
         }
 
-        private static IConnectionImporter<string> BuildConnectionImporterFromFileExtension(string fileName)
+        private IConnectionImporter<string> BuildConnectionImporterFromFileExtension(string fileName)
         {
             // TODO: Use the file contents to determine the file type instead of trusting the extension
             var extension = Path.GetExtension(fileName) ?? "";
             switch (extension.ToLowerInvariant())
             {
                 case ".xml":
-                    return new MRemoteNGXmlImporter();
+                    return new MRemoteNGXmlImporter(ConnectionsService, _dialogWindowParent);
                 case ".csv":
                     return new MRemoteNGCsvImporter();
                 case ".rdp":

mRemoteV1/App/Initialization/CredsAndConsSetup.cs

@@ -1,18 +1,24 @@
-using System.IO;
+using mRemoteNG.Connection;
-using mRemoteNG.Config.Connections;
+using mRemoteNG.Tools;
+using System.IO;
 
 namespace mRemoteNG.App.Initialization
 {
-	public class CredsAndConsSetup
+    public class CredsAndConsSetup
-    {
+	{
-        public void LoadCredsAndCons()
+	    private readonly IConnectionsService _connectionsService;
+
+	    public CredsAndConsSetup(IConnectionsService connectionsService)
+	    {
+	        _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+	    }
+
+	    public void LoadCredsAndCons()
         {
-            new SaveConnectionsOnEdit(Runtime.ConnectionsService);
+            if (Settings.Default.FirstStart && !Settings.Default.LoadConsFromCustomLocation && !File.Exists(_connectionsService.GetStartupConnectionFileName()))
+                _connectionsService.NewConnectionsFile(_connectionsService.GetStartupConnectionFileName());
 
-            if (Settings.Default.FirstStart && !Settings.Default.LoadConsFromCustomLocation && !File.Exists(Runtime.ConnectionsService.GetStartupConnectionFileName()))
+            _connectionsService.LoadConnections();
-                Runtime.ConnectionsService.NewConnectionsFile(Runtime.ConnectionsService.GetStartupConnectionFileName());
-
-            Runtime.LoadConnections();
         }
     }
 }

mRemoteV1/App/Initialization/MessageCollectorSetup.cs

@@ -3,10 +3,13 @@ using System.Linq;
 using mRemoteNG.Messages;
 using mRemoteNG.Messages.MessageWriters;
 using mRemoteNG.Messages.WriterDecorators;
+using mRemoteNG.Tools;
+using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.Window;
 
 namespace mRemoteNG.App.Initialization
 {
-    public class MessageCollectorSetup
+	public class MessageCollectorSetup
     {
         public static void SetupMessageCollector(MessageCollector messageCollector, IList<IMessageWriter> messageWriterList)
         {
@@ -19,13 +22,13 @@ namespace mRemoteNG.App.Initialization
             };
         }
 
-        public static void BuildMessageWritersFromSettings(IList<IMessageWriter> messageWriterList)
+        public static void BuildMessageWritersFromSettings(IList<IMessageWriter> messageWriterList, FrmMain frmMain, ErrorAndInfoWindow errorAndInfoWindow)
         {
 #if DEBUG
             messageWriterList.Add(BuildDebugConsoleWriter());
 #endif
             messageWriterList.Add(BuildTextLogMessageWriter());
-            messageWriterList.Add(BuildNotificationPanelMessageWriter());
+            messageWriterList.Add(BuildNotificationPanelMessageWriter(frmMain, errorAndInfoWindow));
             messageWriterList.Add(BuildPopupMessageWriter());
         }
 
@@ -42,16 +45,17 @@ namespace mRemoteNG.App.Initialization
             );
         }
 
-        private static IMessageWriter BuildNotificationPanelMessageWriter()
+        private static IMessageWriter BuildNotificationPanelMessageWriter(FrmMain frmMain, ErrorAndInfoWindow errorAndInfoWindow)
         {
-            
+	        errorAndInfoWindow.ThrowIfNull(nameof(errorAndInfoWindow));
-            return new OnlyLogMessageFilter(
+			return new OnlyLogMessageFilter(
                 new MessageTypeFilterDecorator(
                     new NotificationPanelMessageFilteringOptions(),
                     new MessageFocusDecorator(
-                        Windows.ErrorsForm,
+                        frmMain,
+                        errorAndInfoWindow,
                         new NotificationPanelSwitchOnMessageFilteringOptions(),
-                        new NotificationPanelMessageWriter(Windows.ErrorsForm)
+                        new NotificationPanelMessageWriter(errorAndInfoWindow)
                     )
                 )
             );

mRemoteV1/App/ProgramRoot.cs

@@ -26,7 +26,8 @@ namespace mRemoteNG.App
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(FrmMain.Default);
+            var frmMain = new FrmMain();
+            Application.Run(frmMain);
         }
 
         public static void CloseSingletonInstanceMutex()

mRemoteV1/App/Runtime.cs

@@ -1,26 +1,11 @@
-using System;
-using System.IO;
-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;
-using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Messages;
-using mRemoteNG.Security;
 using mRemoteNG.Tools;
-using mRemoteNG.Tree.Root;
-using mRemoteNG.UI;
-using mRemoteNG.UI.Forms;
-using mRemoteNG.UI.TaskDialog;
 
 namespace mRemoteNG.App
 {
-	public static class Runtime
+	public class Runtime
     {
         public static bool IsPortableEdition
         {
@@ -34,171 +19,7 @@ namespace mRemoteNG.App
             }
         }
 
-        public static WindowList WindowList { get; set; }
         public static MessageCollector MessageCollector { get; } = new MessageCollector();
         public static NotificationAreaIcon NotificationAreaIcon { get; set; }
-        public static ExternalToolsService ExternalToolsService { get; } = new ExternalToolsService();
-        public static SecureString EncryptionKey { get; set; } = new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString();
-        public static ICredentialRepositoryList CredentialProviderCatalog { get; } = new CredentialRepositoryList();
-        public static ConnectionsService ConnectionsService { get; } = new ConnectionsService(PuttySessionsManager.Instance);
-
-        #region Connections Loading/Saving
-        public static void LoadConnectionsAsync()
-        {
-            _withDialog = false;
-
-            var t = new Thread(LoadConnectionsBGd);
-            t.SetApartmentState(ApartmentState.STA);
-            t.Start();
-        }
-
-        private static bool _withDialog;
-        private static void LoadConnectionsBGd()
-        {
-            LoadConnections(_withDialog);
-        }
-
-        public static void LoadConnections(bool withDialog = false)
-        {
-            var connectionFileName = "";
-
-            try
-            {
-                // disable sql update checking while we are loading updates
-                ConnectionsService.RemoteConnectionsSyncronizer?.Disable();
-
-                if (!Settings.Default.UseSQLServer)
-                {
-                    if (withDialog)
-                    {
-                        var loadDialog = DialogFactory.BuildLoadConnectionsDialog();
-                        if (loadDialog.ShowDialog() != DialogResult.OK) return;
-                        connectionFileName = loadDialog.FileName;
-                    }
-                    else
-                    {
-                        connectionFileName = ConnectionsService.GetStartupConnectionFileName();
-                    }
-
-                    var backupFileCreator = new FileBackupCreator();
-                    backupFileCreator.CreateBackupFile(connectionFileName);
-
-                    var backupPruner = new FileBackupPruner();
-                    backupPruner.PruneBackupFiles(connectionFileName);
-                }
-
-                ConnectionsService.LoadConnections(Settings.Default.UseSQLServer, false, connectionFileName);
-
-                if (Settings.Default.UseSQLServer)
-                {
-                    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();
-            }
-            catch (Exception ex)
-            {
-                if (Settings.Default.UseSQLServer)
-                {
-                    MessageCollector.AddExceptionMessage(Language.strLoadFromSqlFailed, ex);
-                    var commandButtons = string.Join("|", Language.strCommandTryAgain, Language.strCommandOpenConnectionFile, string.Format(Language.strCommandExitProgram, Application.ProductName));
-                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.strLoadFromSqlFailed, Language.strLoadFromSqlFailedContent, MiscTools.GetExceptionMessageRecursive(ex), "", "", commandButtons, false, ESysIcons.Error, ESysIcons.Error);
-                    switch (CTaskDialog.CommandButtonResult)
-                    {
-                        case 0:
-                            LoadConnections(withDialog);
-                            return;
-                        case 1:
-                            Settings.Default.UseSQLServer = false;
-                            LoadConnections(true);
-                            return;
-                        default:
-                            Application.Exit();
-                            return;
-                    }
-                }
-                if (ex is FileNotFoundException && !withDialog)
-                {
-                    MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), ex, MessageClass.InformationMsg);
-
-                    string[] commandButtons =
-                    {
-                        Language.ConfigurationCreateNew,
-                        Language.ConfigurationCustomPath,
-                        Language.ConfigurationImportFile,
-                        Language.strMenuExit
-                    };
-
-                    var answered = false;
-                    while (!answered)
-                    {
-                        try
-                        {
-                            CTaskDialog.ShowTaskDialogBox(
-                                GeneralAppInfo.ProductName, 
-                                Language.ConnectionFileNotFound, 
-                                "", "", "", "", "", 
-                                string.Join(" | ", commandButtons), 
-                                ETaskDialogButtons.None, 
-                                ESysIcons.Question, 
-                                ESysIcons.Question);
-
-                            switch (CTaskDialog.CommandButtonResult)
-                            {
-                                case 0:
-                                    ConnectionsService.NewConnectionsFile(connectionFileName);
-                                    answered = true;
-                                    break;
-                                case 1:
-                                    LoadConnections(true);
-                                    answered = true;
-                                    break;
-                                case 2:
-                                    ConnectionsService.NewConnectionsFile(connectionFileName);
-                                    Import.ImportFromFile(ConnectionsService.ConnectionTreeModel.RootNodes[0]);
-                                    answered = true;
-                                    break;
-                                case 3:
-                                    Application.Exit();
-                                    answered = true;
-                                    break;
-                            }                               
-                        }
-                        catch (Exception exc)
-                        {
-                            MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), exc, MessageClass.InformationMsg);
-                        }
-                    }
-                    return;
-                }
-
-                MessageCollector.AddExceptionStackTrace(string.Format(Language.strConnectionsFileCouldNotBeLoaded, connectionFileName), ex);
-                if (connectionFileName != ConnectionsService.GetStartupConnectionFileName())
-                {
-                    LoadConnections(withDialog);
-                }
-                else
-                {
-                    MessageBox.Show(FrmMain.Default,
-                        string.Format(Language.strErrorStartupConnectionFileLoad, Environment.NewLine, Application.ProductName, ConnectionsService.GetStartupConnectionFileName(), MiscTools.GetExceptionMessageRecursive(ex)),
-                        @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Application.Exit();
-                }
-            }
-        }
-        #endregion
     }
 }

mRemoteV1/App/Screens.cs

@@ -1,31 +1,38 @@
 using System.Windows.Forms;
+using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.App
 {
-    public static class Screens
+    public class Screens
     {
-        public static void SendFormToScreen(Screen screen)
+        private readonly FrmMain _frmMain;
+
+        public Screens(FrmMain frmMain)
+        {
+            _frmMain = frmMain.ThrowIfNull(nameof(frmMain));
+        }
+
+        public void SendFormToScreen(Screen screen)
         {
-            var frmMain = FrmMain.Default;
             var wasMax = false;
 
-            if (frmMain.WindowState == FormWindowState.Maximized)
+            if (_frmMain.WindowState == FormWindowState.Maximized)
             {
                 wasMax = true;
-                frmMain.WindowState = FormWindowState.Normal;
+                _frmMain.WindowState = FormWindowState.Normal;
             }
 
-            frmMain.Location = screen.Bounds.Location;
+            _frmMain.Location = screen.Bounds.Location;
 
             if (wasMax)
             {
-                frmMain.WindowState = FormWindowState.Maximized;
+                _frmMain.WindowState = FormWindowState.Maximized;
             }
         }
 
-        public static void SendPanelToScreen(DockContent panel, Screen screen)
+        public void SendPanelToScreen(DockContent panel, Screen screen)
         {
             panel.DockState = DockState.Float;
             if (panel.ParentForm == null) return;

mRemoteV1/App/Shutdown.cs

@@ -3,29 +3,41 @@ using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 using mRemoteNG.Config.Putty;
+using mRemoteNG.Config.Settings;
+using mRemoteNG.Connection;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.App
 {
-    public static class Shutdown
+    public class Shutdown
     {
+        private readonly SettingsSaver _settingsSaver;
+        private readonly IConnectionsService _connectionsService;
+        private readonly FrmMain _frmMain;
         private static string _updateFilePath;
 
+        public Shutdown(SettingsSaver settingsSaver, IConnectionsService connectionsService, FrmMain frmMain)
+        {
+            _settingsSaver = settingsSaver.ThrowIfNull(nameof(settingsSaver));
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+            _frmMain = frmMain.ThrowIfNull(nameof(frmMain));
+        }
+
         private static bool UpdatePending
         {
             get { return !string.IsNullOrEmpty(_updateFilePath); }
         }
 
-        public static void Quit(string updateFilePath = null)
+        public void Quit(string updateFilePath = null)
         {
             _updateFilePath = updateFilePath;
-            FrmMain.Default.Close();
+            _frmMain.Close();
             ProgramRoot.CloseSingletonInstanceMutex();
         }
 
-        public static void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
+        public void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
         {
             try
             {
@@ -41,34 +53,34 @@ namespace mRemoteNG.App
             }
         }
 
-        private static void StopPuttySessionWatcher()
+        private void StopPuttySessionWatcher()
         {
             PuttySessionsManager.Instance.StopWatcher();
         }
 
-        private static void DisposeNotificationAreaIcon()
+        private void DisposeNotificationAreaIcon()
         {
             if (Runtime.NotificationAreaIcon != null && Runtime.NotificationAreaIcon.Disposed == false)
                 Runtime.NotificationAreaIcon.Dispose();
         }
 
-        private static void SaveConnections()
+        private void SaveConnections()
         {
             if (Settings.Default.SaveConsOnExit)
-                Runtime.ConnectionsService.SaveConnections();
+                _connectionsService.SaveConnections();
         }
 
-        private static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
+        private void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
         {
-            Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip, frmMain);
+            _settingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip, frmMain);
         }
 
-        private static void UnregisterBrowsers()
+        private void UnregisterBrowsers()
         {
             IeBrowserEmulation.Unregister();
         }
 
-        public static void StartUpdate()
+        public void StartUpdate()
         {
             try
             {
@@ -80,7 +92,7 @@ namespace mRemoteNG.App
             }
         }
 
-        private static void RunUpdateFile()
+        private void RunUpdateFile()
         {
             if (UpdatePending)
                 Process.Start(_updateFilePath);

mRemoteV1/App/Startup.cs

@@ -7,6 +7,7 @@ using mRemoteNG.App.Initialization;
 using mRemoteNG.App.Update;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Connection;
 using mRemoteNG.Messages;
 using mRemoteNG.Tools;
@@ -17,30 +18,34 @@ using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
-    public class Startup
+	public class Startup
     {
-        private AppUpdater _appUpdate;
+        private readonly AppUpdater _appUpdate;
         private readonly ConnectionIconLoader _connectionIconLoader;
-        private readonly FrmMain _frmMain = FrmMain.Default;
+        private readonly FrmMain _frmMain;
+	    private readonly Windows _windows;
+        private readonly IConnectionsService _connectionsService;
+        private readonly DatabaseConnectorFactory _databaseConnectorFactory;
+        private readonly CompatibilityChecker _compatibilityChecker;
 
-        public static Startup Instance { get; } = new Startup();
+        public Startup(FrmMain frmMain, Windows windows, IConnectionsService connectionsService,
-
+            AppUpdater appUpdate, DatabaseConnectorFactory databaseConnectorFactory, CompatibilityChecker compatibilityChecker)
-        private Startup()
         {
-            _appUpdate = new AppUpdater();
+            _frmMain = frmMain.ThrowIfNull(nameof(frmMain));
+			_windows = windows.ThrowIfNull(nameof(windows));
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+	        _appUpdate = appUpdate.ThrowIfNull(nameof(appUpdate));
+            _databaseConnectorFactory = databaseConnectorFactory.ThrowIfNull(nameof(databaseConnectorFactory));
+            _compatibilityChecker = compatibilityChecker.ThrowIfNull(nameof(compatibilityChecker));
             _connectionIconLoader = new ConnectionIconLoader(GeneralAppInfo.HomePath + "\\Icons\\");
         }
 
-        static Startup()
-        {
-        }
-
         public void InitializeProgram(MessageCollector messageCollector)
         {
             Debug.Print("---------------------------" + Environment.NewLine + "[START] - " + Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture));
             var startupLogger = new StartupDataLogger(messageCollector);
             startupLogger.LogStartupData();
-            CompatibilityChecker.CheckCompatibility(messageCollector);
+            _compatibilityChecker.CheckCompatibility();
             ParseCommandLineArgs(messageCollector);
             IeBrowserEmulation.Register();
             _connectionIconLoader.GetConnectionIcons();
@@ -59,17 +64,14 @@ namespace mRemoteNG.App
             messageCollector.AddMessage(MessageClass.DebugMsg, "Determining if we need a database syncronizer");
             if (!Settings.Default.UseSQLServer) return;
             messageCollector.AddMessage(MessageClass.DebugMsg, "Creating database syncronizer");
-            Runtime.ConnectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker());
+            var sqlConnectionsUpdateChecker = new SqlConnectionsUpdateChecker(_connectionsService, _databaseConnectorFactory);
-            Runtime.ConnectionsService.RemoteConnectionsSyncronizer.Enable();
+            _connectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(sqlConnectionsUpdateChecker, _connectionsService);
+            _connectionsService.RemoteConnectionsSyncronizer.Enable();
         }
 
         public void CheckForUpdate()
         {
-            if (_appUpdate == null)
+            if (_appUpdate.IsGetUpdateInfoRunning)
-            {
-                _appUpdate = new AppUpdater();
-            }
-            else if (_appUpdate.IsGetUpdateInfoRunning)
             {
                 return;
             }
@@ -107,7 +109,7 @@ namespace mRemoteNG.App
 
                 if (_appUpdate.IsUpdateAvailable())
                 {
-                    Windows.Show(WindowType.Update);
+                    _windows.Show(WindowType.Update);
                 }
             }
             catch (Exception ex)

mRemoteV1/App/Update/AppUpdater.cs

@@ -4,6 +4,7 @@ using System.Net;
 using System.ComponentModel;
 using System.Threading;
 using System.Reflection;
+using System.Security;
 using mRemoteNG.App.Info;
 using mRemoteNG.Security.SymmetricEncryption;
 using System.Security.Cryptography;
@@ -22,6 +23,7 @@ namespace mRemoteNG.App.Update
         private WebProxy _webProxy;
         private Thread _getUpdateInfoThread;
         private Thread _getChangeLogThread;
+        private readonly Func<SecureString> _encryptionKeyRetrievalFunc;
 
         #region Public Properties
 
@@ -48,8 +50,9 @@ namespace mRemoteNG.App.Update
 
         #region Public Methods
 
-        public AppUpdater()
+        public AppUpdater(Func<SecureString> encryptionKeyRetrievalFunc)
         {
+            _encryptionKeyRetrievalFunc = encryptionKeyRetrievalFunc;
             SetProxySettings();
         }
 
@@ -61,7 +64,7 @@ namespace mRemoteNG.App.Update
             var useAuthentication = Settings.Default.UpdateProxyUseAuthentication;
             var username = Settings.Default.UpdateProxyAuthUser;
             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-            var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey);
+            var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, _encryptionKeyRetrievalFunc());
 
             SetProxySettings(shouldWeUseProxy, proxyAddress, port, useAuthentication, username, password);
         }

mRemoteV1/App/Windows.cs

@@ -1,88 +1,134 @@
-using mRemoteNG.UI.Forms;
+using System;
-using mRemoteNG.UI.Window;
+using mRemoteNG.App.Update;
-using System;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Connection;
 using mRemoteNG.Messages;
+using mRemoteNG.Tools;
 using mRemoteNG.UI;
+using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.Window;
+using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.App
 {
-    public static class Windows
+	public class Windows
     {
-        private static AboutWindow _aboutForm;
+        private readonly IConnectionInitiator _connectionInitiator;
-        private static ActiveDirectoryImportWindow _adimportForm;
+        private AboutWindow _aboutForm;
-        private static HelpWindow _helpForm;
+        private ActiveDirectoryImportWindow _adimportForm;
-        private static ExternalToolsWindow _externalappsForm;
+        private HelpWindow _helpForm;
-        private static PortScanWindow _portscanForm;
+        private ExternalToolsWindow _externalappsForm;
-        private static UltraVNCWindow _ultravncscForm;
+        private PortScanWindow _portscanForm;
-        private static ComponentsCheckWindow _componentscheckForm;
+        private UltraVNCWindow _ultravncscForm;
+        private ComponentsCheckWindow _componentscheckForm;
+        private UpdateWindow _updateForm;
+        private readonly Func<UpdateWindow> _updateWindowBuilder;
+        private readonly Func<NotificationAreaIcon> _notificationAreaIconBuilder;
+        private readonly Func<ExternalToolsWindow> _externalToolsWindowBuilder;
+        private readonly Func<PortScanWindow> _portScanWindowBuilder;
+        private readonly Func<ActiveDirectoryImportWindow> _activeDirectoryImportWindowBuilder;
+        private readonly IConnectionsService _connectionsService;
+        private readonly AppUpdater _appUpdater;
+        private readonly DatabaseConnectorFactory _databaseConnectorFactory;
+        private readonly FrmMain _frmMain;
 
-        internal static ConnectionTreeWindow TreeForm { get; set; } = new ConnectionTreeWindow();
+        internal ConnectionTreeWindow TreeForm { get; }
-        internal static ConfigWindow ConfigForm { get; set; } = new ConfigWindow();
+        internal ConfigWindow ConfigForm { get; }
-        internal static ErrorAndInfoWindow ErrorsForm { get; set; } = new ErrorAndInfoWindow();
+        internal ErrorAndInfoWindow ErrorsForm { get; }
-        internal static ScreenshotManagerWindow ScreenshotForm { get; set; } = new ScreenshotManagerWindow();
+        internal ScreenshotManagerWindow ScreenshotForm { get; }
-        private static UpdateWindow UpdateForm { get; set; } = new UpdateWindow();
+        internal SSHTransferWindow SshtransferForm { get; private set; }
-        internal static SSHTransferWindow SshtransferForm { get; private set; } = new SSHTransferWindow();
 
+        public Windows(
+            IConnectionInitiator connectionInitiator,
+            ConnectionTreeWindow treeForm,
+            ConfigWindow configForm,
+            ErrorAndInfoWindow errorAndInfoWindow,
+            ScreenshotManagerWindow screenshotForm,
+            SSHTransferWindow sshtransferForm,
+            Func<UpdateWindow> updateWindowBuilder,
+            Func<NotificationAreaIcon> notificationAreaIconBuilder,
+            Func<ExternalToolsWindow> externalToolsWindowBuilder, 
+            IConnectionsService connectionsService, 
+            Func<PortScanWindow> portScanWindowBuilder, 
+            Func<ActiveDirectoryImportWindow> activeDirectoryImportWindowBuilder, 
+            AppUpdater appUpdater, 
+            DatabaseConnectorFactory databaseConnectorFactory,
+            FrmMain frmMain)
+        {
+            _connectionInitiator = connectionInitiator.ThrowIfNull(nameof(connectionInitiator));
+            TreeForm = treeForm.ThrowIfNull(nameof(treeForm));
+            ConfigForm = configForm.ThrowIfNull(nameof(configForm));
+            ErrorsForm = errorAndInfoWindow.ThrowIfNull(nameof(errorAndInfoWindow));
+            ScreenshotForm = screenshotForm.ThrowIfNull(nameof(screenshotForm));
+            SshtransferForm = sshtransferForm.ThrowIfNull(nameof(sshtransferForm));
+            _updateWindowBuilder = updateWindowBuilder;
+            _notificationAreaIconBuilder = notificationAreaIconBuilder;
+            _externalToolsWindowBuilder = externalToolsWindowBuilder;
+            _portScanWindowBuilder = portScanWindowBuilder;
+            _activeDirectoryImportWindowBuilder = activeDirectoryImportWindowBuilder;
+            _frmMain = frmMain;
+            _databaseConnectorFactory = databaseConnectorFactory.ThrowIfNull(nameof(databaseConnectorFactory));
+            _appUpdater = appUpdater.ThrowIfNull(nameof(appUpdater));
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+        }
 
-
+        public void Show(WindowType windowType)
-        public static void Show(WindowType windowType)
         {
             try
             {
-                var dockPanel = FrmMain.Default.pnlDock;
                 // ReSharper disable once SwitchStatementMissingSomeCases
                 switch (windowType)
                 {
                     case WindowType.About:
                         if (_aboutForm == null || _aboutForm.IsDisposed)
                             _aboutForm = new AboutWindow();
-                        _aboutForm.Show(dockPanel);
+                        _aboutForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.ActiveDirectoryImport:
                         if (_adimportForm == null || _adimportForm.IsDisposed)
-                            _adimportForm = new ActiveDirectoryImportWindow();
+                            _adimportForm = _activeDirectoryImportWindowBuilder();
-                        _adimportForm.Show(dockPanel);
+                        _adimportForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.Options:
-                        using (var optionsForm = new frmOptions())
+                        using (var optionsForm = new frmOptions(_connectionInitiator, Show, _notificationAreaIconBuilder, _connectionsService, _appUpdater, _databaseConnectorFactory, _frmMain))
                         {
-                            optionsForm.ShowDialog(dockPanel);
+                            optionsForm.ShowDialog(_frmMain);
                         }
                         break;
                     case WindowType.SSHTransfer:
                         if (SshtransferForm == null || SshtransferForm.IsDisposed)
-                            SshtransferForm = new SSHTransferWindow();
+                            SshtransferForm = new SSHTransferWindow(_frmMain);
-                        SshtransferForm.Show(dockPanel);
+                        SshtransferForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.Update:
-                        if (UpdateForm == null || UpdateForm.IsDisposed)
+                        if (_updateForm == null || _updateForm.IsDisposed)
-                            UpdateForm = new UpdateWindow();
+                            _updateForm = _updateWindowBuilder();
-                        UpdateForm.Show(dockPanel);
+                        _updateForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.Help:
                         if (_helpForm == null || _helpForm.IsDisposed)
                             _helpForm = new HelpWindow();
-                        _helpForm.Show(dockPanel);
+                        _helpForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.ExternalApps:
                         if (_externalappsForm == null || _externalappsForm.IsDisposed)
-                            _externalappsForm = new ExternalToolsWindow();
+                            _externalappsForm = _externalToolsWindowBuilder();
-                        _externalappsForm.Show(dockPanel);
+                        _externalappsForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.PortScan:
-                        _portscanForm = new PortScanWindow();
+                        _portscanForm = _portScanWindowBuilder();
-                        _portscanForm.Show(dockPanel);
+                        _portscanForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.UltraVNCSC:
                         if (_ultravncscForm == null || _ultravncscForm.IsDisposed)
-                            _ultravncscForm = new UltraVNCWindow();
+                            _ultravncscForm = new UltraVNCWindow(Show);
-                        _ultravncscForm.Show(dockPanel);
+                        _ultravncscForm.Show(_frmMain.pnlDock);
                         break;
                     case WindowType.ComponentsCheck:
                         Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Showing ComponentsCheck window", true);
                         if (_componentscheckForm == null || _componentscheckForm.IsDisposed)
                             _componentscheckForm = new ComponentsCheckWindow();
-                        _componentscheckForm.Show(dockPanel);
+                        _componentscheckForm.Show(_frmMain.pnlDock);
                         break;
                 }
             }
@@ -92,4 +138,4 @@ namespace mRemoteNG.App
             }
         }
     }
-}
+}

mRemoteV1/Config/Connections/CsvConnectionsSaver.cs

@@ -1,9 +1,8 @@
-using System;
+using mRemoteNG.Config.DataProviders;
-using mRemoteNG.App;
-using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Credential;
 using mRemoteNG.Security;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 
 namespace mRemoteNG.Config.Connections
@@ -12,21 +11,18 @@ namespace mRemoteNG.Config.Connections
     {
         private readonly string _connectionFileName;
         private readonly SaveFilter _saveFilter;
+        private readonly ICredentialRepositoryList _credentialRepositoryList;
 
-        public CsvConnectionsSaver(string connectionFileName, SaveFilter saveFilter)
+        public CsvConnectionsSaver(string connectionFileName, SaveFilter saveFilter, ICredentialRepositoryList credentialRepositoryList)
         {
-            if (string.IsNullOrEmpty(connectionFileName))
+            _connectionFileName = connectionFileName.ThrowIfNullOrEmpty(nameof(connectionFileName));
-                throw new ArgumentException($"Argument '{nameof(connectionFileName)}' cannot be null or empty");
+            _saveFilter = saveFilter.ThrowIfNull(nameof(saveFilter));
-            if (saveFilter == null)
+            _credentialRepositoryList = credentialRepositoryList.ThrowIfNull(nameof(credentialRepositoryList));
-                throw new ArgumentNullException(nameof(saveFilter));
-
-            _connectionFileName = connectionFileName;
-            _saveFilter = saveFilter;
         }
 
         public void Save(ConnectionTreeModel connectionTreeModel)
         {
-            var csvConnectionsSerializer = new CsvConnectionsSerializerMremotengFormat(_saveFilter, Runtime.CredentialProviderCatalog);
+            var csvConnectionsSerializer = new CsvConnectionsSerializerMremotengFormat(_saveFilter, _credentialRepositoryList);
             var dataProvider = new FileDataProvider(_connectionFileName);
             var csvContent = csvConnectionsSerializer.Serialize(connectionTreeModel);
             dataProvider.Save(csvContent);

mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Timers;
-using mRemoteNG.App;
+using mRemoteNG.Connection;
+using mRemoteNG.Tools;
+
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.Config.Connections.Multiuser
@@ -9,15 +11,17 @@ namespace mRemoteNG.Config.Connections.Multiuser
     {
         private readonly Timer _updateTimer;
         private readonly IConnectionsUpdateChecker _updateChecker;
+        private readonly IConnectionsService _connectionsService;
 
         public double TimerIntervalInMilliseconds
         {
             get { return _updateTimer.Interval; }
         }
 
-        public RemoteConnectionsSyncronizer(IConnectionsUpdateChecker updateChecker)
+        public RemoteConnectionsSyncronizer(IConnectionsUpdateChecker updateChecker, IConnectionsService connectionsService)
         {
-            _updateChecker = updateChecker;
+            _updateChecker = updateChecker.ThrowIfNull(nameof(updateChecker));
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
             _updateTimer = new Timer(3000);
             SetEventListeners();
         }
@@ -33,7 +37,7 @@ namespace mRemoteNG.Config.Connections.Multiuser
 
         private void Load(object sender, ConnectionsUpdateAvailableEventArgs args)
         {
-            Runtime.ConnectionsService.LoadConnections(true, false, "");
+            _connectionsService.LoadConnections(true, false, "");
             args.Handled = true;
         }
 

mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs

@@ -6,6 +6,8 @@ using System.Data.SqlClient;
 using System.Threading;
 using mRemoteNG.Config.Connections.Multiuser;
 using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Connection;
+using mRemoteNG.Tools;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -13,13 +15,15 @@ namespace mRemoteNG.Config.Connections
     {
         private readonly SqlDatabaseConnector _sqlConnector;
         private readonly SqlCommand _sqlQuery;
+        private readonly IConnectionsService _connectionsService;
         private DateTime _lastUpdateTime;
         private DateTime _lastDatabaseUpdateTime;
 
-
+        public SqlConnectionsUpdateChecker(IConnectionsService connectionsService, DatabaseConnectorFactory databaseConnectorFactory)
-        public SqlConnectionsUpdateChecker()
         {
-            _sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings();
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+            databaseConnectorFactory.ThrowIfNull(nameof(databaseConnectorFactory));
+            _sqlConnector = databaseConnectorFactory.SqlDatabaseConnectorFromSettings();
             _sqlQuery = new SqlCommand("SELECT * FROM tblUpdate", _sqlConnector.SqlConnection);
             _lastUpdateTime = default(DateTime);
             _lastDatabaseUpdateTime = default(DateTime);
@@ -64,7 +68,7 @@ namespace mRemoteNG.Config.Connections
 
         private bool CheckIfIAmTheLastOneUpdated(DateTime lastUpdateInDb)
         {
-            DateTime LastSqlUpdateWithoutMilliseconds = new DateTime(Runtime.ConnectionsService.LastSqlUpdate.Ticks - (Runtime.ConnectionsService.LastSqlUpdate.Ticks % TimeSpan.TicksPerSecond), Runtime.ConnectionsService.LastSqlUpdate.Kind);
+            DateTime LastSqlUpdateWithoutMilliseconds = new DateTime(_connectionsService.LastSqlUpdate.Ticks - (_connectionsService.LastSqlUpdate.Ticks % TimeSpan.TicksPerSecond), _connectionsService.LastSqlUpdate.Kind);
             return lastUpdateInDb == LastSqlUpdateWithoutMilliseconds;
         }
 

mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs

@@ -1,15 +1,17 @@
-using System;
+using mRemoteNG.Connection;
+using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using mRemoteNG.Connection;
 
 namespace mRemoteNG.Config.Connections
 {
     public class SaveConnectionsOnEdit
     {
-        private readonly ConnectionsService _connectionsService;
+        private readonly IConnectionsService _connectionsService;
 
-        public SaveConnectionsOnEdit(ConnectionsService connectionsService)
+        public bool Enabled { get; set; } = true;
+
+        public SaveConnectionsOnEdit(IConnectionsService connectionsService)
         {
             if (connectionsService == null)
                 throw new ArgumentNullException(nameof(connectionsService));
@@ -20,10 +22,9 @@ 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;
@@ -45,7 +46,11 @@ namespace mRemoteNG.Config.Connections
         {
             if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
-            _connectionsService.SaveConnections();
+
+            if (!Enabled)
+                return;
+
+            _connectionsService.SaveConnectionsAsync();
         }
     }
 }

mRemoteV1/Config/Connections/SqlConnectionsLoader.cs

@@ -2,20 +2,31 @@
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Versioning;
+using mRemoteNG.Connection;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 
 namespace mRemoteNG.Config.Connections
 {
     public class SqlConnectionsLoader
     {
+        private readonly DatabaseConnectorFactory _databaseConnectorFactory;
+        private readonly IConnectionsService _connectionsService;
+
+        public SqlConnectionsLoader(DatabaseConnectorFactory databaseConnectorFactory, IConnectionsService connectionsService)
+        {
+            _databaseConnectorFactory = databaseConnectorFactory.ThrowIfNull(nameof(databaseConnectorFactory));
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+        }
+
         public ConnectionTreeModel Load()
         {
-            var connector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings();
+            var connector = _databaseConnectorFactory.SqlDatabaseConnectorFromSettings();
             var dataProvider = new SqlDataProvider(connector);
             var databaseVersionVerifier = new SqlDatabaseVersionVerifier(connector);
             databaseVersionVerifier.VerifyDatabaseVersion();
             var dataTable = dataProvider.Load();
-            var deserializer = new DataTableDeserializer();
+            var deserializer = new DataTableDeserializer(_connectionsService);
             return deserializer.Deserialize(dataTable);
         }
     }

mRemoteV1/Config/Connections/SqlConnectionsSaver.cs

@@ -2,13 +2,13 @@
 using System.Data.SqlClient;
 using System.Globalization;
 using System.Linq;
-using System.Security;
 using mRemoteNG.App;
 using mRemoteNG.App.Info;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Versioning;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 using mRemoteNG.Security;
@@ -21,14 +21,15 @@ namespace mRemoteNG.Config.Connections
 {
     public class SqlConnectionsSaver : ISaver<ConnectionTreeModel>
     {
-        private SecureString _password = Runtime.EncryptionKey;
+        private readonly IConnectionsService _connectionsService;
         private readonly SaveFilter _saveFilter;
+        private readonly DatabaseConnectorFactory _databaseConnectorFactory;
 
-        public SqlConnectionsSaver(SaveFilter saveFilter)
+        public SqlConnectionsSaver(SaveFilter saveFilter, IConnectionsService connectionsService, DatabaseConnectorFactory databaseConnectorFactory)
         {
-            if (saveFilter == null)
+            _saveFilter = saveFilter.ThrowIfNull(nameof(saveFilter));
-                throw new ArgumentNullException(nameof(saveFilter));
+            _databaseConnectorFactory = databaseConnectorFactory.ThrowIfNull(nameof(databaseConnectorFactory));
-            _saveFilter = saveFilter;
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
         }
 
         public void Save(ConnectionTreeModel connectionTreeModel)
@@ -40,7 +41,7 @@ namespace mRemoteNG.Config.Connections
             }
                 
 
-            using (var sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings())
+            using (var sqlConnector = _databaseConnectorFactory.SqlDatabaseConnectorFromSettings())
             {
                 sqlConnector.Connect();
                 var databaseVersionVerifier = new SqlDatabaseVersionVerifier(sqlConnector);
@@ -67,17 +68,17 @@ namespace mRemoteNG.Config.Connections
             {
                 if (rootTreeNode.Password)
                 {
-                    _password = rootTreeNode.PasswordString.ConvertToSecureString();
+                    _connectionsService.EncryptionKey = rootTreeNode.PasswordString.ConvertToSecureString();
-                    strProtected = cryptographyProvider.Encrypt("ThisIsProtected", _password);
+                    strProtected = cryptographyProvider.Encrypt("ThisIsProtected", _connectionsService.EncryptionKey);
                 }
                 else
                 {
-                    strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _password);
+                    strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _connectionsService.EncryptionKey);
                 }
             }
             else
             {
-                strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _password);
+                strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _connectionsService.EncryptionKey);
             }
 
             var sqlQuery = new SqlCommand("DELETE FROM tblRoot", sqlDatabaseConnector.SqlConnection);

mRemoteV1/Config/Connections/XmlConnectionsLoader.cs

@@ -1,41 +1,37 @@
-using System;
+using System.Security;
-using System.Security;
+using System.Windows.Forms;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Connection;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
-using System.IO;
-using mRemoteNG.Config.Serializers.Xml;
 
 namespace mRemoteNG.Config.Connections
 {
-	public class XmlConnectionsLoader
+    public class XmlConnectionsLoader
-    {
+	{
+	    private readonly IConnectionsService _connectionsService;
         private readonly string _connectionFilePath;
+	    private readonly IWin32Window _dialogWindowParent;
 
-        public XmlConnectionsLoader(string connectionFilePath)
+        public XmlConnectionsLoader(string connectionFilePath, IConnectionsService connectionsService, IWin32Window dialogWindowParent)
         {
-            if (string.IsNullOrEmpty(connectionFilePath))
+            _dialogWindowParent = dialogWindowParent;
-                throw new ArgumentException($"{nameof(connectionFilePath)} cannot be null or empty");
+            _connectionFilePath = connectionFilePath.ThrowIfNullOrEmpty(nameof(connectionFilePath));
-
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
-            if (!File.Exists(connectionFilePath))
-                throw new FileNotFoundException($"{connectionFilePath} does not exist");
-
-            _connectionFilePath = connectionFilePath;
         }
 
         public ConnectionTreeModel Load()
         {
             var dataProvider = new FileDataProvider(_connectionFilePath);
             var xmlString = dataProvider.Load();
-            var deserializer = new XmlConnectionsDeserializer(PromptForPassword);
+            var deserializer = new XmlConnectionsDeserializer(_connectionsService, _dialogWindowParent, PromptForPassword);
             return deserializer.Deserialize(xmlString);
         }
 
-        private SecureString PromptForPassword()
+        private Optional<SecureString> PromptForPassword()
         {
-            var password = MiscTools.PasswordDialog("", false);
+            return MiscTools.PasswordDialog("", false);
-            return password;
         }
     }
 }

mRemoteV1/Config/Connections/XmlConnectionsSaver.cs

@@ -32,7 +32,7 @@ namespace mRemoteNG.Config.Connections
             try
             {
                 var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
-                var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
+                var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
                     cryptographyProvider,
                     connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                     _saveFilter);

mRemoteV1/Config/DataProviders/FileBackupPruner.cs

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

mRemoteV1/Config/DatabaseConnectors/DatabaseConnectorFactory.cs

@@ -1,17 +1,26 @@
-using mRemoteNG.App;
+using System;
+using System.Security;
+using mRemoteNG.App;
 using mRemoteNG.Security.SymmetricEncryption;
 
 namespace mRemoteNG.Config.DatabaseConnectors
 {
     public class DatabaseConnectorFactory
     {
-        public static SqlDatabaseConnector SqlDatabaseConnectorFromSettings()
+        private readonly Func<SecureString> _decryptionKeyRetrievalFun;
+
+        public DatabaseConnectorFactory(Func<SecureString> decryptionKeyRetrievalFun)
+        {
+            _decryptionKeyRetrievalFun = decryptionKeyRetrievalFun;
+        }
+
+        public SqlDatabaseConnector SqlDatabaseConnectorFromSettings()
         {
             var sqlHost = mRemoteNG.Settings.Default.SQLHost;
             var sqlCatalog = mRemoteNG.Settings.Default.SQLDatabaseName;
             var sqlUsername = mRemoteNG.Settings.Default.SQLUser;
             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-            var sqlPassword = cryptographyProvider.Decrypt(mRemoteNG.Settings.Default.SQLPass, Runtime.EncryptionKey);
+            var sqlPassword = cryptographyProvider.Decrypt(mRemoteNG.Settings.Default.SQLPass, _decryptionKeyRetrievalFun());
             return new SqlDatabaseConnector(sqlHost, sqlCatalog, sqlUsername, sqlPassword);
         }
     }

mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs

@@ -1,11 +1,13 @@
 using System.IO;
 using System.Linq;
+using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
+using mRemoteNG.Tools;
 
 
 namespace mRemoteNG.Config.Import
@@ -13,6 +15,15 @@ namespace mRemoteNG.Config.Import
 	// ReSharper disable once InconsistentNaming
 	public class MRemoteNGXmlImporter : IConnectionImporter<string>
 	{
+	    private readonly IConnectionsService _connectionsService;
+	    private readonly IWin32Window _dialogWindowParent;
+
+	    public MRemoteNGXmlImporter(IConnectionsService connectionsService, IWin32Window dialogWindowParent)
+	    {
+	        _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+	        _dialogWindowParent = dialogWindowParent.ThrowIfNull(nameof(dialogWindowParent));
+	    }
+
 	    public void Import(string fileName, ContainerInfo destinationContainer)
 	    {
 	        if (fileName == null)
@@ -26,7 +37,7 @@ namespace mRemoteNG.Config.Import
 
 	        var dataProvider = new FileDataProvider(fileName);
 	        var xmlString = dataProvider.Load();
-	        var xmlConnectionsDeserializer = new XmlConnectionsDeserializer();
+	        var xmlConnectionsDeserializer = new XmlConnectionsDeserializer(_connectionsService, _dialogWindowParent);
 	        var connectionTreeModel = xmlConnectionsDeserializer.Deserialize(xmlString, true);
 
 	        var rootImportContainer = new ContainerInfo { Name = Path.GetFileNameWithoutExtension(fileName) };

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,10 +35,12 @@ namespace mRemoteNG.Config.Putty
 			}
 		}
 
-	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider provider)
+	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider puttySessionProvider)
 	    {
-            var rootTreeNode = provider.RootInfo;
+	        puttySessionProvider.ThrowIfNull(nameof(puttySessionProvider));
-	        provider.GetSessions();
+
+            var rootTreeNode = puttySessionProvider.RootInfo;
+	        puttySessionProvider.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,7 +39,10 @@ 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;
@@ -50,10 +53,15 @@ namespace mRemoteNG.Config.Putty
 		    {
 		        PuttySession = sessionName,
 		        Name = sessionName,
-		        Hostname = Convert.ToString(sessionKey.GetValue("HostName")),
+		        Hostname = sessionKey.GetValue("HostName")?.ToString() ?? "",
-		        Username = Convert.ToString(sessionKey.GetValue("UserName"))
+		        Username = sessionKey.GetValue("UserName")?.ToString() ?? ""
 		    };
-            var protocol = Convert.ToString(sessionKey.GetValue("Protocol")) ?? "ssh";
+
+
+		    var protocol = string.IsNullOrEmpty(sessionKey.GetValue("Protocol")?.ToString())
+		        ? "ssh"
+                : sessionKey.GetValue("Protocol").ToString();
+
 		    switch (protocol.ToLowerInvariant())
 			{
 				case "raw":
@@ -65,16 +73,15 @@ namespace mRemoteNG.Config.Putty
 				case "serial":
 					return null;
 				case "ssh":
-                    var sshVersionObject = sessionKey.GetValue("SshProt");
+				    int.TryParse(sessionKey.GetValue("SshProt")?.ToString(), out var sshVersion);
-					if (sshVersionObject != null)
+                    /* Per PUTTY.H in PuTTYNG & PuTTYNG Upstream (PuTTY proper currently)
-					{
+                     * expect 0 for SSH1, 3 for SSH2 ONLY
-					    var sshVersion = Convert.ToInt32(sshVersionObject);
+                     * 1 for SSH1 with a 2 fallback
-					    sessionInfo.Protocol = sshVersion >= 2 ? ProtocolType.SSH2 : ProtocolType.SSH1;
+                     * 2 for SSH2 with a 1 fallback
-					}
+                     *
-					else
+                     * default to SSH2 if any other value is received
-					{
+                     */
-						sessionInfo.Protocol = ProtocolType.SSH2;
+                    sessionInfo.Protocol = sshVersion == 1 || sshVersion == 0 ? ProtocolType.SSH1 : ProtocolType.SSH2;
-					}
 					break;
 				case "telnet":
 					sessionInfo.Protocol = ProtocolType.Telnet;
@@ -82,7 +89,12 @@ namespace mRemoteNG.Config.Putty
 				default:
 					return null;
 			}
-			sessionInfo.Port = Convert.ToInt32(sessionKey.GetValue("PortNumber"));
+
+            int.TryParse(sessionKey.GetValue("PortNumber")?.ToString(), out var portNumber);
+            if (portNumber == default(int))
+                sessionInfo.SetDefaultPort();
+            else
+                sessionInfo.Port = portNumber;
 				
 			return sessionInfo;
 		}

mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs

@@ -33,6 +33,7 @@ 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")));
 			}
 
@@ -125,9 +126,6 @@ namespace mRemoteNG.Config.Putty
 			
 		public override void StartWatcher()
 		{
-			PuttySessionsRegistryProvider.StartWatcher();
-			PuttySessionsRegistryProvider.PuttySessionChanged += OnRegistrySessionChanged;
-				
 			if (_eventWatcher != null)
 			{
 				return;
@@ -136,18 +134,22 @@ namespace mRemoteNG.Config.Putty
 			try
 			{
                 var sessionsFolderPath = GetSessionsFolderPath();
-                if (Directory.Exists(sessionsFolderPath))
+
-                {
+			    if (!Directory.Exists(sessionsFolderPath))
-                    _eventWatcher = new FileSystemWatcher(sessionsFolderPath)
+			    {
-                    {
+			        Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, $"XmingPortablePuttySessions.Watcher.StartWatching() failed: '{sessionsFolderPath}' does not exist.", true);
-                        NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite
+			        return;
-                    };
+			    }
-                    _eventWatcher.Changed += OnFileSystemEventArrived;
+
-                    _eventWatcher.Created += OnFileSystemEventArrived;
+			    _eventWatcher = new FileSystemWatcher(sessionsFolderPath)
-                    _eventWatcher.Deleted += OnFileSystemEventArrived;
+			    {
-                    _eventWatcher.Renamed += OnFileSystemEventArrived;
+			        NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite
-                    _eventWatcher.EnableRaisingEvents = true;
+			    };
-                }
+			    _eventWatcher.Changed += OnFileSystemEventArrived;
+			    _eventWatcher.Created += OnFileSystemEventArrived;
+			    _eventWatcher.Deleted += OnFileSystemEventArrived;
+			    _eventWatcher.Renamed += OnFileSystemEventArrived;
+			    _eventWatcher.EnableRaisingEvents = true;
 			}
 			catch (Exception ex)
 			{
@@ -173,7 +175,8 @@ namespace mRemoteNG.Config.Putty
 		private static string GetPuttyConfPath()
 		{
 		    var puttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : App.Info.GeneralAppInfo.PuttyPath;
-		    return Path.Combine(Path.GetDirectoryName(puttyPath), "putty.conf");
+		    puttyPath = Path.GetDirectoryName(puttyPath);
+            return string.IsNullOrEmpty(puttyPath) ? null : Path.Combine(puttyPath, "putty.conf");
 		}
 			
 		private static string GetSessionsFolderPath()
@@ -200,6 +203,9 @@ 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/CsvConnectionsDeserializerMremotengFormat.cs

@@ -234,6 +234,12 @@ namespace mRemoteNG.Config.Serializers.Csv
                 if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectPrinters")], out value))
                     connectionRecord.RedirectPrinters = value;
             }
+            if (headers.Contains("RedirectClipboard"))
+            {
+                bool value;
+                if (bool.TryParse(connectionCsv[headers.IndexOf("RedirectClipboard")], out value))
+                    connectionRecord.RedirectClipboard = value;
+            }
 
             if (headers.Contains("RedirectSmartCards"))
             {
@@ -453,6 +459,13 @@ namespace mRemoteNG.Config.Serializers.Csv
                     connectionRecord.Inheritance.RedirectPrinters = value;
             }
 
+            if (headers.Contains("InheritRedirectClipboard"))
+            {
+                bool value;
+                if (bool.TryParse(connectionCsv[headers.IndexOf("InheritRedirectClipboard")], out value))
+                    connectionRecord.Inheritance.RedirectClipboard = value;
+            }
+
             if (headers.Contains("InheritRedirectSmartCards"))
             {
                 bool value;

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

@@ -52,9 +52,9 @@ namespace mRemoteNG.Config.Serializers.Csv
                 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;");
+            sb.Append("Hostname;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;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");
+                sb.Append("InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectClipboard;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)
@@ -116,6 +116,7 @@ namespace mRemoteNG.Config.Serializers.Csv
                 .Append(FormatForCsv(con.RedirectDiskDrives))
                 .Append(FormatForCsv(con.RedirectPorts))
                 .Append(FormatForCsv(con.RedirectPrinters))
+                .Append(FormatForCsv(con.RedirectClipboard))
                 .Append(FormatForCsv(con.RedirectSmartCards))
                 .Append(FormatForCsv(con.RedirectSound))
                 .Append(FormatForCsv(con.RedirectKeys))
@@ -164,6 +165,7 @@ namespace mRemoteNG.Config.Serializers.Csv
                 .Append(FormatForCsv(con.Inheritance.RedirectKeys))
                 .Append(FormatForCsv(con.Inheritance.RedirectPorts))
                 .Append(FormatForCsv(con.Inheritance.RedirectPrinters))
+                .Append(FormatForCsv(con.Inheritance.RedirectClipboard))
                 .Append(FormatForCsv(con.Inheritance.RedirectSmartCards))
                 .Append(FormatForCsv(con.Inheritance.RedirectSound))
                 .Append(FormatForCsv(con.Inheritance.Resolution))

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs

@@ -210,7 +210,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                 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("InheritRedirectPrinters", falseString));                
                 element.Add(new XAttribute("InheritRedirectSmartCards", falseString));
                 element.Add(new XAttribute("InheritRedirectSound", falseString));
                 element.Add(new XAttribute("InheritSoundQuality", falseString));

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs

@@ -0,0 +1,256 @@
+using System;
+using System.Security;
+using System.Xml.Linq;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+
+namespace mRemoteNG.Config.Serializers.Xml
+{
+	// ReSharper disable once InconsistentNaming
+	public class XmlConnectionNodeSerializer27 : ISerializer<ConnectionInfo,XElement>
+    {
+        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly SecureString _encryptionKey;
+        private readonly SaveFilter _saveFilter;
+
+        public XmlConnectionNodeSerializer27(ICryptographyProvider cryptographyProvider, SecureString encryptionKey, SaveFilter saveFilter)
+        {
+            if (cryptographyProvider == null)
+                throw new ArgumentNullException(nameof(cryptographyProvider));
+            if (encryptionKey == null)
+                throw new ArgumentNullException(nameof(encryptionKey));
+            if (saveFilter == null)
+                throw new ArgumentNullException(nameof(saveFilter));
+
+            _cryptographyProvider = cryptographyProvider;
+            _encryptionKey = encryptionKey;
+            _saveFilter = saveFilter;
+        }
+
+        public XElement Serialize(ConnectionInfo connectionInfo)
+        {
+            var element = new XElement(XName.Get("Node", ""));
+            SetElementAttributes(element, connectionInfo);
+            SetInheritanceAttributes(element, connectionInfo);
+            return element;
+        }
+
+        private void SetElementAttributes(XContainer element, ConnectionInfo connectionInfo)
+        {
+            var nodeAsContainer = connectionInfo as ContainerInfo;
+            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("Descr", connectionInfo.Description));
+            element.Add(new XAttribute("Icon", connectionInfo.Icon));
+            element.Add(new XAttribute("Panel", connectionInfo.Panel));
+            element.Add(new XAttribute("Id", connectionInfo.ConstantID));
+
+            element.Add(_saveFilter.SaveUsername
+                ? new XAttribute("Username", connectionInfo.Username)
+                : new XAttribute("Username", ""));
+
+            element.Add(_saveFilter.SaveDomain
+                ? new XAttribute("Domain", connectionInfo.Domain)
+                : new XAttribute("Domain", ""));
+
+            if (_saveFilter.SavePassword && !connectionInfo.Inheritance.Password)
+                element.Add(new XAttribute("Password", _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey)));
+            else
+                element.Add(new XAttribute("Password", ""));
+
+            element.Add(new XAttribute("Hostname", connectionInfo.Hostname));
+            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("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("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("RedirectClipboard", connectionInfo.RedirectClipboard.ToString().ToLowerInvariant()));
+            element.Add(new XAttribute("RedirectSmartCards", connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant()));
+            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("PreExtApp", connectionInfo.PreExtApp));
+            element.Add(new XAttribute("PostExtApp", connectionInfo.PostExtApp));
+            element.Add(new XAttribute("MacAddress", connectionInfo.MacAddress));
+            element.Add(new XAttribute("UserField", connectionInfo.UserField));
+            element.Add(new XAttribute("ExtApp", connectionInfo.ExtApp));
+            element.Add(new XAttribute("VNCCompression", connectionInfo.VNCCompression));
+            element.Add(new XAttribute("VNCEncoding", connectionInfo.VNCEncoding));
+            element.Add(new XAttribute("VNCAuthMode", connectionInfo.VNCAuthMode));
+            element.Add(new XAttribute("VNCProxyType", connectionInfo.VNCProxyType));
+            element.Add(new XAttribute("VNCProxyIP", connectionInfo.VNCProxyIP));
+            element.Add(new XAttribute("VNCProxyPort", connectionInfo.VNCProxyPort));
+
+            element.Add(_saveFilter.SaveUsername
+                ? new XAttribute("VNCProxyUsername", connectionInfo.VNCProxyUsername)
+                : new XAttribute("VNCProxyUsername", ""));
+
+            element.Add(_saveFilter.SavePassword
+                ? new XAttribute("VNCProxyPassword",
+                    _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, _encryptionKey))
+                : new XAttribute("VNCProxyPassword", ""));
+
+            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("RDGatewayUsageMethod", connectionInfo.RDGatewayUsageMethod));
+            element.Add(new XAttribute("RDGatewayHostname", connectionInfo.RDGatewayHostname));
+            element.Add(new XAttribute("RDGatewayUseConnectionCredentials", connectionInfo.RDGatewayUseConnectionCredentials));
+
+            element.Add(_saveFilter.SaveUsername
+                ? new XAttribute("RDGatewayUsername", connectionInfo.RDGatewayUsername)
+                : new XAttribute("RDGatewayUsername", ""));
+
+            element.Add(_saveFilter.SavePassword
+                ? new XAttribute("RDGatewayPassword",
+                    _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, _encryptionKey))
+                : new XAttribute("RDGatewayPassword", ""));
+
+            element.Add(_saveFilter.SaveDomain
+                ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain)
+                : new XAttribute("RDGatewayDomain", ""));
+        }
+
+        private void SetInheritanceAttributes(XContainer element, IInheritable connectionInfo)
+        {
+            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("InheritRedirectClipboard", connectionInfo.Inheritance.RedirectClipboard.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()));
+            }
+            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("InheritRedirectClipboard", 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));
+            }
+        }
+    }
+}

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs

@@ -13,6 +13,7 @@ using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
 using mRemoteNG.Security;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using mRemoteNG.UI.Forms;
@@ -20,19 +21,23 @@ using mRemoteNG.UI.TaskDialog;
 
 namespace mRemoteNG.Config.Serializers.Xml
 {
-	public class XmlConnectionsDeserializer : IDeserializer<string, ConnectionTreeModel>
+    public class XmlConnectionsDeserializer : IDeserializer<string, ConnectionTreeModel>
-    {
+	{
+	    private readonly IConnectionsService _connectionsService;
         private XmlDocument _xmlDocument;
         private double _confVersion;
         private XmlConnectionsDecryptor _decryptor;
         private string ConnectionFileName = "";
         private const double MaxSupportedConfVersion = 2.8;
         private readonly RootNodeInfo _rootNodeInfo = new RootNodeInfo(RootNodeType.Connection);
+	    private readonly IWin32Window _dialogWindowParent;
 
-        public Func<SecureString> AuthenticationRequestor { get; set; }
+        public Func<Optional<SecureString>> AuthenticationRequestor { get; set; }
 
-        public XmlConnectionsDeserializer(Func<SecureString> authenticationRequestor = null)
+        public XmlConnectionsDeserializer(IConnectionsService connectionsService, IWin32Window dialogWindowParent, Func<Optional<SecureString>> authenticationRequestor = null)
         {
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+            _dialogWindowParent = dialogWindowParent.ThrowIfNull(nameof(dialogWindowParent));
             AuthenticationRequestor = authenticationRequestor;
         }
 
@@ -47,8 +52,6 @@ namespace mRemoteNG.Config.Serializers.Xml
             {
                 LoadXmlConnectionData(xml);
                 ValidateConnectionFileVersion();
-                if (!import)
-                    Runtime.ConnectionsService.IsConnectionsFileLoaded = false;
 
                 var rootXmlElement = _xmlDocument.DocumentElement;
                 InitializeRootNode(rootXmlElement);
@@ -62,8 +65,6 @@ 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;
                     }
                 }
@@ -81,13 +82,13 @@ namespace mRemoteNG.Config.Serializers.Xml
                 AddNodesFromXmlRecursive(_xmlDocument.DocumentElement, _rootNodeInfo);
 
                 if (!import)
-                    Runtime.ConnectionsService.IsConnectionsFileLoaded = true;
+                    _connectionsService.IsConnectionsFileLoaded = true;
 
                 return connectionTreeModel;
             }
             catch (Exception ex)
             {
-                Runtime.ConnectionsService.IsConnectionsFileLoaded = false;
+                _connectionsService.IsConnectionsFileLoaded = false;
                 Runtime.MessageCollector.AddExceptionStackTrace(Language.strLoadFromXmlFailed, ex);
                 throw;
             }
@@ -117,7 +118,7 @@ namespace mRemoteNG.Config.Serializers.Xml
         private void ShowIncompatibleVersionDialogBox()
         {
             CTaskDialog.ShowTaskDialogBox(
-                FrmMain.Default,
+                _dialogWindowParent,
                 Application.ProductName,
                 "Incompatible connection file format",
                 $"The format of this connection file is not supported. Please upgrade to a newer version of {Application.ProductName}.",
@@ -208,7 +209,9 @@ namespace mRemoteNG.Config.Serializers.Xml
         {
             if (xmlnode.Attributes == null) return null;
 
-			var connectionId = xmlnode.Attributes["Id"]?.Value ?? Guid.NewGuid().ToString();
+			var connectionId = xmlnode.Attributes["Id"]?.Value;
+            if (string.IsNullOrWhiteSpace(connectionId))
+                connectionId = Guid.NewGuid().ToString();
 			var connectionInfo = new ConnectionInfo(connectionId);
 
             try
@@ -286,14 +289,14 @@ namespace mRemoteNG.Config.Serializers.Xml
                 if (_confVersion >= 0.5)
                 {
                     connectionInfo.RedirectDiskDrives = bool.Parse(xmlnode.Attributes["RedirectDiskDrives"].Value);
-                    connectionInfo.RedirectPrinters = bool.Parse(xmlnode.Attributes["RedirectPrinters"].Value);
+                    connectionInfo.RedirectPrinters = bool.Parse(xmlnode.Attributes["RedirectPrinters"].Value);                    
                     connectionInfo.RedirectPorts = bool.Parse(xmlnode.Attributes["RedirectPorts"].Value);
                     connectionInfo.RedirectSmartCards = bool.Parse(xmlnode.Attributes["RedirectSmartCards"].Value);
                 }
                 else
                 {
                     connectionInfo.RedirectDiskDrives = false;
-                    connectionInfo.RedirectPrinters = false;
+                    connectionInfo.RedirectPrinters = false;                    
                     connectionInfo.RedirectPorts = false;
                     connectionInfo.RedirectSmartCards = false;
                 }
@@ -509,6 +512,11 @@ namespace mRemoteNG.Config.Serializers.Xml
                     connectionInfo.RDPAlertIdleTimeout = bool.Parse(xmlnode.Attributes["RDPAlertIdleTimeout"]?.Value ?? "False");
                     connectionInfo.Inheritance.RDPAlertIdleTimeout = bool.Parse(xmlnode.Attributes["InheritRDPAlertIdleTimeout"]?.Value ?? "False");
                 }
+                if(_confVersion >= 2.7)
+                {
+                    connectionInfo.RedirectClipboard = bool.Parse(xmlnode.Attributes["RedirectClipboard"].Value);
+                    connectionInfo.Inheritance.RedirectClipboard = bool.Parse(xmlnode.Attributes["InheritRedirectClipboard"].Value);
+                }
             }
             catch (Exception ex)
             {

mRemoteV1/Config/Serializers/DataTableDeserializer.cs

@@ -10,18 +10,26 @@ using mRemoteNG.Connection.Protocol.ICA;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
+using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Serializers
 {
 	public class DataTableDeserializer : IDeserializer<DataTable, ConnectionTreeModel>
-    {
+	{
-        public ConnectionTreeModel Deserialize(DataTable table)
+	    private readonly IConnectionsService _connectionsService;
+
+	    public DataTableDeserializer(IConnectionsService connectionsService)
+	    {
+	        _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+	    }
+
+	    public ConnectionTreeModel Deserialize(DataTable table)
         {
             var connectionList = CreateNodesFromTable(table);
             var connectionTreeModel = CreateNodeHierarchy(connectionList, table);
-            Runtime.ConnectionsService.IsConnectionsFileLoaded = true;
+            _connectionsService.IsConnectionsFileLoaded = true;
             return connectionTreeModel;
         }
 
@@ -101,6 +109,7 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.RedirectDiskDrives = (bool)dataRow["RedirectDiskDrives"];
             connectionInfo.RedirectPorts = (bool)dataRow["RedirectPorts"];
             connectionInfo.RedirectPrinters = (bool)dataRow["RedirectPrinters"];
+            connectionInfo.RedirectClipboard = (bool)dataRow["RedirectClipboard"];
             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"]);
@@ -147,6 +156,7 @@ namespace mRemoteNG.Config.Serializers
             connectionInfo.Inheritance.RedirectKeys = (bool)dataRow["InheritRedirectKeys"];
             connectionInfo.Inheritance.RedirectPorts = (bool)dataRow["InheritRedirectPorts"];
             connectionInfo.Inheritance.RedirectPrinters = (bool)dataRow["InheritRedirectPrinters"];
+            connectionInfo.Inheritance.RedirectClipboard = (bool)dataRow["InheritRedirectClipboard"];
             connectionInfo.Inheritance.RedirectSmartCards = (bool)dataRow["InheritRedirectSmartCards"];
             connectionInfo.Inheritance.RedirectSound = (bool)dataRow["InheritRedirectSound"];
             connectionInfo.Inheritance.SoundQuality = (bool)dataRow["InheritSoundQuality"];

mRemoteV1/Config/Serializers/DataTableSerializer.cs

@@ -91,6 +91,7 @@ namespace mRemoteNG.Config.Serializers
             dataTable.Columns.Add("RedirectDiskDrives", typeof(bool));
             dataTable.Columns.Add("RedirectPorts", typeof(bool));
             dataTable.Columns.Add("RedirectPrinters", typeof(bool));
+            dataTable.Columns.Add("RedirectClipboard", typeof(bool));
             dataTable.Columns.Add("RedirectSmartCards", typeof(bool));
             dataTable.Columns.Add("RedirectSound", typeof(string));
             dataTable.Columns.Add("RedirectKeys", typeof(bool));
@@ -135,6 +136,7 @@ namespace mRemoteNG.Config.Serializers
             dataTable.Columns.Add("InheritRedirectKeys", typeof(bool));
             dataTable.Columns.Add("InheritRedirectPorts", typeof(bool));
             dataTable.Columns.Add("InheritRedirectPrinters", typeof(bool));
+            dataTable.Columns.Add("InheritRedirectClipboard", typeof(bool));
             dataTable.Columns.Add("InheritRedirectSmartCards", typeof(bool));
             dataTable.Columns.Add("InheritRedirectSound", typeof(bool));
             dataTable.Columns.Add("InheritResolution", typeof(bool));
@@ -235,6 +237,7 @@ namespace mRemoteNG.Config.Serializers
             dataRow["RedirectDiskDrives"] = connectionInfo.RedirectDiskDrives;
             dataRow["RedirectPorts"] = connectionInfo.RedirectPorts;
             dataRow["RedirectPrinters"] = connectionInfo.RedirectPrinters;
+            dataRow["RedirectClipboard"] = connectionInfo.RedirectClipboard;
             dataRow["RedirectSmartCards"] = connectionInfo.RedirectSmartCards;
             dataRow["RedirectSound"] = connectionInfo.RedirectSound;
             dataRow["SoundQuality"] = connectionInfo.SoundQuality;
@@ -282,6 +285,7 @@ namespace mRemoteNG.Config.Serializers
                 dataRow["InheritRedirectKeys"] = connectionInfo.Inheritance.RedirectKeys;
                 dataRow["InheritRedirectPorts"] = connectionInfo.Inheritance.RedirectPorts;
                 dataRow["InheritRedirectPrinters"] = connectionInfo.Inheritance.RedirectPrinters;
+                dataRow["InheritRedirectClipboard"] = connectionInfo.Inheritance.RedirectClipboard;
                 dataRow["InheritRedirectSmartCards"] = connectionInfo.Inheritance.RedirectSmartCards;
                 dataRow["InheritRedirectSound"] = connectionInfo.Inheritance.RedirectSound;
                 dataRow["InheritSoundQuality"] = connectionInfo.Inheritance.SoundQuality;
@@ -339,6 +343,7 @@ namespace mRemoteNG.Config.Serializers
                 dataRow["InheritRedirectKeys"] = false;
                 dataRow["InheritRedirectPorts"] = false;
                 dataRow["InheritRedirectPrinters"] = false;
+                dataRow["InheritRedirectClipboard"] = false;
                 dataRow["InheritRedirectSmartCards"] = false;
                 dataRow["InheritRedirectSound"] = false;
                 dataRow["InheritSoundQuality"] = false;

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs

@@ -108,6 +108,9 @@ namespace mRemoteNG.Config.Serializers
                 case "redirectprinters":
                     connectionInfo.RedirectPrinters = value == "1";
                     break;
+                case "redirectclipboard":
+                    connectionInfo.RedirectClipboard = value == "1";
+                    break;
                 case "audiomode":
                     switch (value)
                     {

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs

@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+using System.Security.Cryptography;
+using System.Text;
 using System.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
@@ -7,8 +9,6 @@ using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using System.Security.Cryptography;
-using System.Text;
 
 
 namespace mRemoteNG.Config.Serializers
@@ -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,15 +101,16 @@ namespace mRemoteNG.Config.Serializers
         {
             if (_schemaVersion == 1)
             {
-                // Program Verison 2.2 wraps all setting inside the Properties tags 
+                // Program Version 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 Verison 2.7 wraps these properties
+                // Program Version 2.7 wraps these properties
                 containerPropertiesNode = containerPropertiesNode.SelectSingleNode("./properties");
             }
             newContainer.Name = containerPropertiesNode?.SelectSingleNode("./name")?.InnerText ?? Language.strNewFolder;
@@ -130,20 +131,22 @@ 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         
+            if (_schemaVersion == 1) propertiesNode = xmlNode;  // Version 2.2 defines the container name at the root instead
-            connectionInfo.Hostname = propertiesNode.SelectSingleNode("./name")?.InnerText;
+            connectionInfo.Hostname = propertiesNode?.SelectSingleNode("./name")?.InnerText ?? "";
-            connectionInfo.Name = propertiesNode.SelectSingleNode("./displayName")?.InnerText ?? connectionInfo.Hostname;
+            connectionInfo.Name = propertiesNode?.SelectSingleNode("./displayName")?.InnerText ?? connectionInfo.Hostname;
-            connectionInfo.Description = propertiesNode.SelectSingleNode("./comment")?.InnerText ?? String.Empty;
+            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
                 {
@@ -160,7 +163,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
@@ -174,7 +177,7 @@ 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.RDGatewayHostname = gatewaySettingsNode.SelectSingleNode("./hostName")?.InnerText;
@@ -198,7 +201,7 @@ 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
@@ -231,7 +234,7 @@ 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)
@@ -271,10 +274,11 @@ namespace mRemoteNG.Config.Serializers
                 }
 
                 // ./redirectClipboard
-                connectionInfo.RedirectDiskDrives = bool.Parse(localResourcesNode.SelectSingleNode("./redirectDrives")?.InnerText ?? "false");
+                connectionInfo.RedirectDiskDrives = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectDrives")?.InnerText ?? "false");
-                connectionInfo.RedirectPorts = bool.Parse(localResourcesNode.SelectSingleNode("./redirectPorts")?.InnerText ?? "false");
+                connectionInfo.RedirectPorts = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectPorts")?.InnerText ?? "false");
-                connectionInfo.RedirectPrinters = bool.Parse(localResourcesNode.SelectSingleNode("./redirectPrinters")?.InnerText ?? "false");
+                connectionInfo.RedirectPrinters = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectPrinters")?.InnerText ?? "false");
-                connectionInfo.RedirectSmartCards = bool.Parse(localResourcesNode.SelectSingleNode("./redirectSmartCards")?.InnerText ?? "false");
+                connectionInfo.RedirectSmartCards = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectSmartCards")?.InnerText ?? "false");
+                connectionInfo.RedirectClipboard = bool.Parse(localResourcesNode?.SelectSingleNode("./redirectClipboard")?.InnerText ?? "false");
             }
             else
             {
@@ -284,10 +288,11 @@ namespace mRemoteNG.Config.Serializers
                 connectionInfo.Inheritance.RedirectPorts = true;
                 connectionInfo.Inheritance.RedirectPrinters = true;
                 connectionInfo.Inheritance.RedirectSmartCards = true;
+                connectionInfo.Inheritance.RedirectClipboard = true;
             }
 
             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)
@@ -321,7 +326,7 @@ namespace mRemoteNG.Config.Serializers
         private static string DecryptRdcManPassword(string ciphertext)
         {
             if (string.IsNullOrEmpty(ciphertext))
-                return null;
+                return string.Empty;
 
             try
             {
@@ -332,7 +337,7 @@ namespace mRemoteNG.Config.Serializers
             catch (Exception /*ex*/)
             {
                 //Runtime.MessageCollector.AddExceptionMessage("RemoteDesktopConnectionManager.DecryptPassword() failed.", ex, logOnly: true);
-                return null;
+                return string.Empty;
             }
         }
     }

mRemoteV1/Config/Serializers/XmlConnectionsDecryptor.cs

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

mRemoteV1/Config/Settings/DockPanelLayoutLoader.cs

@@ -5,6 +5,7 @@ using mRemoteNG.UI.Window;
 using System;
 using System.IO;
 using mRemoteNG.Messages;
+using mRemoteNG.Tools;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.Config.Settings
@@ -13,16 +14,13 @@ namespace mRemoteNG.Config.Settings
     {
         private readonly FrmMain _mainForm;
         private readonly MessageCollector _messageCollector;
+        private readonly Windows _windows;
 
-        public DockPanelLayoutLoader(FrmMain mainForm, MessageCollector messageCollector)
+        public DockPanelLayoutLoader(FrmMain mainForm, MessageCollector messageCollector, Windows windows)
         {
-            if (mainForm == null)
+            _mainForm = mainForm.ThrowIfNull(nameof(mainForm));
-                throw new ArgumentNullException(nameof(mainForm));
+            _messageCollector = messageCollector.ThrowIfNull(nameof(messageCollector));
-            if (messageCollector == null)
+            _windows = windows.ThrowIfNull(nameof(windows));
-                throw new ArgumentNullException(nameof(messageCollector));
-
-            _mainForm = mainForm;
-            _messageCollector = messageCollector;
         }
 
         public void LoadPanelsFromXml()
@@ -69,16 +67,16 @@ namespace mRemoteNG.Config.Settings
             try
             {
                 if (persistString == typeof(ConfigWindow).ToString())
-                    return Windows.ConfigForm;
+                    return _windows.ConfigForm;
 
                 if (persistString == typeof(ConnectionTreeWindow).ToString())
-                    return Windows.TreeForm;
+                    return _windows.TreeForm;
 
                 if (persistString == typeof(ErrorAndInfoWindow).ToString())
-                    return Windows.ErrorsForm;
+                    return _windows.ErrorsForm;
 
                 if (persistString == typeof(ScreenshotManagerWindow).ToString())
-                    return Windows.ScreenshotForm;
+                    return _windows.ScreenshotForm;
             }
             catch (Exception ex)
             {

mRemoteV1/Config/Settings/DockPanelLayoutSaver.cs

@@ -25,7 +25,7 @@ namespace mRemoteNG.Config.Settings
             _dataProvider = dataProvider;
         }
 
-        public void Save()
+        public void Save(DockPanel dockPanel)
         {
             try
             {
@@ -34,7 +34,7 @@ namespace mRemoteNG.Config.Settings
                     Directory.CreateDirectory(SettingsFileInfo.SettingsPath);
                 }
 
-                var serializedLayout = _dockPanelSerializer.Serialize(FrmMain.Default.pnlDock);
+                var serializedLayout = _dockPanelSerializer.Serialize(dockPanel);
                 _dataProvider.Save(serializedLayout);
             }
             catch (Exception ex)

mRemoteV1/Config/Settings/ExternalAppsLoader.cs

@@ -4,6 +4,7 @@ using mRemoteNG.App.Info;
 using mRemoteNG.UI.Forms;
 using System.IO;
 using System.Xml;
+using mRemoteNG.Connection;
 using mRemoteNG.Messages;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Controls;
@@ -12,22 +13,20 @@ namespace mRemoteNG.Config.Settings
 {
     public class ExternalAppsLoader
     {
-        private readonly FrmMain _mainForm;
         private readonly MessageCollector _messageCollector;
         private readonly ExternalToolsToolStrip _externalToolsToolStrip;
+        private readonly IConnectionInitiator _connectionInitiator;
+        private readonly ExternalToolsService _externalToolsService;
+        private readonly IConnectionsService _connectionsService;
 
-        public ExternalAppsLoader(FrmMain mainForm, MessageCollector messageCollector, ExternalToolsToolStrip externalToolsToolStrip)
+        public ExternalAppsLoader(MessageCollector messageCollector, ExternalToolsToolStrip externalToolsToolStrip, 
+            IConnectionInitiator connectionInitiator, ExternalToolsService externalToolsService, IConnectionsService connectionsService)
         {
-            if (mainForm == null)
+            _messageCollector = messageCollector.ThrowIfNull(nameof(messageCollector));
-                throw new ArgumentNullException(nameof(mainForm));
+            _externalToolsToolStrip = externalToolsToolStrip.ThrowIfNull(nameof(externalToolsToolStrip));
-            if (messageCollector == null)
+            _connectionInitiator = connectionInitiator.ThrowIfNull(nameof(connectionInitiator));
-                throw new ArgumentNullException(nameof(messageCollector));
+            _externalToolsService = externalToolsService.ThrowIfNull(nameof(externalToolsService));
-            if (externalToolsToolStrip == null)
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
-                throw new ArgumentNullException(nameof(externalToolsToolStrip));
-
-            _mainForm = mainForm;
-            _messageCollector = messageCollector;
-            _externalToolsToolStrip = externalToolsToolStrip;
         }
 
 
@@ -48,7 +47,6 @@ namespace mRemoteNG.Config.Settings
 			{
                 _messageCollector.AddMessage(MessageClass.InformationMsg, $"Loading External Apps from: {oldPath}", true);
                 xDom.Load(oldPath);
-
 			}
 #endif
             else
@@ -65,7 +63,7 @@ namespace mRemoteNG.Config.Settings
 
             foreach (XmlElement xEl in xDom.DocumentElement.ChildNodes)
             {
-                var extA = new ExternalTool
+                var extA = new ExternalTool(_connectionInitiator, _connectionsService)
                 {
                     DisplayName = xEl.Attributes["DisplayName"].Value,
                     FileName = xEl.Attributes["FileName"].Value,
@@ -94,7 +92,7 @@ namespace mRemoteNG.Config.Settings
                 }
 
                 _messageCollector.AddMessage(MessageClass.InformationMsg, $"Adding External App: {extA.DisplayName} {extA.FileName} {extA.Arguments}", true);
-                Runtime.ExternalToolsService.ExternalTools.Add(extA);
+                _externalToolsService.ExternalTools.Add(extA);
             }
 
             _externalToolsToolStrip.SwitchToolBarText(mRemoteNG.Settings.Default.ExtAppsTBShowText);

mRemoteV1/Config/Settings/Providers/ChooseProvider.cs

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

mRemoteV1/Config/Settings/Providers/PortableSettingsProvider.cs

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

mRemoteV1/Config/Settings/SettingsLoader.cs

@@ -19,11 +19,12 @@ 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;
-
+	    private readonly Func<NotificationAreaIcon> _notificationAreaIconBuilder;
-        private FrmMain MainForm { get; }
+	    private readonly FrmMain _frmMain;
 
 
 	    public SettingsLoader(
@@ -31,26 +32,20 @@ namespace mRemoteNG.Config.Settings
             MessageCollector messageCollector, 
             QuickConnectToolStrip quickConnectToolStrip, 
             ExternalToolsToolStrip externalToolsToolStrip,
-            MultiSshToolStrip multiSshToolStrip)
+            MultiSshToolStrip multiSshToolStrip,
+	        ExternalAppsLoader externalAppsLoader,
+	        Func<NotificationAreaIcon> notificationAreaIconBuilder,
+            MenuStrip mainMenu)
 		{
-            if (mainForm == null)
+		    _frmMain = mainForm.ThrowIfNull(nameof(mainForm));
-                throw new ArgumentNullException(nameof(mainForm));
+	        _messageCollector = messageCollector.ThrowIfNull(nameof(messageCollector));
-            if (messageCollector == null)
+	        _quickConnectToolStrip = quickConnectToolStrip.ThrowIfNull(nameof(quickConnectToolStrip));
-                throw new ArgumentNullException(nameof(messageCollector));
+	        _externalToolsToolStrip = externalToolsToolStrip.ThrowIfNull(nameof(externalToolsToolStrip));
-            if (quickConnectToolStrip == null)
+		    _multiSshToolStrip = multiSshToolStrip.ThrowIfNull(nameof(multiSshToolStrip));
-                throw new ArgumentNullException(nameof(quickConnectToolStrip));
+		    _externalAppsLoader = externalAppsLoader.ThrowIfNull(nameof(externalAppsLoader));
-            if (externalToolsToolStrip == null)
+		    _notificationAreaIconBuilder = notificationAreaIconBuilder.ThrowIfNull(nameof(notificationAreaIconBuilder));
-                throw new ArgumentNullException(nameof(externalToolsToolStrip));
+		    _mainMenu = mainMenu.ThrowIfNull(nameof(mainMenu));
-            if (multiSshToolStrip == null)
+		}
-                throw new ArgumentNullException(nameof(multiSshToolStrip));
-
-            MainForm = mainForm;
-	        _messageCollector = messageCollector;
-	        _quickConnectToolStrip = quickConnectToolStrip;
-	        _externalToolsToolStrip = externalToolsToolStrip;
-		    _multiSshToolStrip = multiSshToolStrip;
-            _externalAppsLoader = new ExternalAppsLoader(MainForm, messageCollector, _externalToolsToolStrip);
-        }
         
         #region Public Methods
         public void LoadSettings()
@@ -80,10 +75,10 @@ namespace mRemoteNG.Config.Settings
 			}
 		}
 
-        private static void SetAlwaysShowPanelTabs()
+        private void SetAlwaysShowPanelTabs()
         {
             if (mRemoteNG.Settings.Default.AlwaysShowPanelTabs)
-                FrmMain.Default.pnlDock.DocumentStyle = DocumentStyle.DockingWindow;
+                _frmMain.pnlDock.DocumentStyle = DocumentStyle.DockingWindow;
         }
 
  
@@ -98,32 +93,32 @@ namespace mRemoteNG.Config.Settings
 
         private void SetApplicationWindowPositionAndSize()
         {
-            MainForm.WindowState = FormWindowState.Normal;
+            _frmMain.WindowState = FormWindowState.Normal;
             if (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Normal)
             {
                 if (!mRemoteNG.Settings.Default.MainFormLocation.IsEmpty)
-                    MainForm.Location = mRemoteNG.Settings.Default.MainFormLocation;
+                    _frmMain.Location = mRemoteNG.Settings.Default.MainFormLocation;
                 if (!mRemoteNG.Settings.Default.MainFormSize.IsEmpty)
-                    MainForm.Size = mRemoteNG.Settings.Default.MainFormSize;
+                    _frmMain.Size = mRemoteNG.Settings.Default.MainFormSize;
             }
             else
             {
                 if (!mRemoteNG.Settings.Default.MainFormRestoreLocation.IsEmpty)
-                    MainForm.Location = mRemoteNG.Settings.Default.MainFormRestoreLocation;
+                    _frmMain.Location = mRemoteNG.Settings.Default.MainFormRestoreLocation;
                 if (!mRemoteNG.Settings.Default.MainFormRestoreSize.IsEmpty)
-                    MainForm.Size = mRemoteNG.Settings.Default.MainFormRestoreSize;
+                    _frmMain.Size = mRemoteNG.Settings.Default.MainFormRestoreSize;
             }
 
             if (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Maximized)
             {
-                MainForm.WindowState = FormWindowState.Maximized;
+                _frmMain.WindowState = FormWindowState.Maximized;
             }
 
             // Make sure the form is visible on the screen
             const int minHorizontal = 300;
             const int minVertical = 150;
-            var screenBounds = Screen.FromHandle(MainForm.Handle).Bounds;
+            var screenBounds = Screen.FromHandle(_frmMain.Handle).Bounds;
-            var newBounds = MainForm.Bounds;
+            var newBounds = _frmMain.Bounds;
 
             if (newBounds.Right < screenBounds.Left + minHorizontal)
                 newBounds.X = screenBounds.Left + minHorizontal - newBounds.Width;
@@ -134,29 +129,29 @@ namespace mRemoteNG.Config.Settings
             if (newBounds.Top > screenBounds.Bottom - minVertical)
                 newBounds.Y = screenBounds.Bottom - minVertical;
 
-            MainForm.Location = newBounds.Location;
+            _frmMain.Location = newBounds.Location;
         }
 
         private void SetAutoSave()
         {
             if (mRemoteNG.Settings.Default.AutoSaveEveryMinutes <= 0) return;
-            MainForm.tmrAutoSave.Interval = mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000;
+            _frmMain.tmrAutoSave.Interval = mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000;
-            MainForm.tmrAutoSave.Enabled = true;
+            _frmMain.tmrAutoSave.Enabled = true;
         }
 
         private void SetKioskMode()
         {
             if (!mRemoteNG.Settings.Default.MainFormKiosk) return;
-            MainForm.Fullscreen.Value = true;
+            _frmMain.Fullscreen.Value = true;
         }
 
-        private static void SetShowSystemTrayIcon()
+        private void SetShowSystemTrayIcon()
         {
             if (mRemoteNG.Settings.Default.ShowSystemTrayIcon)
-                Runtime.NotificationAreaIcon = new NotificationAreaIcon();
+                Runtime.NotificationAreaIcon = _notificationAreaIconBuilder();
         }
 
-        private static void SetPuttyPath()
+        private void SetPuttyPath()
         {
             PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath;
         }
@@ -197,6 +192,7 @@ namespace mRemoteNG.Config.Settings
 	    private void LoadToolbarsFromSettings()
 		{
             ResetAllToolbarLocations();
+		    AddMainMenuPanel();
             AddExternalAppsPanel();
 		    AddQuickConnectPanel();
 		    AddMultiSshPanel();
@@ -210,46 +206,64 @@ 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()
 		{
-		    var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
+		    SetToolstripGripStyle(_externalToolsToolStrip);
-            toolStripPanel.Join(_externalToolsToolStrip, mRemoteNG.Settings.Default.ExtAppsTBLocation);
             _externalToolsToolStrip.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible;
+            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
+            toolStripPanel.Join(_externalToolsToolStrip, mRemoteNG.Settings.Default.ExtAppsTBLocation);
 		}
 
 	    private void AddMultiSshPanel()
 	    {
-	        var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock);
+	        SetToolstripGripStyle(_multiSshToolStrip);
-            toolStripPanel.Join(_multiSshToolStrip, mRemoteNG.Settings.Default.MultiSshToolbarLocation);
 	        _multiSshToolStrip.Visible = mRemoteNG.Settings.Default.MultiSshToolbarVisible;
+            var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.MultiSshToolbarParentDock);
+            toolStripPanel.Join(_multiSshToolStrip, mRemoteNG.Settings.Default.MultiSshToolbarLocation);
 	    }
+
+	    private void SetToolstripGripStyle(ToolStrip toolbar)
+	    {
+	        toolbar.GripStyle = mRemoteNG.Settings.Default.LockToolbars
+	            ? ToolStripGripStyle.Hidden
+	            : ToolStripGripStyle.Visible;
+        }
 		
 		private ToolStripPanel ToolStripPanelFromString(string panel)
 		{
 			switch (panel.ToLower())
 			{
 				case "top":
-					return MainForm.tsContainer.TopToolStripPanel;
+					return _frmMain.tsContainer.TopToolStripPanel;
 				case "bottom":
-					return MainForm.tsContainer.BottomToolStripPanel;
+					return _frmMain.tsContainer.BottomToolStripPanel;
 				case "left":
-					return MainForm.tsContainer.LeftToolStripPanel;
+					return _frmMain.tsContainer.LeftToolStripPanel;
 				case "right":
-					return MainForm.tsContainer.RightToolStripPanel;
+					return _frmMain.tsContainer.RightToolStripPanel;
 				default:
-					return MainForm.tsContainer.TopToolStripPanel;
+					return _frmMain.tsContainer.TopToolStripPanel;
 			}
 		}
 
@@ -259,4 +273,4 @@ namespace mRemoteNG.Config.Settings
         }
         #endregion
 	}
-}
+}

mRemoteV1/Config/Settings/SettingsSaver.cs

@@ -6,12 +6,20 @@ using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
+using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.Config.Settings
 {
-    public static class SettingsSaver
+    public class SettingsSaver
     {
-        public static void SaveSettings(
+        private readonly ExternalToolsService _externalToolsService;
+
+        public SettingsSaver(ExternalToolsService externalToolsService)
+        {
+            _externalToolsService = externalToolsService.ThrowIfNull(nameof(externalToolsService));
+        }
+
+        public void SaveSettings(
             Control quickConnectToolStrip, 
             ExternalToolsToolStrip externalToolsToolStrip,
             MultiSshToolStrip multiSshToolStrip,
@@ -19,7 +27,7 @@ namespace mRemoteNG.Config.Settings
         {
             try
             {
-                var windowPlacement = new WindowPlacement(FrmMain.Default);
+                var windowPlacement = new WindowPlacement(frmMain);
                 if (frmMain.WindowState == FormWindowState.Minimized & windowPlacement.RestoreToMaximized)
                 {
                     frmMain.Opacity = 0;
@@ -53,7 +61,7 @@ namespace mRemoteNG.Config.Settings
                 
                 mRemoteNG.Settings.Default.Save();
 
-                SaveDockPanelLayout();
+                SaveDockPanelLayout(frmMain.pnlDock);
                 SaveExternalApps();
             }
             catch (Exception ex)
@@ -62,7 +70,7 @@ namespace mRemoteNG.Config.Settings
             }
         }
 
-        private static void SaveExternalAppsToolbarLocation(ExternalToolsToolStrip externalToolsToolStrip)
+        private void SaveExternalAppsToolbarLocation(ExternalToolsToolStrip externalToolsToolStrip)
         {
             mRemoteNG.Settings.Default.ExtAppsTBLocation = externalToolsToolStrip.Location;
             mRemoteNG.Settings.Default.ExtAppsTBVisible = externalToolsToolStrip.Visible;
@@ -74,7 +82,7 @@ namespace mRemoteNG.Config.Settings
             }
         }
 
-        private static void SaveQuickConnectToolbarLocation(Control quickConnectToolStrip)
+        private void SaveQuickConnectToolbarLocation(Control quickConnectToolStrip)
         {
             mRemoteNG.Settings.Default.QuickyTBLocation = quickConnectToolStrip.Location;
             mRemoteNG.Settings.Default.QuickyTBVisible = quickConnectToolStrip.Visible;
@@ -85,7 +93,7 @@ namespace mRemoteNG.Config.Settings
             }
         }
 
-        private static void SaveMultiSshToolbarLocation(MultiSshToolStrip multiSshToolStrip)
+        private void SaveMultiSshToolbarLocation(MultiSshToolStrip multiSshToolStrip)
         {
             mRemoteNG.Settings.Default.MultiSshToolbarLocation = multiSshToolStrip.Location;
             mRemoteNG.Settings.Default.MultiSshToolbarVisible = multiSshToolStrip.Visible;
@@ -96,20 +104,20 @@ namespace mRemoteNG.Config.Settings
             }
         }
 
-        private static void SaveDockPanelLayout()
+        private void SaveDockPanelLayout(DockPanel dockPanel)
         {
             var panelLayoutXmlFilePath = SettingsFileInfo.SettingsPath + "\\" + SettingsFileInfo.LayoutFileName;
             var panelLayoutSaver = new DockPanelLayoutSaver(
                 new DockPanelLayoutSerializer(),
                 new FileDataProvider(panelLayoutXmlFilePath)
             );
-            panelLayoutSaver.Save();
+            panelLayoutSaver.Save(dockPanel);
         }
 
-        private static void SaveExternalApps()
+        private void SaveExternalApps()
         {
             var externalAppsSaver = new ExternalAppsSaver();
-            externalAppsSaver.Save(Runtime.ExternalToolsService.ExternalTools);
+            externalAppsSaver.Save(_externalToolsService.ExternalTools);
         }
     }
 }

mRemoteV1/Connection/AbstractConnectionRecord.cs

@@ -57,6 +57,7 @@ namespace mRemoteNG.Connection
         private bool _redirectKeys;
         private bool _redirectDiskDrives;
         private bool _redirectPrinters;
+        private bool _redirectClipboard;
         private bool _redirectPorts;
         private bool _redirectSmartCards;
         private RdpProtocol.RDPSounds _redirectSound;
@@ -87,8 +88,8 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDescription("strPropertyDescriptionName")]
         public virtual string Name
         {
-            get { return _name; }
+            get => _name;
-            set { SetField(ref _name, value, "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 { return GetPropertyValue("Description", _description); }
+            get => GetPropertyValue("Description", _description);
-            set { SetField(ref _description, value, "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 { return GetPropertyValue("Icon", _icon); }
+            get => GetPropertyValue("Icon", _icon);
-            set { SetField(ref _icon, value, "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 { return GetPropertyValue("Panel", _panel); }
+            get => GetPropertyValue("Panel", _panel);
-            set { SetField(ref _panel, value, "Panel"); }
+            set => SetField(ref _panel, value, "Panel");
         }
         #endregion
 
@@ -126,8 +127,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAddress")]
         public virtual string Hostname
         {
-            get { return _hostname.Trim(); }
+            get => _hostname.Trim();
-            set { SetField(ref _hostname, value?.Trim(), "Hostname"); }
+            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 { return GetPropertyValue("Username", _username); }
+            get => GetPropertyValue("Username", _username);
-            set { SetField(ref _username, value?.Trim(), "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 { return GetPropertyValue("Password", _password); }
+            get => GetPropertyValue("Password", _password);
-            set { SetField(ref _password, value, "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 { return GetPropertyValue("Domain", _domain).Trim(); }
+            get => GetPropertyValue("Domain", _domain).Trim();
-            set { SetField(ref _domain, value?.Trim(), "Domain"); }
+            set => SetField(ref _domain, value?.Trim(), "Domain");
         }
         #endregion
 
@@ -166,8 +167,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public virtual ProtocolType Protocol
         {
-            get { return GetPropertyValue("Protocol", _protocol); }
+            get => GetPropertyValue("Protocol", _protocol);
-            set { SetField(ref _protocol, value, "Protocol"); }
+            set => SetField(ref _protocol, value, "Protocol");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -176,8 +177,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(ExternalToolsTypeConverter))]
         public string ExtApp
         {
-            get { return GetPropertyValue("ExtApp", _extApp); }
+            get => GetPropertyValue("ExtApp", _extApp);
-            set { SetField(ref _extApp, value, "ExtApp"); }
+            set => SetField(ref _extApp, value, "ExtApp");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -185,8 +186,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPort")]
         public virtual int Port
         {
-            get { return GetPropertyValue("Port", _port); }
+            get => GetPropertyValue("Port", _port);
-            set { SetField(ref _port, value, "Port"); }
+            set => SetField(ref _port, value, "Port");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -195,8 +196,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList))]
         public virtual string PuttySession
         {
-            get { return GetPropertyValue("PuttySession", _puttySession); }
+            get => GetPropertyValue("PuttySession", _puttySession);
-            set { SetField(ref _puttySession, value, "PuttySession"); }
+            set => SetField(ref _puttySession, value, "PuttySession");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -205,8 +206,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public IcaProtocol.EncryptionStrength ICAEncryptionStrength
         {
-            get { return GetPropertyValue("ICAEncryptionStrength", _icaEncryption); }
+            get => GetPropertyValue("ICAEncryptionStrength", _icaEncryption);
-            set { SetField(ref _icaEncryption, value, "ICAEncryptionStrength"); }
+            set => SetField(ref _icaEncryption, value, "ICAEncryptionStrength");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -215,8 +216,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseConsoleSession
         {
-            get { return GetPropertyValue("UseConsoleSession", _useConsoleSession); }
+            get => GetPropertyValue("UseConsoleSession", _useConsoleSession);
-            set { SetField(ref _useConsoleSession, value, "UseConsoleSession"); }
+            set => SetField(ref _useConsoleSession, value, "UseConsoleSession");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -225,8 +226,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public RdpProtocol.AuthenticationLevel RDPAuthenticationLevel
         {
-            get { return GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel); }
+            get => GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel);
-            set { SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel"); }
+            set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -234,7 +235,7 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPMinutesToIdleTimeout")]
         public virtual int RDPMinutesToIdleTimeout
         {
-            get { return GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout); }
+            get => GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout);
             set {
                 if(value < 0)
                     value = 0;
@@ -249,8 +250,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPAlertIdleTimeout")]
         public bool RDPAlertIdleTimeout
         {
-            get { return GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout); }
+            get => GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout);
-            set { SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout"); }
+            set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -258,8 +259,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionLoadBalanceInfo")]
         public string LoadBalanceInfo
         {
-            get { return GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim(); }
+            get => GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim();
-            set { SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo"); }
+            set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -268,8 +269,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public HTTPBase.RenderingEngine RenderingEngine
         {
-            get { return GetPropertyValue("RenderingEngine", _renderingEngine); }
+            get => GetPropertyValue("RenderingEngine", _renderingEngine);
-            set { SetField(ref _renderingEngine, value, "RenderingEngine"); }
+            set => SetField(ref _renderingEngine, value, "RenderingEngine");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
@@ -278,8 +279,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseCredSsp
         {
-            get { return GetPropertyValue("UseCredSsp", _useCredSsp); }
+            get => GetPropertyValue("UseCredSsp", _useCredSsp);
-            set { SetField(ref _useCredSsp, value, "UseCredSsp"); }
+            set => SetField(ref _useCredSsp, value, "UseCredSsp");
         }
         #endregion
 
@@ -290,8 +291,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public RdpProtocol.RDGatewayUsageMethod RDGatewayUsageMethod
         {
-            get { return GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod); }
+            get => GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod);
-            set { SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod"); }
+            set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -299,8 +300,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayHostname")]
         public string RDGatewayHostname
         {
-            get { return GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim(); }
+            get => GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim();
-            set { SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname"); }
+            set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -309,8 +310,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public RdpProtocol.RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
         {
-            get { return GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials); }
+            get => GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials);
-            set { SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials"); }
+            set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -318,8 +319,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsername")]
         public string RDGatewayUsername
         {
-            get { return GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim(); }
+            get => GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim();
-            set { SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername"); }
+            set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -328,8 +329,8 @@ namespace mRemoteNG.Connection
             PasswordPropertyText(true)]
         public string RDGatewayPassword
         {
-            get { return GetPropertyValue("RDGatewayPassword", _rdGatewayPassword); }
+            get => GetPropertyValue("RDGatewayPassword", _rdGatewayPassword);
-            set { SetField(ref _rdGatewayPassword, value, "RDGatewayPassword"); }
+            set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
@@ -337,8 +338,8 @@ namespace mRemoteNG.Connection
             LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayDomain")]
         public string RDGatewayDomain
         {
-            get { return GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim(); }
+            get => GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim();
-            set { SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain"); }
+            set => SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain");
         }
         #endregion
 
@@ -349,8 +350,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public RdpProtocol.RDPResolutions Resolution
         {
-            get { return GetPropertyValue("Resolution", _resolution); }
+            get => GetPropertyValue("Resolution", _resolution);
-            set { SetField(ref _resolution, value, "Resolution"); }
+            set => SetField(ref _resolution, value, "Resolution");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -359,8 +360,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool AutomaticResize
         {
-            get { return GetPropertyValue("AutomaticResize", _automaticResize); }
+            get => GetPropertyValue("AutomaticResize", _automaticResize);
-            set { SetField(ref _automaticResize, value, "AutomaticResize"); }
+            set => SetField(ref _automaticResize, value, "AutomaticResize");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -369,8 +370,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public RdpProtocol.RDPColors Colors
         {
-            get { return GetPropertyValue("Colors", _colors); }
+            get => GetPropertyValue("Colors", _colors);
-            set { SetField(ref _colors, value, "Colors"); }
+            set => SetField(ref _colors, value, "Colors");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -379,8 +380,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool CacheBitmaps
         {
-            get { return GetPropertyValue("CacheBitmaps", _cacheBitmaps); }
+            get => GetPropertyValue("CacheBitmaps", _cacheBitmaps);
-            set { SetField(ref _cacheBitmaps, value, "CacheBitmaps"); }
+            set => SetField(ref _cacheBitmaps, value, "CacheBitmaps");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -389,8 +390,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayWallpaper
         {
-            get { return GetPropertyValue("DisplayWallpaper", _displayWallpaper); }
+            get => GetPropertyValue("DisplayWallpaper", _displayWallpaper);
-            set { SetField(ref _displayWallpaper, value, "DisplayWallpaper"); }
+            set => SetField(ref _displayWallpaper, value, "DisplayWallpaper");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -399,8 +400,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayThemes
         {
-            get { return GetPropertyValue("DisplayThemes", _displayThemes); }
+            get => GetPropertyValue("DisplayThemes", _displayThemes);
-            set { SetField(ref _displayThemes, value, "DisplayThemes"); }
+            set => SetField(ref _displayThemes, value, "DisplayThemes");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -409,8 +410,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableFontSmoothing
         {
-            get { return GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing); }
+            get => GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing);
-            set { SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing"); }
+            set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -419,8 +420,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableDesktopComposition
         {
-            get { return GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition); }
+            get => GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition);
-            set { SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition"); }
+            set => SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition");
         }
         #endregion
 
@@ -431,8 +432,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectKeys
         {
-            get { return GetPropertyValue("RedirectKeys", _redirectKeys); }
+            get => GetPropertyValue("RedirectKeys", _redirectKeys);
-            set { SetField(ref _redirectKeys, value, "RedirectKeys"); }
+            set => SetField(ref _redirectKeys, value, "RedirectKeys");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -441,8 +442,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectDiskDrives
         {
-            get { return GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives); }
+            get => GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives);
-            set { SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives"); }
+            set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -451,8 +452,18 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPrinters
         {
-            get { return GetPropertyValue("RedirectPrinters", _redirectPrinters); }
+            get => GetPropertyValue("RedirectPrinters", _redirectPrinters);
-            set { SetField(ref _redirectPrinters, value, "RedirectPrinters"); }
+            set => SetField(ref _redirectPrinters, value, "RedirectPrinters");
+        }
+
+        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
+            LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectClipboard"),
+            LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectClipboard"),
+            TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
+        public bool RedirectClipboard
+        {
+            get { return GetPropertyValue("RedirectClipboard", _redirectClipboard); }
+            set { SetField(ref _redirectClipboard, value, "RedirectClipboard"); }
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -461,8 +472,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPorts
         {
-            get { return GetPropertyValue("RedirectPorts", _redirectPorts); }
+            get => GetPropertyValue("RedirectPorts", _redirectPorts);
-            set { SetField(ref _redirectPorts, value, "RedirectPorts"); }
+            set => SetField(ref _redirectPorts, value, "RedirectPorts");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -471,8 +482,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSmartCards
         {
-            get { return GetPropertyValue("RedirectSmartCards", _redirectSmartCards); }
+            get => GetPropertyValue("RedirectSmartCards", _redirectSmartCards);
-            set { SetField(ref _redirectSmartCards, value, "RedirectSmartCards"); }
+            set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -481,8 +492,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public RdpProtocol.RDPSounds RedirectSound
         {
-            get { return GetPropertyValue("RedirectSound", _redirectSound); }
+            get => GetPropertyValue("RedirectSound", _redirectSound);
-            set { SetField(ref _redirectSound, value, "RedirectSound"); }
+            set => SetField(ref _redirectSound, value, "RedirectSound");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
@@ -491,8 +502,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public RdpProtocol.RDPSoundQuality SoundQuality
         {
-            get { return GetPropertyValue("SoundQuality", _soundQuality); }
+            get => GetPropertyValue("SoundQuality", _soundQuality);
-            set { SetField(ref _soundQuality, value, "SoundQuality"); }
+            set => SetField(ref _soundQuality, value, "SoundQuality");
         }
         #endregion
 
@@ -506,8 +517,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(ExternalToolsTypeConverter))]
         public virtual string PreExtApp
         {
-            get { return GetPropertyValue("PreExtApp", _preExtApp); }
+            get => GetPropertyValue("PreExtApp", _preExtApp);
-            set { SetField(ref _preExtApp, value, "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 { return GetPropertyValue("PostExtApp", _postExtApp); }
+            get => GetPropertyValue("PostExtApp", _postExtApp);
-            set { SetField(ref _postExtApp, value, "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 { return GetPropertyValue("MacAddress", _macAddress); }
+            get => GetPropertyValue("MacAddress", _macAddress);
-            set { SetField(ref _macAddress, value, "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 { return GetPropertyValue("UserField", _userField); }
+            get => GetPropertyValue("UserField", _userField);
-            set { SetField(ref _userField, value, "UserField"); }
+            set => SetField(ref _userField, value, "UserField");
         }
         #endregion
 
@@ -547,8 +558,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public ProtocolVNC.Compression VNCCompression
         {
-            get { return GetPropertyValue("VNCCompression", _vncCompression); }
+            get => GetPropertyValue("VNCCompression", _vncCompression);
-            set { SetField(ref _vncCompression, value, "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 { return GetPropertyValue("VNCEncoding", _vncEncoding); }
+            get => GetPropertyValue("VNCEncoding", _vncEncoding);
-            set { SetField(ref _vncEncoding, value, "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 { return GetPropertyValue("VNCAuthMode", _vncAuthMode); }
+            get => GetPropertyValue("VNCAuthMode", _vncAuthMode);
-            set { SetField(ref _vncAuthMode, value, "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 { return GetPropertyValue("VNCProxyType", _vncProxyType); }
+            get => GetPropertyValue("VNCProxyType", _vncProxyType);
-            set { SetField(ref _vncProxyType, value, "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 { return GetPropertyValue("VNCProxyIP", _vncProxyIp); }
+            get => GetPropertyValue("VNCProxyIP", _vncProxyIp);
-            set { SetField(ref _vncProxyIp, value, "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 { return GetPropertyValue("VNCProxyPort", _vncProxyPort); }
+            get => GetPropertyValue("VNCProxyPort", _vncProxyPort);
-            set { SetField(ref _vncProxyPort, value, "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 { return GetPropertyValue("VNCProxyUsername", _vncProxyUsername); }
+            get => GetPropertyValue("VNCProxyUsername", _vncProxyUsername);
-            set { SetField(ref _vncProxyUsername, value, "VNCProxyUsername"); }
+            set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
@@ -621,8 +632,8 @@ namespace mRemoteNG.Connection
             PasswordPropertyText(true)]
         public string VNCProxyPassword
         {
-            get { return GetPropertyValue("VNCProxyPassword", _vncProxyPassword); }
+            get => GetPropertyValue("VNCProxyPassword", _vncProxyPassword);
-            set { SetField(ref _vncProxyPassword, value, "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 { return GetPropertyValue("VNCColors", _vncColors); }
+            get => GetPropertyValue("VNCColors", _vncColors);
-            set { SetField(ref _vncColors, value, "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 { return GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode); }
+            get => GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode);
-            set { SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode"); }
+            set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode");
         }
 
         [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
@@ -652,8 +663,8 @@ namespace mRemoteNG.Connection
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool VNCViewOnly
         {
-            get { return GetPropertyValue("VNCViewOnly", _vncViewOnly); }
+            get => GetPropertyValue("VNCViewOnly", _vncViewOnly);
-            set { SetField(ref _vncViewOnly, value, "VNCViewOnly"); }
+            set => SetField(ref _vncViewOnly, value, "VNCViewOnly");
         }
         #endregion
         #endregion
@@ -665,7 +676,7 @@ namespace mRemoteNG.Connection
 
         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,12 +685,11 @@ namespace mRemoteNG.Connection
             PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(args.PropertyName));
         }
 
-        protected bool SetField<T>(ref T field, T value, string propertyName = null)
+        private void SetField<T>(ref T field, T value, string propertyName = null)
         {
-            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            if (EqualityComparer<T>.Default.Equals(field, value)) return;
             field = value;
             RaisePropertyChangedEvent(this, new PropertyChangedEventArgs(propertyName));
-            return true;
         }
     }
 }

mRemoteV1/Connection/ConnectionInfo.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
 using mRemoteNG.App;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.Http;
@@ -15,11 +10,16 @@ using mRemoteNG.Connection.Protocol.Telnet;
 using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
 using mRemoteNG.Tree;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
 
 
 namespace mRemoteNG.Connection
 {
-	[DefaultProperty("Name")]
+    [DefaultProperty("Name")]
     public class ConnectionInfo : AbstractConnectionRecord, IHasParent, IInheritable
     {        
         #region Public Properties
@@ -78,7 +78,8 @@ namespace mRemoteNG.Connection
 		    var newConnectionInfo = new ConnectionInfo();
             newConnectionInfo.CopyFrom(this);
 		    newConnectionInfo.Inheritance = Inheritance.Clone();
-			return newConnectionInfo;
+            newConnectionInfo.Inheritance.Parent = newConnectionInfo;
+            return newConnectionInfo;
 		}
 
 	    public void CopyFrom(ConnectionInfo sourceConnectionInfo)
@@ -172,10 +173,11 @@ namespace mRemoteNG.Connection
             if (!ShouldThisPropertyBeInherited(propertyName))
                 return value;
 
-            var inheritedValue = GetInheritedPropertyValue<TPropertyType>(propertyName);
+            var couldGetInheritedValue = TryGetInheritedPropertyValue<TPropertyType>(propertyName, out var inheritedValue);
-            if (inheritedValue.Equals(default(TPropertyType)))
+
-                return value;
+            return couldGetInheritedValue
-            return inheritedValue;
+                ? inheritedValue
+                : value;
         }
 
 	    private bool ShouldThisPropertyBeInherited(string propertyName)
@@ -196,22 +198,23 @@ namespace mRemoteNG.Connection
             return inheritPropertyValue;
         }
 
-        private TPropertyType GetInheritedPropertyValue<TPropertyType>(string propertyName)
+        private bool TryGetInheritedPropertyValue<TPropertyType>(string propertyName, out TPropertyType inheritedValue)
         {
             try
             {
                 var connectionInfoType = Parent.GetType();
                 var parentPropertyInfo = connectionInfoType.GetProperty(propertyName);
                 if (parentPropertyInfo == null)
-                    return default(TPropertyType); // shouldn't get here...
+                    throw new NullReferenceException($"Could not retrieve property data for property '{propertyName}' on parent node '{Parent?.Name}'");
-                var parentPropertyValue = (TPropertyType)parentPropertyInfo.GetValue(Parent, null);
 
-                return parentPropertyValue;
+                inheritedValue = (TPropertyType)parentPropertyInfo.GetValue(Parent, null);
+                return true;
             }
             catch (Exception e)
             {
                 Runtime.MessageCollector.AddExceptionStackTrace($"Error retrieving inherited property '{propertyName}'", e);
-                return default(TPropertyType);
+                inheritedValue = default(TPropertyType);
+                return false;
             }
         }
 
@@ -310,9 +313,10 @@ namespace mRemoteNG.Connection
             RedirectKeys = Settings.Default.ConDefaultRedirectKeys;
             RedirectDiskDrives = Settings.Default.ConDefaultRedirectDiskDrives;
             RedirectPrinters = Settings.Default.ConDefaultRedirectPrinters;
+            RedirectClipboard = Settings.Default.ConDefaultRedirectClipboard;
             RedirectPorts = Settings.Default.ConDefaultRedirectPorts;
             RedirectSmartCards = Settings.Default.ConDefaultRedirectSmartCards;
-            RedirectSound = (RdpProtocol.RDPSounds) Enum.Parse(typeof(RdpProtocol.RDPSounds), Settings.Default.ConDefaultRedirectSound);
+            RedirectSound = (RdpProtocol.RDPSounds) Enum.Parse(typeof(RdpProtocol.RDPSounds), Settings.Default.ConDefaultRedirectSound);            
             SoundQuality = (RdpProtocol.RDPSoundQuality)Enum.Parse(typeof(RdpProtocol.RDPSoundQuality), Settings.Default.ConDefaultSoundQuality);
         }
 

mRemoteV1/Connection/ConnectionInfoInheritance.cs

@@ -215,8 +215,13 @@ namespace mRemoteNG.Connection
 		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPrinters"), 
 		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPrinters"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool RedirectPrinters {get; set;}
-				
+
-		[LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7), 
+        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
+        LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectClipboard"),
+        LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectClipboard"),
+        TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool RedirectClipboard { get; set; }
+
+        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7), 
 		LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameRedirectPorts"), 
 		LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionRedirectPorts"), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool RedirectPorts {get; set;}

mRemoteV1/Connection/ConnectionInitiator.cs

@@ -5,6 +5,8 @@ using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
+using mRemoteNG.Tools;
+using mRemoteNG.UI;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Panels;
 using mRemoteNG.UI.Window;
@@ -14,8 +16,25 @@ using TabPage = Crownwood.Magic.Controls.TabPage;
 namespace mRemoteNG.Connection
 {
 	public class ConnectionInitiator : IConnectionInitiator
-    {
+	{
-        private readonly PanelAdder _panelAdder = new PanelAdder();
+	    private readonly WindowList _windowList;
+	    private readonly ExternalToolsService _externalToolsService;
+	    private readonly ProtocolFactory _protocolFactory;
+	    private readonly FrmMain _frmMain;
+
+        /// <summary>
+        /// This is a property because we have a circular dependency.
+        /// </summary>
+	    public PanelAdder Adder { get; set; }
+
+
+        public ConnectionInitiator(WindowList windowList, ExternalToolsService externalToolsService, ProtocolFactory protocolFactory, FrmMain frmMain)
+        {
+            _frmMain = frmMain;
+            _windowList = windowList.ThrowIfNull(nameof(windowList));
+            _externalToolsService = externalToolsService.ThrowIfNull(nameof(externalToolsService));
+            _protocolFactory = protocolFactory.ThrowIfNull(nameof(protocolFactory));
+        }
 
         public void OpenConnection(ContainerInfo containerInfo, ConnectionInfo.Force force = ConnectionInfo.Force.None)
         {
@@ -53,7 +72,7 @@ namespace mRemoteNG.Connection
             var connectionWindow = (ConnectionWindow)interfaceControl.FindForm();
             connectionWindow?.Focus();
             var findForm = (ConnectionWindow)interfaceControl.FindForm();
-            findForm?.Show(FrmMain.Default.pnlDock);
+            findForm?.Show(_frmMain.pnlDock);
             var tabPage = (TabPage)interfaceControl.Parent;
             tabPage.Selected = true;
             return true;
@@ -92,10 +111,10 @@ namespace mRemoteNG.Connection
                         return;
                 }
 
-                var protocolFactory = new ProtocolFactory();
+                var newProtocol = _protocolFactory.CreateProtocol(connectionInfo);
-                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);
@@ -117,7 +136,7 @@ namespace mRemoteNG.Connection
                 }
 
                 connectionInfo.OpenConnections.Add(newProtocol);
-                FrmMain.Default.SelectedConnection = connectionInfo;
+                _frmMain.SelectedConnection = connectionInfo;
             }
             catch (Exception ex)
             {
@@ -125,19 +144,19 @@ namespace mRemoteNG.Connection
             }
         }
 
-        private static void StartPreConnectionExternalApp(ConnectionInfo connectionInfo)
+        private void StartPreConnectionExternalApp(ConnectionInfo connectionInfo)
         {
             if (connectionInfo.PreExtApp == "") return;
-            var extA = Runtime.ExternalToolsService.GetExtAppByName(connectionInfo.PreExtApp);
+            var extA = _externalToolsService.GetExtAppByName(connectionInfo.PreExtApp);
             extA?.Start(connectionInfo);
         }
 
-        private static InterfaceControl FindConnectionContainer(ConnectionInfo connectionInfo)
+        private InterfaceControl FindConnectionContainer(ConnectionInfo connectionInfo)
         {
             if (connectionInfo.OpenConnections.Count <= 0) return null;
-            for (var i = 0; i <= Runtime.WindowList.Count - 1; i++)
+            for (var i = 0; i <= _windowList.Count - 1; i++)
             {
-                var window = Runtime.WindowList[i] as ConnectionWindow;
+                var window = _windowList[i] as ConnectionWindow;
                 var connectionWindow = window;
                 if (connectionWindow?.TabController == null) continue;
                 foreach (TabPage t in connectionWindow.TabController.TabPages)
@@ -153,16 +172,20 @@ namespace mRemoteNG.Connection
             return null;
         }
 
-        private static string SetConnectionPanel(ConnectionInfo connectionInfo, ConnectionInfo.Force force)
+        private string SetConnectionPanel(ConnectionInfo connectionInfo, ConnectionInfo.Force force)
         {
             var connectionPanel = "";
             if (connectionInfo.Panel == "" || (force & ConnectionInfo.Force.OverridePanel) == ConnectionInfo.Force.OverridePanel | Settings.Default.AlwaysShowPanelSelectionDlg)
             {
-                var frmPnl = new frmChoosePanel();
+                var frmPnl = new frmChoosePanel(Adder, _windowList);
                 if (frmPnl.ShowDialog() == DialogResult.OK)
                 {
                     connectionPanel = frmPnl.Panel;
                 }
+                else
+                {
+                    return null;
+                }
             }
             else
             {
@@ -173,24 +196,24 @@ namespace mRemoteNG.Connection
 
         private Form SetConnectionForm(Form conForm, string connectionPanel)
         {
-            var connectionForm = conForm ?? Runtime.WindowList.FromString(connectionPanel);
+            var connectionForm = conForm ?? _windowList.FromString(connectionPanel);
 
             if (connectionForm == null)
-                connectionForm = _panelAdder.AddPanel(connectionPanel);
+                connectionForm = Adder.AddPanel(connectionPanel);
             else
-                ((ConnectionWindow)connectionForm).Show(FrmMain.Default.pnlDock);
+                ((ConnectionWindow)connectionForm).Show(_frmMain.pnlDock);
 
             connectionForm.Focus();
             return connectionForm;
         }
 
-        private static Control SetConnectionContainer(ConnectionInfo connectionInfo, Form connectionForm)
+        private Control SetConnectionContainer(ConnectionInfo connectionInfo, Form connectionForm)
         {
             Control connectionContainer = ((ConnectionWindow)connectionForm).AddConnectionTab(connectionInfo);
 
             if (connectionInfo.Protocol != ProtocolType.IntApp) return connectionContainer;
 
-            var extT = Runtime.ExternalToolsService.GetExtAppByName(connectionInfo.ExtApp);
+            var extT = _externalToolsService.GetExtAppByName(connectionInfo.ExtApp);
 
             if(extT == null) return connectionContainer;
 
@@ -205,7 +228,7 @@ namespace mRemoteNG.Connection
             newProtocol.Closed += ((ConnectionWindow)connectionForm).Prot_Event_Closed;
         }
 
-        private static void SetConnectionEventHandlers(ProtocolBase newProtocol)
+        private void SetConnectionEventHandlers(ProtocolBase newProtocol)
         {
             newProtocol.Disconnected += Prot_Event_Disconnected;
             newProtocol.Connected += Prot_Event_Connected;
@@ -246,7 +269,7 @@ namespace mRemoteNG.Connection
             }
         }
 
-        private static void Prot_Event_Closed(object sender)
+        private void Prot_Event_Closed(object sender)
         {
             try
             {
@@ -264,7 +287,7 @@ namespace mRemoteNG.Connection
                 prot.InterfaceControl.Info.OpenConnections.Remove(prot);
 
                 if (prot.InterfaceControl.Info.PostExtApp == "") return;
-                var extA = Runtime.ExternalToolsService.GetExtAppByName(prot.InterfaceControl.Info.PostExtApp);
+                var extA = _externalToolsService.GetExtAppByName(prot.InterfaceControl.Info.PostExtApp);
                 extA?.Start(prot.InterfaceControl.Info);
             }
             catch (Exception ex)

mRemoteV1/Connection/ConnectionsService.cs

@@ -1,55 +1,62 @@
 using System;
 using System.IO;
+using System.Security;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.App.Info;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DatabaseConnectors;
 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;
+using mRemoteNG.UI.TaskDialog;
 
 namespace mRemoteNG.Connection
 {
-    public class ConnectionsService
+    public class ConnectionsService : IConnectionsService
     {
         private static readonly object SaveLock = new object();
+        private bool _showDialogWhenLoadingConnections;
         private readonly PuttySessionsManager _puttySessionsManager;
+        private readonly Import _import;
+        private readonly IWin32Window _dialogWindowParent;
+        private bool _batchingSaves = false;
+        private bool _saveRequested = false;
+        private bool _saveAsyncRequested = false;
 
         public bool IsConnectionsFileLoaded { get; set; }
         public bool UsingDatabase { get; private set; }
         public string ConnectionFileName { get; private set; }
         public RemoteConnectionsSyncronizer RemoteConnectionsSyncronizer { get; set; }
         public DateTime LastSqlUpdate { get; set; }
-
+        public SecureString EncryptionKey { get; set; } = new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString();
+        // TODO - this is only a property to break up a circular dependency. move to ctor when able
+        public DatabaseConnectorFactory DatabaseConnectorFactory { 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)
+        public ConnectionsService(PuttySessionsManager puttySessionsManager, Import import, IWin32Window dialogWindowParent)
         {
-            if (puttySessionsManager == null)
+            _puttySessionsManager = puttySessionsManager.ThrowIfNull(nameof(puttySessionsManager));
-                throw new ArgumentNullException(nameof(puttySessionsManager));
+            _import = import.ThrowIfNull(nameof(import));
-
+            _dialogWindowParent = dialogWindowParent.ThrowIfNull(nameof(dialogWindowParent));
-            _puttySessionsManager = puttySessionsManager;
         }
 
         public void NewConnectionsFile(string filename)
         {
             try
             {
+                filename.ThrowIfNullOrEmpty(nameof(filename));
                 var newConnectionsModel = new ConnectionTreeModel();
                 newConnectionsModel.AddRootNode(new RootNodeInfo(RootNodeType.Connection));
-                SaveConnections(newConnectionsModel, false, new SaveFilter(), filename);
+                SaveConnections(newConnectionsModel, false, new SaveFilter(), filename, true);
                 LoadConnections(false, false, filename);
-                UpdateCustomConsPathSetting(filename);
             }
             catch (Exception ex)
             {
@@ -79,6 +86,10 @@ namespace mRemoteNG.Connection
                 {
                     newConnectionInfo.Port = uri.Port;
                 }
+
+                if (string.IsNullOrEmpty(newConnectionInfo.Panel))
+                    newConnectionInfo.Panel = Language.strGeneral;
+
                 newConnectionInfo.IsQuickConnect = true;
 
                 return newConnectionInfo;
@@ -97,16 +108,24 @@ namespace mRemoteNG.Connection
         /// <param name="useDatabase"></param>
         /// <param name="import"></param>
         /// <param name="connectionFileName"></param>
-        public ConnectionTreeModel LoadConnections(bool useDatabase, bool import, string connectionFileName)
+        public void LoadConnections(bool useDatabase, bool import, string connectionFileName)
         {
             var oldConnectionTreeModel = ConnectionTreeModel;
             var oldIsUsingDatabaseValue = UsingDatabase;
 
-            var newConnectionTreeModel =
+            var newConnectionTreeModel = useDatabase
-                (useDatabase
+                    ? new SqlConnectionsLoader(DatabaseConnectorFactory, this).Load()
-                    ? new SqlConnectionsLoader().Load()
+                    : new XmlConnectionsLoader(connectionFileName, this, _dialogWindowParent).Load();
-                    : new XmlConnectionsLoader(connectionFileName).Load())
+
-                ?? new ConnectionTreeModel();
+            if (newConnectionTreeModel == null)
+            {
+                DialogFactory.ShowLoadConnectionsFailedDialog(connectionFileName, "Decrypting connection file failed", IsConnectionsFileLoaded, this);
+                return;
+            }
+
+            IsConnectionsFileLoaded = true;
+            ConnectionFileName = connectionFileName;
+            UsingDatabase = useDatabase;
 
             if (!import)
             {
@@ -114,12 +133,35 @@ namespace mRemoteNG.Connection
                 newConnectionTreeModel.RootNodes.AddRange(_puttySessionsManager.RootPuttySessionsNodes);
             }
 
-            IsConnectionsFileLoaded = true;
-            ConnectionFileName = connectionFileName;
-            UsingDatabase = useDatabase;
             ConnectionTreeModel = newConnectionTreeModel;
+            UpdateCustomConsPathSetting(connectionFileName);
             RaiseConnectionsLoadedEvent(oldConnectionTreeModel, newConnectionTreeModel, oldIsUsingDatabaseValue, useDatabase, connectionFileName);
-            return newConnectionTreeModel;
+        }
+
+        /// <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();
         }
 
         /// <summary>
@@ -128,8 +170,6 @@ namespace mRemoteNG.Connection
         /// </summary>
         public void SaveConnections()
         {
-            if (!IsConnectionsFileLoaded)
-                return;
             SaveConnections(ConnectionTreeModel, UsingDatabase, new SaveFilter(), ConnectionFileName);
         }
 
@@ -141,17 +181,29 @@ namespace mRemoteNG.Connection
         /// <param name="useDatabase"></param>
         /// <param name="saveFilter"></param>
         /// <param name="connectionFileName"></param>
-        public void SaveConnections(ConnectionTreeModel connectionTreeModel, bool useDatabase, SaveFilter saveFilter, string connectionFileName)
+        /// <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)
         {
-            if (connectionTreeModel == null) return;
+            if (connectionTreeModel == null)
+                return;
+
+            if (!forceSave && !IsConnectionsFileLoaded)
+                return;
+
+            if (_batchingSaves)
+            {
+                _saveRequested = true;
+                return;
+            }
 
             try
             {
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Saving connections...");
                 RemoteConnectionsSyncronizer?.Disable();
 
                 var previouslyUsingDatabase = UsingDatabase;
                 if (useDatabase)
-                    new SqlConnectionsSaver(saveFilter).Save(connectionTreeModel);
+                    new SqlConnectionsSaver(saveFilter, this, DatabaseConnectorFactory).Save(connectionTreeModel);
                 else
                     new XmlConnectionsSaver(connectionFileName, saveFilter).Save(connectionTreeModel);
 
@@ -161,6 +213,7 @@ namespace mRemoteNG.Connection
                 UsingDatabase = useDatabase;
                 ConnectionFileName = connectionFileName;
                 RaiseConnectionsSavedEvent(connectionTreeModel, previouslyUsingDatabase, UsingDatabase, connectionFileName);
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Successfully saved connections");
             }
             catch (Exception ex)
             {
@@ -174,6 +227,12 @@ namespace mRemoteNG.Connection
 
         public void SaveConnectionsAsync()
         {
+            if (_batchingSaves)
+            {
+                _saveAsyncRequested = true;
+                return;
+            }
+
             var t = new Thread(SaveConnectionsBGd);
             t.SetApartmentState(ApartmentState.STA);
             t.Start();
@@ -181,19 +240,175 @@ namespace mRemoteNG.Connection
 
         private void SaveConnectionsBGd()
         {
-            Monitor.Enter(SaveLock);
+            lock (SaveLock)
-            SaveConnections();
+            {
-            Monitor.Exit(SaveLock);
+                SaveConnections();
+            }
+        }
+
+        public void LoadConnectionsAsync()
+        {
+            _showDialogWhenLoadingConnections = false;
+
+            var t = new Thread(LoadConnectionsBGd);
+            t.SetApartmentState(ApartmentState.STA);
+            t.Start();
+        }
+
+        
+        private void LoadConnectionsBGd()
+        {
+            LoadConnections(_showDialogWhenLoadingConnections);
+        }
+
+        public void LoadConnections(bool withDialog = false)
+        {
+            var connectionFileName = "";
+
+            try
+            {
+                // disable sql update checking while we are loading updates
+                RemoteConnectionsSyncronizer?.Disable();
+
+                if (!Settings.Default.UseSQLServer)
+                {
+                    if (withDialog)
+                    {
+                        var loadDialog = DialogFactory.BuildLoadConnectionsDialog();
+                        if (loadDialog.ShowDialog() != DialogResult.OK) return;
+                        connectionFileName = loadDialog.FileName;
+                    }
+                    else
+                    {
+                        connectionFileName = GetStartupConnectionFileName();
+                    }
+                }
+
+                LoadConnections(Settings.Default.UseSQLServer, false, connectionFileName);
+
+                if (Settings.Default.UseSQLServer)
+                {
+                    LastSqlUpdate = DateTime.Now;
+                }
+                else
+                {
+                    if (connectionFileName == GetDefaultStartupConnectionFileName())
+                    {
+                        Settings.Default.LoadConsFromCustomLocation = false;
+                    }
+                    else
+                    {
+                        Settings.Default.LoadConsFromCustomLocation = true;
+                        Settings.Default.CustomConsPath = connectionFileName;
+                    }
+                }
+
+                // re-enable sql update checking after updates are loaded
+                RemoteConnectionsSyncronizer?.Enable();
+            }
+            catch (Exception ex)
+            {
+                if (Settings.Default.UseSQLServer)
+                {
+                    Runtime.MessageCollector.AddExceptionMessage(Language.strLoadFromSqlFailed, ex);
+                    var commandButtons = string.Join("|", Language.strCommandTryAgain, Language.strCommandOpenConnectionFile, string.Format(Language.strCommandExitProgram, Application.ProductName));
+                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.strLoadFromSqlFailed, Language.strLoadFromSqlFailedContent, MiscTools.GetExceptionMessageRecursive(ex), "", "", commandButtons, false, ESysIcons.Error, ESysIcons.Error);
+                    switch (CTaskDialog.CommandButtonResult)
+                    {
+                        case 0:
+                            LoadConnections(withDialog);
+                            return;
+                        case 1:
+                            Settings.Default.UseSQLServer = false;
+                            LoadConnections(true);
+                            return;
+                        default:
+                            Application.Exit();
+                            return;
+                    }
+                }
+                if (ex is FileNotFoundException && !withDialog)
+                {
+                    Runtime.MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), ex, MessageClass.InformationMsg);
+
+                    string[] commandButtons =
+                    {
+                        Language.ConfigurationCreateNew,
+                        Language.ConfigurationCustomPath,
+                        Language.ConfigurationImportFile,
+                        Language.strMenuExit
+                    };
+
+                    var answered = false;
+                    while (!answered)
+                    {
+                        try
+                        {
+                            CTaskDialog.ShowTaskDialogBox(
+                                GeneralAppInfo.ProductName,
+                                Language.ConnectionFileNotFound,
+                                "", "", "", "", "",
+                                string.Join(" | ", commandButtons),
+                                ETaskDialogButtons.None,
+                                ESysIcons.Question,
+                                ESysIcons.Question);
+
+                            switch (CTaskDialog.CommandButtonResult)
+                            {
+                                case 0:
+                                    NewConnectionsFile(connectionFileName);
+                                    answered = true;
+                                    break;
+                                case 1:
+                                    LoadConnections(true);
+                                    answered = true;
+                                    break;
+                                case 2:
+                                    NewConnectionsFile(connectionFileName);
+                                    _import.ImportFromFile(ConnectionTreeModel.RootNodes[0]);
+                                    answered = true;
+                                    break;
+                                case 3:
+                                    Application.Exit();
+                                    answered = true;
+                                    break;
+                            }
+                        }
+                        catch (Exception exc)
+                        {
+                            Runtime.MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), exc, MessageClass.InformationMsg);
+                        }
+                    }
+                    return;
+                }
+
+                Runtime.MessageCollector.AddExceptionStackTrace(string.Format(Language.strConnectionsFileCouldNotBeLoaded, connectionFileName), ex);
+                if (connectionFileName != GetStartupConnectionFileName())
+                {
+                    LoadConnections(withDialog);
+                }
+                else
+                {
+                    MessageBox.Show(_dialogWindowParent,
+                        string.Format(Language.strErrorStartupConnectionFileLoad, Environment.NewLine, Application.ProductName, GetStartupConnectionFileName(), MiscTools.GetExceptionMessageRecursive(ex)),
+                        @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    Application.Exit();
+                }
+            }
         }
 
         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)

mRemoteV1/Connection/DefaultConnectionInfo.cs

@@ -31,9 +31,14 @@ namespace mRemoteNG.Connection
 						throw new SettingsPropertyNotFoundException($"No property with name '{expectedPropertyName}' found.");
 
 					var valueFromSource = propertyFromSource.GetValue(sourceInstance, null);
-	                var value = Convert.ChangeType(valueFromSource, property.PropertyType);
+                    
+                    if (property.PropertyType.IsEnum)
+                    {
+                        property.SetValue(Instance, Enum.Parse(property.PropertyType, valueFromSource.ToString()), null);
+                        continue;
+                    }
 
-                    property.SetValue(Instance, value, null);
+                    property.SetValue(Instance, Convert.ChangeType(valueFromSource, property.PropertyType), null);
                 }
                 catch (Exception ex)
                 {

mRemoteV1/Connection/IConnectionsService.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Security;
+using mRemoteNG.Config.Connections;
+using mRemoteNG.Config.Connections.Multiuser;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+
+namespace mRemoteNG.Connection
+{
+    public interface IConnectionsService
+    {
+        string ConnectionFileName { get; }
+        ConnectionTreeModel ConnectionTreeModel { get; }
+        DatabaseConnectorFactory DatabaseConnectorFactory { get; set; }
+        SecureString EncryptionKey { get; set; }
+        bool IsConnectionsFileLoaded { get; set; }
+        DateTime LastSqlUpdate { get; set; }
+        RemoteConnectionsSyncronizer RemoteConnectionsSyncronizer { get; set; }
+        bool UsingDatabase { get; }
+
+        event EventHandler<ConnectionsLoadedEventArgs> ConnectionsLoaded;
+        event EventHandler<ConnectionsSavedEventArgs> ConnectionsSaved;
+
+        ConnectionInfo CreateQuickConnect(string connectionString, ProtocolType protocol);
+        string GetDefaultStartupConnectionFileName();
+        string GetStartupConnectionFileName();
+        void LoadConnections(bool withDialog = false);
+        void LoadConnections(bool useDatabase, bool import, string connectionFileName);
+        void LoadConnectionsAsync();
+        void NewConnectionsFile(string filename);
+        void SaveConnections();
+        void SaveConnections(ConnectionTreeModel connectionTreeModel, bool useDatabase, SaveFilter saveFilter, string connectionFileName, bool forceSave = false);
+        void SaveConnectionsAsync();
+        void BeginBatchingSaves();
+        void EndBatchingSaves();
+    }
+}

mRemoteV1/Connection/Protocol/ICA/IcaProtocol.cs

@@ -17,12 +17,15 @@ namespace mRemoteNG.Connection.Protocol.ICA
 	{
 		private AxICAClient _icaClient;
 		private ConnectionInfo _info;
-        private readonly FrmMain _frmMain = FrmMain.Default;
+        private readonly FrmMain _frmMain;
+	    private readonly IConnectionsService _connectionsService;
 		
         #region Public Methods
-		public IcaProtocol()
+		public IcaProtocol(FrmMain frmMain, IConnectionsService connectionsService)
 		{
-			try
+		    _frmMain = frmMain.ThrowIfNull(nameof(frmMain));
+		    _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+		    try
 			{
 				Control = new AxICAClient();
 			}
@@ -144,7 +147,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
 						if (Settings.Default.DefaultPassword != "")
 						{
                             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                            _icaClient.SetProp("ClearPassword", cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey));
+                            _icaClient.SetProp("ClearPassword", cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, _connectionsService.EncryptionKey));
 						}
 					}
 				}

mRemoteV1/Connection/Protocol/IntegratedProgram.cs

@@ -11,19 +11,25 @@ namespace mRemoteNG.Connection.Protocol
 {
 	public class IntegratedProgram : ProtocolBase
 	{
-        #region Private Fields
+	    private readonly ExternalToolsService _externalToolsService;
         private ExternalTool _externalTool;
         private IntPtr _handle;
         private Process _process;
-        #endregion
+	    private readonly IConnectionsService _connectionsService;
 
-        #region Public Methods
+	    public IntegratedProgram(ExternalToolsService externalToolsService, IConnectionsService connectionsService)
+	    {
+	        _externalToolsService = externalToolsService.ThrowIfNull(nameof(externalToolsService));
+	        _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+	    }
+
+	    #region Public Methods
 		public override bool Initialize()
 		{
 		    if (InterfaceControl.Info == null)
 				return base.Initialize();
 
-		    _externalTool = Runtime.ExternalToolsService.GetExtAppByName(InterfaceControl.Info.ExtApp);
+		    _externalTool = _externalToolsService.GetExtAppByName(InterfaceControl.Info.ExtApp);
 
 			if (_externalTool == null)
 			{
@@ -54,7 +60,7 @@ namespace mRemoteNG.Connection.Protocol
                     return false;
 				}
 
-                var argParser = new ExternalToolArgumentParser(_externalTool.ConnectionInfo);
+                var argParser = new ExternalToolArgumentParser(_externalTool.ConnectionInfo, _connectionsService);
 			    _process = new Process
 			    {
 			        StartInfo =

mRemoteV1/Connection/Protocol/ProtocolFactory.cs

@@ -7,11 +7,24 @@ using mRemoteNG.Connection.Protocol.SSH;
 using mRemoteNG.Connection.Protocol.Telnet;
 using mRemoteNG.Connection.Protocol.VNC;
 using System;
+using mRemoteNG.Tools;
+using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.Connection.Protocol
 {
     public class ProtocolFactory
     {
+        private readonly ExternalToolsService _externalToolsService;
+        private readonly FrmMain _frmMain;
+        private readonly IConnectionsService _connectionsService;
+
+        public ProtocolFactory(ExternalToolsService externalToolsService, FrmMain frmMain, IConnectionsService connectionsService)
+        {
+            _externalToolsService = externalToolsService.ThrowIfNull(nameof(externalToolsService));
+            _frmMain = frmMain.ThrowIfNull(nameof(frmMain));
+            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+        }
+
         public ProtocolBase CreateProtocol(ConnectionInfo connectionInfo)
         {
             var newProtocol = default(ProtocolBase);
@@ -19,7 +32,7 @@ namespace mRemoteNG.Connection.Protocol
 			switch (connectionInfo.Protocol)
 			{
 				case ProtocolType.RDP:
-					newProtocol = new RdpProtocol
+					newProtocol = new RdpProtocol(_frmMain, _connectionsService)
 					{
 					    LoadBalanceInfoUseUtf8 = Settings.Default.RdpLoadBalanceInfoUseUtf8
                     };
@@ -29,19 +42,19 @@ namespace mRemoteNG.Connection.Protocol
 					newProtocol = new ProtocolVNC();
 					break;
 				case ProtocolType.SSH1:
-					newProtocol = new ProtocolSSH1();
+					newProtocol = new ProtocolSSH1(_connectionsService);
 					break;
 				case ProtocolType.SSH2:
-					newProtocol = new ProtocolSSH2();
+					newProtocol = new ProtocolSSH2(_connectionsService);
 					break;
 				case ProtocolType.Telnet:
-					newProtocol = new ProtocolTelnet();
+					newProtocol = new ProtocolTelnet(_connectionsService);
 					break;
 				case ProtocolType.Rlogin:
-					newProtocol = new ProtocolRlogin();
+					newProtocol = new ProtocolRlogin(_connectionsService);
 					break;
 				case ProtocolType.RAW:
-					newProtocol = new RawProtocol();
+					newProtocol = new RawProtocol(_connectionsService);
 					break;
 				case ProtocolType.HTTP:
 					newProtocol = new ProtocolHTTP(connectionInfo.RenderingEngine);
@@ -50,11 +63,11 @@ namespace mRemoteNG.Connection.Protocol
 					newProtocol = new ProtocolHTTPS(connectionInfo.RenderingEngine);
 					break;
 				case ProtocolType.ICA:
-					newProtocol = new IcaProtocol();
+					newProtocol = new IcaProtocol(_frmMain, _connectionsService);
 					((IcaProtocol) newProtocol).tmrReconnect.Elapsed += ((IcaProtocol) newProtocol).tmrReconnect_Elapsed;
 					break;
 				case ProtocolType.IntApp:
-					newProtocol = new IntegratedProgram();
+					newProtocol = new IntegratedProgram(_externalToolsService, _connectionsService);
 					if (connectionInfo.ExtApp == "")
 					{
 						throw (new Exception(Language.strNoExtAppDefined));

mRemoteV1/Connection/Protocol/PuttyBase.cs

@@ -16,6 +16,12 @@ namespace mRemoteNG.Connection.Protocol
 	{	
 		private const int IDM_RECONF = 0x50; // PuTTY Settings Menu ID
 	    private bool _isPuttyNg;
+	    private readonly IConnectionsService _connectionsService;
+
+	    public PuttyBase(IConnectionsService connectionsService)
+	    {
+	        _connectionsService = connectionsService;
+	    }
 
 	    #region Public Properties
 
@@ -99,7 +105,7 @@ namespace mRemoteNG.Connection.Protocol
 							if (Settings.Default.EmptyCredentials == "custom")
 							{
                                 var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                                password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
+                                password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, _connectionsService.EncryptionKey);
 							}
 						}
 						
@@ -199,7 +205,14 @@ namespace mRemoteNG.Connection.Protocol
 				{
 					return;
 				}
-                NativeMethods.MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), InterfaceControl.Width + SystemInformation.FrameBorderSize.Width * 2, InterfaceControl.Height + SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height * 2, true);
+
+			    var left = -(SystemInformation.FrameBorderSize.Width + SystemInformation.HorizontalResizeBorderThickness);
+			    var top = -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height + SystemInformation.VerticalResizeBorderThickness);
+			    var width = InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width + SystemInformation.HorizontalResizeBorderThickness) * 2;
+			    var height = InterfaceControl.Height + SystemInformation.CaptionHeight +
+			                 (SystemInformation.FrameBorderSize.Height + SystemInformation.VerticalResizeBorderThickness) * 2;
+
+                NativeMethods.MoveWindow(PuttyHandle, left, top, width, height, true);
 			}
 			catch (Exception ex)
 			{

mRemoteV1/Connection/Protocol/RAW/RawProtocol.cs

@@ -2,7 +2,8 @@ namespace mRemoteNG.Connection.Protocol.RAW
 {
 	public class RawProtocol : PuttyBase
 	{
-		public RawProtocol()
+		public RawProtocol(IConnectionsService connectionsService) 
+		    : base(connectionsService)
 		{
 			PuttyProtocol = Putty_Protocol.raw;
 		}

mRemoteV1/Connection/Protocol/RDP/RdpProtocol.cs

@@ -30,7 +30,8 @@ namespace mRemoteNG.Connection.Protocol.RDP
         private bool _loginComplete;
         private bool _redirectKeys;
         private bool _alertOnIdleDisconnect;
-        private readonly FrmMain _frmMain = FrmMain.Default;
+        private readonly FrmMain _frmMain;
+	    private readonly IConnectionsService _connectionsService;
 
         #region Properties
         public bool SmartSize
@@ -92,8 +93,10 @@ namespace mRemoteNG.Connection.Protocol.RDP
         #endregion
 
         #region Constructors
-        public RdpProtocol()
+        public RdpProtocol(FrmMain frmMain, IConnectionsService connectionsService)
         {
+            _frmMain = frmMain;
+            _connectionsService = connectionsService;
             Control = new AxMsRdpClient8NotSafeForScripting();
         }
         #endregion
@@ -316,10 +319,19 @@ namespace mRemoteNG.Connection.Protocol.RDP
 				return;
 			}
 
-		    var size = !Fullscreen ? Control.Size : Screen.FromControl(Control).Bounds.Size;
+		    try
+		    {
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Resizing RDP connection to host '{_connectionInfo.Hostname}'");
+		        var size = !Fullscreen ? Control.Size : Screen.FromControl(Control).Bounds.Size;
 
-            IMsRdpClient8 msRdpClient8 = _rdpClient;
+                IMsRdpClient8 msRdpClient8 = _rdpClient;
-			msRdpClient8.Reconnect((uint)size.Width, (uint)size.Height);
+			    msRdpClient8.Reconnect((uint)size.Width, (uint)size.Height);
+		    }
+		    catch (Exception ex)
+		    {
+                Runtime.MessageCollector.AddExceptionMessage(string.Format(Language.ChangeConnectionResolutionError, _connectionInfo.Hostname),
+                    ex, MessageClass.WarningMsg, false);
+		    }
 		}
 				
 		private void SetRdGateway()
@@ -444,7 +456,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 						if (Settings.Default.DefaultPassword != "")
 						{
                             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                            _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey);
+                            _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, _connectionsService.EncryptionKey);
 						}
 					}
 				}
@@ -543,6 +555,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 				_rdpClient.AdvancedSettings2.RedirectPrinters = _connectionInfo.RedirectPrinters;
 				_rdpClient.AdvancedSettings2.RedirectSmartCards = _connectionInfo.RedirectSmartCards;
 				_rdpClient.SecuredSettings2.AudioRedirectionMode = (int)_connectionInfo.RedirectSound;
+                _rdpClient.AdvancedSettings.DisableRdpdr = _connectionInfo.RedirectClipboard ? 0 : 1;
 			}
 			catch (Exception ex)
 			{
@@ -916,17 +929,25 @@ namespace mRemoteNG.Connection.Protocol.RDP
         #region Reconnect Stuff
 		public void tmrReconnect_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
 		{
-			var srvReady = PortScanner.IsPortOpen(_connectionInfo.Hostname, Convert.ToString(_connectionInfo.Port));
+		    try
+		    {
+			    var srvReady = PortScanner.IsPortOpen(_connectionInfo.Hostname, Convert.ToString(_connectionInfo.Port));
 					
-			ReconnectGroup.ServerReady = srvReady;
+			    ReconnectGroup.ServerReady = srvReady;
 					
-			if (ReconnectGroup.ReconnectWhenReady && srvReady)
+			    if (ReconnectGroup.ReconnectWhenReady && srvReady)
-			{
+			    {
-				tmrReconnect.Enabled = false;
+				    tmrReconnect.Enabled = false;
-				ReconnectGroup.DisposeReconnectGroup();
+				    ReconnectGroup.DisposeReconnectGroup();
-				//SetProps()
+				    //SetProps()
-				_rdpClient.Connect();
+				    _rdpClient.Connect();
-			}
+			    }
+		    }
+		    catch (Exception ex)
+		    {
+                Runtime.MessageCollector.AddExceptionMessage(string.Format(Language.AutomaticReconnectError, _connectionInfo.Hostname),
+                    ex, MessageClass.WarningMsg, false);
+		    }
 		}
         #endregion
 	}