refactored relationship between protocol objects and interfacecontrol

.github/ISSUE_TEMPLATE.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

CHANGELOG.TXT

@@ -1,133 +1,12 @@
-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:
-----------------------
-#948: Fixed issue where many menu item translations were not being used
-#942: Improved Russian translation of several items
-#924: Notification for "No Host Specified" when clicking folders in quick-connect menu
-#902: Menu bar can once again be moved. View -> "Lock toolbar positions" now also locks the menu position
-Added option for creating an empty panel on startup
-
-Fixes:
-------
-#938: Minor layout improvements on the Port Scan screen
-#916: Default properties were not being saved
-
-
-1.76.3 Alpha 5 (2018-03-14):
-
-Fixes:
-------
-#911: Csv exports sometimes do not include all fields
-#807: Inheritance is sometimes turned on for nodes under root Connections node
-
-
-1.76.2 Alpha 4 (2018-03-03):
-
-Fixes:
-------
-#899: DoNotPlay is Case Sensitive in XML Serialization
-
-
-1.76.1 Alpha 3 (2018-02-24):
+1.76.0 Alpha 3 (2018-xx-xx):
 
 Features/Enhancements:
 ----------------------
 #625: Added ability to import mRemoteNG formatted CSV files
-#648: The port scan ping timeout is now configurable
 
 Fixes:
 ------
-Fixed a few Xml serialization bugs that would occur if boolean values weren't capitalized
+
 
 
 1.76.0 Alpha 2 (2018-02-01):

CREDITS.TXT

@@ -23,9 +23,6 @@ github.com/DamianBis
 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,9 +59,6 @@ Lukas Plachy (github.com/rheingold)
 Gyuha Shin
 Stefan (github.com/polluks)
 github.com/emazv72
-Vladimir Semenov (github.com/sli-pro)
-Marco Sousa (github.com/marcomsousa)
-github.com/wwj402
 
 
 Included Source Code

Jenkinsfile

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

Jenkinsfile_publish.groovy

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

README.MD

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

Tools/7zip/License.txt

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

Tools/7zip/history.txt

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

Tools/7zip/readme.txt

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

Tools/CreateBulkConnections_ConfCons2_6.ps1

@@ -1,114 +0,0 @@
-#####################################
-# Author: David Sparer
-# Summary: 
-#   This is intended to be a template for creating connections in bulk. This uses the serializers directly from the mRemoteNG binaries.
-#   You will still need to create the connection info objects, but the library will handle serialization. It is expected that you
-#   are familiar with PowerShell. If this is not the case, reach out to the mRemoteNG community for help.
-# Usage:
-#   Replace or modify the examples that are shown toward the end of the script to create your own connection info objects. 
-#####################################
-
-$EncryptionKey = (Get-Credential -Message "Enter the encryption key you would like to use. This must match the encryption key used by the rest of the confCons file." -UserName "DontNeedUsername").Password
-$PathToMrngFolder = ""
-
-if ($PathToMrngFolder -eq "") {
-    Write-Error -Message 'You must set the $PathToMrngFolder variable in this script to the folder which contains mRemoteNG.exe'
-}
-
-$assembly = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $PathToMrngFolder -ChildPath "mRemoteNG.exe"))
-$assembly = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $PathToMrngFolder -ChildPath "BouncyCastle.Crypto.dll"))
-
-function New-mRemoteNGXmlSerializer {
-    [CmdletBinding()]
-    param (
-        [SecureString]
-        $EncryptionKey
-    )
-
-    PROCESS {
-        $cryptoProvider = New-Object -TypeName mRemoteNG.Security.SymmetricEncryption.AeadCryptographyProvider
-        $saveFilter = New-Object -TypeName mRemoteNG.Security.SaveFilter -ArgumentList @($false)
-        $xmlSerializer = New-Object -TypeName mRemoteNG.Config.Serializers.XmlConnectionNodeSerializer -ArgumentList @($cryptoProvider, $encryptionKey, $saveFilter)
-        Write-Output $xmlSerializer
-    }
-}
-
-function New-mRemoteNGConnectionInfo {
-    [CmdletBinding()]
-    param ()
-
-    PROCESS {
-        $connectionInfo = New-Object -TypeName mRemoteNG.Connection.ConnectionInfo
-        Write-Output $connectionInfo
-    }
-}
-
-function New-mRemoteNGContainerInfo {
-    [CmdletBinding()]
-    param ()
-
-    PROCESS {
-        $connectionInfo = New-Object -TypeName mRemoteNG.Container.ContainerInfo
-        Write-Output $connectionInfo
-    }
-}
-
-# Setup the services needed to do serialization
-$xmlSerializer = New-mRemoteNGXmlSerializer -EncryptionKey $EncryptionKey
-
-
-
-#----------------------------------------------------------------
-# Example 1: serialize many connections, no containers
-# Here you can define the number of connection info objects to create
-# You can also provide a list of desired hostnames and iterate over those
-$xml = ""
-foreach($i in 1..5)
-{
-    $connectionInfo = New-mRemoteNGConnectionInfo
-
-    # Set connection info properties
-    $connectionInfo.Name = "server-$i"
-    $connectionInfo.Hostname = "some-win-server-$i"
-    $connectionInfo.Protocol = [mRemoteNG.Connection.Protocol.ProtocolType]::RDP
-    $connectionInfo.Inheritance.Username = $true
-    $connectionInfo.Inheritance.Domain = $true
-    $connectionInfo.Inheritance.Password = $true
-
-    $serializedConnection = $xmlSerializer.SerializeConnectionInfo($connectionInfo).ToString()
-    $xml += $serializedConnection + [System.Environment]::NewLine
-}
-
-Write-Output $xml
-
-
-
-
-#----------------------------------------------------------------
-# Example 2: serialize a container which has connections
-# You can also create containers and add connections to them, which will be nested correctly when serialized
-$xml = ""
-$container = New-mRemoteNGContainerInfo
-$container.Name = "ProductionServers"
-$serializedContainer = $xmlSerializer.SerializeConnectionInfo($container)
-
-foreach($i in 1..3)
-{
-    $connectionInfo = New-mRemoteNGConnectionInfo
-
-    # Set connection info properties
-    $connectionInfo.Name = "server-$i"
-    $connectionInfo.Hostname = "some-linux-server-$i"
-    $connectionInfo.Protocol = [mRemoteNG.Connection.Protocol.ProtocolType]::SSH2
-    $connectionInfo.Inheritance.Username = $true
-    $connectionInfo.Inheritance.Domain = $true
-    $connectionInfo.Inheritance.Password = $true
-    
-    # serialize the connection
-    $serializedConnection = $xmlSerializer.SerializeConnectionInfo($connectionInfo)
-    # add the connection to the container
-    $serializedContainer.Add($serializedConnection)
-}
-
-# Call ToString() on the top-level container to get the XML of it and all its children
-Write-Output $serializedContainer.ToString()

Tools/github_functions.ps1

@@ -1,6 +1,5 @@
 $githubUrl = 'https://api.github.com'
-# GitHub doesn't support the default powershell protocol (TLS 1.0)
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
 
 function Publish-GitHubRelease {
     param (
@@ -171,27 +170,13 @@ function Upload-GitHubReleaseAsset {
         [string]
         [Parameter(Mandatory=$true)]
         # The OAuth2 token to use for authentication.
-        $AuthToken,
-
-        [string]
-        # A short description label for the asset
-        $Label = ""
+        $AuthToken
     )
 
     $UploadUri = $UploadUri -replace "(\{[\w,\?]*\})$"
-    $files = Get-Item -Path $FilePath
+    $file = Get-Item -Path $FilePath
 
-    $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
-    }
+    $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
 }
 
 

Tools/postbuild_mremotev1.ps1

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

Tools/publish_to_github.ps1

@@ -43,8 +43,13 @@ param (
 
     [string]
     [Parameter(Mandatory=$true)]
-    # Path to the folder which contains release assets to upload
-    $ReleaseFolderPath,
+    # Path to the zip file to upload with the release
+    $ZipFilePath,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #Path to the msi file to upload with the release
+    $MsiFilePath,
 
     [string]
     [Parameter(Mandatory=$true)]
@@ -65,17 +70,7 @@ 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 $mrngPortablePath -ContentType "application/zip" -AuthToken $AuthToken -Label "Portable Edition (zip)"
-$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"
+$zipUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $ZipFilePath -ContentType "application/zip" -AuthToken $AuthToken
+$msiUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $MsiFilePath -ContentType "application/octet-stream" -AuthToken $AuthToken
 Write-Output (Get-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseId $release.id -AuthToken $AuthToken)

Tools/rename_installer_with_version.ps1

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

Tools/tidy_files_for_release.ps1

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

Tools/verify_binary_signatures.ps1

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

Tools/zip_portable_files.ps1

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

Tools/zip_portable_files_appv.ps1

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

Tools/zip_symbols.ps1

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

appveyor.yml

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

mRemoteNGTests/AssemblyTestSetup.cs

@@ -1,17 +0,0 @@
-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/CredentialHarvesterTests.cs

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

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

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

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDeserializerTests.cs

@@ -1,19 +1,15 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
-using mRemoteNG.App;
-using mRemoteNG.Config.Putty;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers;
 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
+namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers
 {
     public class XmlConnectionsDeserializerTests
     {
@@ -22,10 +18,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 
         public void Setup(string confCons, string password)
         {
-            var connectionsService = new ConnectionsService(PuttySessionsManager.Instance, 
-                new Import(Substitute.For<IWin32Window>()), 
-                Substitute.For<IWin32Window>());
-            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(connectionsService, Substitute.For<IWin32Window>(), () => password.ConvertToSecureString());
+            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(password.ConvertToSecureString);
             _connectionTreeModel = _xmlConnectionsDeserializer.Deserialize(confCons);
         }
 
@@ -111,14 +104,6 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
             Assert.That(folder22.Inheritance.Username, Is.True);
         }
 
-        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
-        public void ExpandedPropertyGetsDeserialized(Datagram testData)
-        {
-            Setup(testData.ConfCons, testData.Password);
-            var folder1 = GetFolderNamed("Folder1", _connectionTreeModel.GetRecursiveChildList());
-            Assert.That(folder1.IsExpanded, Is.True);
-        }
-
         private bool ContainsNodeNamed(string name, IEnumerable<ConnectionInfo> list)
         {
             return list.Any(node => node.Name == name);

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentCompilerTests.cs

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

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsDocumentEncryptorTests.cs

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

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlConnectionsSerializerTests.cs

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

mRemoteNGTests/Config/Serializers/ConnectionSerializers/XmlRootNodeSerializerTests.cs

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

mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs

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

mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs

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

mRemoteNGTests/Config/Serializers/MiscSerializers/CsvConnectionsDeserializerMremotengFormatTests.cs

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

mRemoteNGTests/Config/Serializers/MiscSerializers/CsvConnectionsSerializerMremotengFormatTests.cs

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

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs

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

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
-    public class RemoteDesktopConnectionManager27DeserializerTests
+	public class RemoteDesktopConnectionManager27DeserializerTests
     {
         private string _connectionFileContents;
         private RemoteDesktopConnectionManagerDeserializer _deserializer;
@@ -23,20 +23,20 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedPassword = "passwordHere!";
         private const bool ExpectedUseConsoleSession = true;
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDGatewayUsageMethod ExpectedGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+        private const RDGatewayUsageMethod ExpectedGatewayUsageMethod = RDGatewayUsageMethod.Always;
         private const string ExpectedGatewayHostname = "gatewayserverhost.innerdomain.net";
         private const string ExpectedGatewayUsername = "gatewayusername";
         private const string ExpectedGatewayDomain = "innerdomain";
         private const string ExpectedGatewayPassword = "gatewayPassword123";
-        private const RdpProtocol.RDPResolutions ExpectedRdpResolution = RdpProtocol.RDPResolutions.FitToWindow;
-        private const RdpProtocol.RDPColors ExpectedRdpColorDepth = RdpProtocol.RDPColors.Colors24Bit;
-        private const RdpProtocol.RDPSounds ExpectedAudioRedirection = RdpProtocol.RDPSounds.DoNotPlay;
+        private const RdpResolutions ExpectedRdpResolution = RdpResolutions.FitToWindow;
+        private const RdpColors ExpectedRdpColorDepth = RdpColors.Colors24Bit;
+        private const RdpSounds ExpectedAudioRedirection = RdpSounds.DoNotPlay;
         private const bool ExpectedKeyRedirection = true;
         private const bool ExpectedSmartcardRedirection = true;
         private const bool ExpectedDriveRedirection = true;
         private const bool ExpectedPortRedirection = true;
         private const bool ExpectedPrinterRedirection = true;
-        private const RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth;
+        private const RdpAuthenticationLevel ExpectedAuthLevel = RdpAuthenticationLevel.WarnOnFailedAuth;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs

@@ -10,7 +10,7 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
-    public class RemoteDesktopConnectionManagerDeserializerTests
+	public class RemoteDesktopConnectionManagerDeserializerTests
     {
         private string _connectionFileContents;
         private RemoteDesktopConnectionManagerDeserializer _deserializer;
@@ -23,20 +23,20 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedPassword = "passwordHere!";
         private const bool ExpectedUseConsoleSession = true;
         private const int ExpectedPort = 9933;
-        private const RdpProtocol.RDGatewayUsageMethod ExpectedGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always;
+        private const RDGatewayUsageMethod ExpectedGatewayUsageMethod = RDGatewayUsageMethod.Always;
         private const string ExpectedGatewayHostname = "gatewayserverhost.innerdomain.net";
         private const string ExpectedGatewayUsername = "gatewayusername";
         private const string ExpectedGatewayDomain = "innerdomain";
         private const string ExpectedGatewayPassword = "gatewayPassword123";
-        private const RdpProtocol.RDPResolutions ExpectedRdpResolution = RdpProtocol.RDPResolutions.FitToWindow;
-        private const RdpProtocol.RDPColors ExpectedRdpColorDepth = RdpProtocol.RDPColors.Colors24Bit;
-        private const RdpProtocol.RDPSounds ExpectedAudioRedirection = RdpProtocol.RDPSounds.DoNotPlay;
+        private const RdpResolutions ExpectedRdpResolution = RdpResolutions.FitToWindow;
+        private const RdpColors ExpectedRdpColorDepth = RdpColors.Colors24Bit;
+        private const RdpSounds ExpectedAudioRedirection = RdpSounds.DoNotPlay;
         private const bool ExpectedKeyRedirection = true;
         private const bool ExpectedSmartcardRedirection = true;
         private const bool ExpectedDriveRedirection = true;
         private const bool ExpectedPortRedirection = true;
         private const bool ExpectedPrinterRedirection = true;
-        private const RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.AuthRequired;
+        private const RdpAuthenticationLevel ExpectedAuthLevel = RdpAuthenticationLevel.AuthRequired;
 
 
         [OneTimeSetUp]

mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs

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

mRemoteNGTests/Connection/ConnectionInfoInheritanceTests.cs

@@ -1,9 +1,8 @@
 using mRemoteNG.Connection;
-using mRemoteNG.Container;
 using NUnit.Framework;
+using System.Reflection;
 using System.Collections;
 using System.Linq;
-using System.Reflection;
 
 namespace mRemoteNGTests.Connection
 {
@@ -75,22 +74,6 @@ 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,7 +5,6 @@ using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Connection.Protocol.SSH;
 using mRemoteNG.Container;
 using mRemoteNG.Tree.Root;
-using NSubstitute;
 using NUnit.Framework;
 
 
@@ -14,13 +13,11 @@ 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();
         }
 
@@ -30,6 +27,22 @@ namespace mRemoteNGTests.Connection
             _connectionInfo = null;
         }
 
+        [Test]
+        public void CreatingConnectionInfoWithParentSetsTheParentProperty()
+        {
+            var container = new ContainerInfo();
+            var connectionInfo = new ConnectionInfo(container);
+            Assert.That(connectionInfo.Parent, Is.EqualTo(container));
+        }
+
+        [Test]
+        public void CreatingConnectionInfoWithParentAddsToTheParentsChildList()
+        {
+            var container = new ContainerInfo();
+            var connectionInfo = new ConnectionInfo(container);
+            Assert.That(container.Children, Does.Contain(connectionInfo));
+        }
+
         [Test]
         public void CopyCreatesMemberwiseCopy()
         {
@@ -46,20 +59,6 @@ namespace mRemoteNGTests.Connection
             Assert.That(clonedConnection.Parent, Is.Null);
         }
 
-        [Test]
-        public void CloneAlsoCopiesInheritanceObject()
-        {
-            var clonedConnection = _connectionInfo.Clone();
-            Assert.That(clonedConnection.Inheritance, Is.Not.EqualTo(_connectionInfo.Inheritance));
-        }
-
-        [Test]
-        public void CloneCorrectlySetsParentOfInheritanceObject()
-        {
-            var clonedConnection = _connectionInfo.Clone();
-            Assert.That(clonedConnection.Inheritance.Parent, Is.EqualTo(clonedConnection));
-        }
-
         [Test]
         public void CopyFromCopiesProperties()
         {
@@ -82,7 +81,7 @@ namespace mRemoteNGTests.Connection
         {
             var eventWasCalled = false;
             _connectionInfo.PropertyChanged += (sender, args) => eventWasCalled = true;
-            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionsService));
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionInfo));
             Assert.That(eventWasCalled);
         }
 
@@ -91,7 +90,7 @@ namespace mRemoteNGTests.Connection
         {
             var nameOfModifiedProperty = "";
             _connectionInfo.PropertyChanged += (sender, args) => nameOfModifiedProperty = args.PropertyName;
-            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionsService));
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2(_connectionInfo));
             Assert.That(nameOfModifiedProperty, Is.EqualTo("OpenConnections"));
         }
 

mRemoteNGTests/Connection/DefaultConnectionInfoTests.cs

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

mRemoteNGTests/Connection/DefaultConnectionInheritanceTests.cs

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

mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs

@@ -1,51 +1,31 @@
-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.App;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Tools;
-using mRemoteNG.UI.Controls;
-using mRemoteNG.UI.Forms;
+using mRemoteNG.Tools.CustomCollections;
 using mRemoteNG.UI.Window;
-using NSubstitute;
 using NUnit.Framework;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNGTests.Connection.Protocol
 {
-    public class IntegratedProgramTests
-    {
-        private ExternalToolsService _externalToolsService;
-        private IConnectionInitiator _connectionInitiator;
+	public class IntegratedProgramTests
+	{
+        private readonly ExternalTool _extTool = new ExternalTool
+		{
+			DisplayName = "notepad",
+			FileName = @"%windir%\system32\notepad.exe",
+			Arguments = "",
+			TryIntegrate = true
+		};
 
-        [OneTimeSetUp]
-        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)]
+		[Test]
 		public void CanStartExternalApp()
 		{
-			var sut = new IntegratedProgram(_externalToolsService, Substitute.For<IConnectionsService>());
-			sut.InterfaceControl = BuildInterfaceControl("notepad", sut);
+			SetExternalToolList(_extTool);
+		    var connectionInfo = new ConnectionInfo { ExtApp = _extTool.DisplayName };
+            var sut = new IntegratedProgram(connectionInfo);
+			sut.InterfaceControl = BuildInterfaceControl(sut);
 			sut.Initialize();
 			var appStarted = sut.Connect();
 			sut.Disconnect();
@@ -53,44 +33,25 @@ namespace mRemoteNGTests.Connection.Protocol
 		}
 
 		[Test]
-		[Apartment(ApartmentState.STA)]
 		public void ConnectingToExternalAppThatDoesntExistDoesNothing()
 		{
-			var sut = new IntegratedProgram(_externalToolsService, Substitute.For<IConnectionsService>());
-			sut.InterfaceControl = BuildInterfaceControl("doesntExist", sut);
+			SetExternalToolList(_extTool);
+		    var connectionInfo = new ConnectionInfo { ExtApp = "doesntExist" };
+			var sut = new IntegratedProgram(connectionInfo);
+			sut.InterfaceControl = BuildInterfaceControl(sut);
 			var appInitialized = sut.Initialize();
 			Assert.That(appInitialized, Is.False);
 		}
 
-		private InterfaceControl BuildInterfaceControl(string extAppName, ProtocolBase sut)
+		private void SetExternalToolList(ExternalTool externalTool)
 		{
-            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);
+			Runtime.ExternalToolsService.ExternalTools = new FullyObservableCollection<ExternalTool> {externalTool};
+		}
+
+		private InterfaceControl BuildInterfaceControl(ProtocolBase sut)
+		{
+			var connectionWindow = new ConnectionWindow(new DockContent());
+			return new InterfaceControl(connectionWindow, sut);
 		}
 	}
 }

mRemoteNGTests/Connection/Protocol/ProtocolListTests.cs

@@ -1,12 +1,10 @@
 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;
 
 
@@ -23,11 +21,10 @@ namespace mRemoteNGTests.Connection.Protocol
         [SetUp]
         public void Setup()
         {
-            var connectionService = Substitute.For<IConnectionsService>();
             _protocolList = new ProtocolList();
-            _protocol1 = new ProtocolTelnet(connectionService);
-            _protocol2 = new ProtocolSSH2(connectionService);
-            _protocol3 = new ProtocolVNC();
+            _protocol1 = new ProtocolTelnet(new ConnectionInfo());
+            _protocol2 = new ProtocolSSH2(new ConnectionInfo());
+            _protocol3 = new ProtocolVNC(new ConnectionInfo());
         }
 
         [TearDown]

mRemoteNGTests/Container/RootNodeInfoTests.cs

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

mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs

@@ -1,16 +1,11 @@
-using System;
-using System.Linq;
-using System.Windows.Forms;
-using mRemoteNG.App;
-using mRemoteNG.Config.Putty;
-using mRemoteNG.Config.Serializers.Xml;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using NSubstitute;
 using NUnit.Framework;
 
 
@@ -33,20 +28,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);
@@ -58,6 +53,7 @@ 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);
@@ -69,6 +65,7 @@ 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));
@@ -86,26 +83,13 @@ 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()
         {
@@ -142,4 +126,4 @@ namespace mRemoteNGTests.IntegrationTests
             return connectionTreeModel;
         }
     }
-}
+}

mRemoteNGTests/ListViewTester.cs

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

mRemoteNGTests/Security/Authentication/PasswordAuthenticatorTests.cs

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

mRemoteNGTests/TestHelpers/ConnectionInfoHelpers.cs

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

mRemoteNGTests/TestHelpers/ConnectionTreeModelBuilder.cs

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

mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs

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

mRemoteNGTests/Tools/ExternalToolsArgumentParserTests.cs

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

mRemoteNGTests/Tools/MaybeTests.cs

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

mRemoteNGTests/Tools/Registry/WindowsRegistryTests.cs

@@ -1,50 +0,0 @@
-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/NodeSearcherTests.cs

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

mRemoteNGTests/Tree/RootNodeInfoTests.cs

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

mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs

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

mRemoteNGTests/UI/Controls/ExternalToolsToolStripTests.cs

@@ -1,49 +0,0 @@
-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,6 +6,7 @@ namespace mRemoteNGTests.UI.Controls
     {
         public TextBoxExtensionsTestForm()
         {
+            Application.EnableVisualStyles();
             InitializeComponent();
         }
     }

mRemoteNGTests/UI/Controls/TextBoxExtensionsTests.cs

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

mRemoteNGTests/UI/Forms/FrmMainTests.cs

@@ -1,16 +0,0 @@
-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,24 +1,9 @@
-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 NUnit.Framework;
 using mRemoteNG.UI.Forms;
-using NSubstitute;
-using NUnit.Framework;
 
 namespace mRemoteNGTests.UI.Forms
 {
-	public class OptionsFormSetupAndTeardown
+    public class OptionsFormSetupAndTeardown
     {
         protected frmOptions _optionsForm;
 
@@ -30,16 +15,7 @@ namespace mRemoteNGTests.UI.Forms
         [SetUp]
         public void Setup()
         {
-            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 = new frmOptions();
             _optionsForm.Show();
         }
 

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs

@@ -1,227 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Connection.Protocol.RDP;
-using mRemoteNG.Connection.Protocol.VNC;
-using mRemoteNG.Container;
-using mRemoteNG.Tree.Root;
-using mRemoteNG.UI.Window;
-using 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

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

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowSpecialTestsBase.cs

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

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

mRemoteNGTests/UI/Window/ConnectionTreeWindowTests.cs

@@ -1,38 +1,19 @@
-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 System.Threading;
 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()
         {
-	        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};
+            _connectionTreeWindow = new ConnectionTreeWindow(new DockContent());
         }
 
         [TearDown]

mRemoteNGTests/mRemoteNGTests.csproj

@@ -109,13 +109,11 @@
   </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" />
     <Compile Include="Config\DataProviders\FileDataProviderTests.cs" />
     <Compile Include="Config\DataProviders\FileDataProviderWithRollingBackupTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\ValidateXmlSchemas.cs" />
     <Compile Include="Config\Serializers\DataTableDeserializerTests.cs" />
     <Compile Include="Config\CredentialHarvesterTests.cs" />
     <Compile Include="Config\CredentialRecordLoaderTests.cs" />
@@ -123,21 +121,21 @@
     <Compile Include="Config\Serializers\CredentialProviderSerializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialPasswordDecryptorDecoratorTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialPasswordEncryptorDecoratorTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsDeserializerMremotengFormatTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsSerializerMremotengFormatTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\CsvConnectionsDeserializerMremotengFormatTests.cs" />
+    <Compile Include="Config\Serializers\MiscSerializers\CsvConnectionsSerializerMremotengFormatTests.cs" />
     <Compile Include="Config\Serializers\DataTableSerializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\PortScanDeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\PuttyConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDeserializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionDeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManager27DeserializerTests.cs" />
     <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentCompilerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentEncryptorTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsSerializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentCompilerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsDocumentEncryptorTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlConnectionsSerializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialRecordDeserializerTests.cs" />
     <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialSerializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlRootNodeSerializerTests.cs" />
+    <Compile Include="Config\Serializers\ConnectionSerializers\XmlRootNodeSerializerTests.cs" />
     <Compile Include="Config\Serializers\Versioning\SqlVersion22To23UpgraderTests.cs" />
     <Compile Include="Config\Serializers\Versioning\SqlVersion23To24UpgraderTests.cs" />
     <Compile Include="Config\Serializers\Versioning\SqlVersion24To25UpgraderTests.cs" />
@@ -147,7 +145,6 @@
     <Compile Include="Connection\ConnectionInfoComparerTests.cs" />
     <Compile Include="Connection\Protocol\IntegratedProgramTests.cs" />
     <Compile Include="Connection\Protocol\ProtocolListTests.cs" />
-    <Compile Include="Container\RootNodeInfoTests.cs" />
     <Compile Include="Credential\CompositeRepositoryUnlockerTests.cs" />
     <Compile Include="Credential\CredentialChangedEventArgsTests.cs" />
     <Compile Include="Credential\CredentialDeletionMsgBoxConfirmerTests.cs" />
@@ -171,15 +168,12 @@
     <Compile Include="Security\PasswordCreation\PasswordLengthConstraintTests.cs" />
     <Compile Include="Security\RandomGeneratorTests.cs" />
     <Compile Include="Security\SecureStringExtensionsTests.cs" />
-    <Compile Include="TestHelpers\ConnectionInfoHelpers.cs" />
     <Compile Include="TestHelpers\ConnectionTreeModelBuilder.cs" />
     <Compile Include="Security\XmlCryptoProviderBuilderTests.cs" />
     <Compile Include="TestHelpers\FileTestHelpers.cs" />
-    <Compile Include="TestHelpers\SerializableConnectionInfoAllPropertiesOfType.cs" />
     <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
     <Compile Include="Tools\FullyObservableCollectionTests.cs" />
-    <Compile Include="Tools\OptionalTests.cs" />
-    <Compile Include="Tools\Registry\WindowsRegistryTests.cs" />
+    <Compile Include="Tools\MaybeTests.cs" />
     <Compile Include="Tree\ClickHandlers\TreeNodeCompositeClickHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeDragAndDropHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeModelTests.cs" />
@@ -209,8 +203,6 @@
     <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>
@@ -232,14 +224,9 @@
       <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,19 +33,16 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.Build.0 = Debug Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.ActiveCfg = Debug|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.Build.0 = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.ActiveCfg = Release|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.Build.0 = Release|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.ActiveCfg = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.Build.0 = Release Portable|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|x86
@@ -53,26 +50,24 @@ Global
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.ActiveCfg = Release|x86
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.Build.0 = Debug Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.ActiveCfg = Debug|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.Build.0 = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.ActiveCfg = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.Build.0 = Release Portable|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x86.ActiveCfg = Debug|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.ActiveCfg = Debug|x86
@@ -82,6 +77,7 @@ Global
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.ActiveCfg = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x86.ActiveCfg = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86
@@ -90,8 +86,8 @@ Global
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x86.ActiveCfg = Debug|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release Portable|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.ActiveCfg = Release|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.Build.0 = Release|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86

mRemoteV1/App/CompatibilityChecker.cs

@@ -6,35 +6,25 @@ using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 using mRemoteNG.Messages;
-using mRemoteNG.Tools;
 
 namespace mRemoteNG.App
 {
-    public class CompatibilityChecker
+    public static class CompatibilityChecker
     {
-        private readonly MessageCollector _messageCollector;
-        private readonly IWin32Window _dialogWindowParent;
-
-        public CompatibilityChecker(MessageCollector messageCollector, IWin32Window dialogWindowParent)
+        public static void CheckCompatibility(MessageCollector messageCollector)
         {
-            _messageCollector = messageCollector.ThrowIfNull(nameof(messageCollector));
-            _dialogWindowParent = dialogWindowParent.ThrowIfNull(nameof(dialogWindowParent));
+            CheckFipsPolicy(messageCollector);
+            CheckLenovoAutoScrollUtility(messageCollector);
         }
 
-        public void CheckCompatibility()
+        private static void CheckFipsPolicy(MessageCollector messageCollector)
         {
-            CheckFipsPolicy();
-            CheckLenovoAutoScrollUtility();
-        }
-
-        private void CheckFipsPolicy()
-        {
-            _messageCollector.AddMessage(MessageClass.InformationMsg, "Checking FIPS Policy...", true);
+            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);
-            MessageBox.Show(_dialogWindowParent, errorText);
+            messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);
+            MessageBox.Show(FrmMain.Default, errorText);
             Environment.Exit(1);
         }
 
@@ -56,9 +46,9 @@ namespace mRemoteNG.App
             return (int)fipsPolicy != 0;
         }
 
-        private void CheckLenovoAutoScrollUtility()
+        private static void CheckLenovoAutoScrollUtility(MessageCollector messageCollector)
         {
-            _messageCollector.AddMessage(MessageClass.InformationMsg, "Checking Lenovo AutoScroll Utility...", true);
+            messageCollector.AddMessage(MessageClass.InformationMsg, "Checking Lenovo AutoScroll Utility...", true);
 
             if (!Settings.Default.CompatibilityWarnLenovoAutoScrollUtility)
                 return;
@@ -70,7 +60,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

@@ -4,14 +4,10 @@ using System.Windows.Forms;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Csv;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
-using mRemoteNG.Credential;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
-using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using mRemoteNG.UI.Forms;
@@ -19,20 +15,9 @@ using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
-	public class Export
+	public static class Export
 	{
-	    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)
+		public static void ExportToFile(ConnectionInfo selectedNode, ConnectionTreeModel connectionTreeModel)
 		{
 			try
 			{
@@ -49,7 +34,7 @@ namespace mRemoteNG.App
 						exportForm.SelectedConnection = selectedNode;
 					}
 						
-					if (exportForm.ShowDialog(_dialogWindowParent) != DialogResult.OK)
+					if (exportForm.ShowDialog(FrmMain.Default) != DialogResult.OK)
 						return;
 
 				    ConnectionInfo exportTarget;
@@ -82,7 +67,7 @@ namespace mRemoteNG.App
 			}
 		}
 			
-		private void SaveExportFile(string fileName, SaveFormat saveFormat, SaveFilter saveFilter, ConnectionInfo exportTarget)
+		private static void SaveExportFile(string fileName, SaveFormat saveFormat, SaveFilter saveFilter, ConnectionInfo exportTarget)
 		{
 			try
 			{
@@ -92,14 +77,14 @@ namespace mRemoteNG.App
 			        case SaveFormat.mRXML:
                         var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
 			            var rootNode = exportTarget.GetRootParent() as RootNodeInfo;
-                        var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                        var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
                             cryptographyProvider, 
                             rootNode?.PasswordString.ConvertToSecureString() ?? new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString(),
                             saveFilter);
 			            serializer = new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer);
 			            break;
 			        case SaveFormat.mRCSV:
-			            serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter, _credentialRepositoryList);
+			            serializer = new CsvConnectionsSerializerMremotengFormat(saveFilter, Runtime.CredentialProviderCatalog);
                         break;
 			        default:
 			            throw new ArgumentOutOfRangeException(nameof(saveFormat), saveFormat, null);
@@ -114,7 +99,7 @@ namespace mRemoteNG.App
 			}
 			finally
 			{
-			    _connectionsService.RemoteConnectionsSyncronizer?.Enable();
+			    Runtime.ConnectionsService.RemoteConnectionsSyncronizer?.Enable();
 			}
 		}
 	}

mRemoteV1/App/Import.cs

@@ -3,26 +3,15 @@ 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 class Import
+    public static class Import
     {
-        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)
+        public static void ImportFromFile(ContainerInfo importDestinationContainer)
         {
             try
             {
@@ -61,7 +50,7 @@ namespace mRemoteNG.App
                         }
                     }
 
-                    ConnectionsService.SaveConnectionsAsync();
+                    Runtime.ConnectionsService.SaveConnectionsAsync();
                 }
             }
             catch (Exception ex)
@@ -70,12 +59,12 @@ namespace mRemoteNG.App
             }
         }
 
-        public void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOu)
+        public static void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOu)
         {
             try
             {
                 ActiveDirectoryImporter.Import(ldapPath, importDestinationContainer, importSubOu);
-                ConnectionsService.SaveConnectionsAsync();
+                Runtime.ConnectionsService.SaveConnectionsAsync();
             }
             catch (Exception ex)
             {
@@ -83,13 +72,13 @@ namespace mRemoteNG.App
             }
         }
 
-        public void ImportFromPortScan(IEnumerable<ScanHost> hosts, ProtocolType protocol, ContainerInfo importDestinationContainer)
+        public static void ImportFromPortScan(IEnumerable<ScanHost> hosts, ProtocolType protocol, ContainerInfo importDestinationContainer)
         {
             try
             {
                 var importer = new PortScanImporter(protocol);
                 importer.Import(hosts, importDestinationContainer);
-                ConnectionsService.SaveConnectionsAsync();
+                Runtime.ConnectionsService.SaveConnectionsAsync();
             }
             catch (Exception ex)
             {
@@ -97,14 +86,14 @@ namespace mRemoteNG.App
             }
         }
 
-        private IConnectionImporter<string> BuildConnectionImporterFromFileExtension(string fileName)
+        private static 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(ConnectionsService, _dialogWindowParent);
+                    return new MRemoteNGXmlImporter();
                 case ".csv":
                     return new MRemoteNGCsvImporter();
                 case ".rdp":

mRemoteV1/App/Initialization/CredsAndConsSetup.cs

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

mRemoteV1/App/Initialization/MessageCollectorSetup.cs

@@ -3,13 +3,10 @@ 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)
         {
@@ -22,13 +19,13 @@ namespace mRemoteNG.App.Initialization
             };
         }
 
-        public static void BuildMessageWritersFromSettings(IList<IMessageWriter> messageWriterList, FrmMain frmMain, ErrorAndInfoWindow errorAndInfoWindow)
+        public static void BuildMessageWritersFromSettings(IList<IMessageWriter> messageWriterList)
         {
 #if DEBUG
             messageWriterList.Add(BuildDebugConsoleWriter());
 #endif
             messageWriterList.Add(BuildTextLogMessageWriter());
-            messageWriterList.Add(BuildNotificationPanelMessageWriter(frmMain, errorAndInfoWindow));
+            messageWriterList.Add(BuildNotificationPanelMessageWriter());
             messageWriterList.Add(BuildPopupMessageWriter());
         }
 
@@ -45,17 +42,16 @@ namespace mRemoteNG.App.Initialization
             );
         }
 
-        private static IMessageWriter BuildNotificationPanelMessageWriter(FrmMain frmMain, ErrorAndInfoWindow errorAndInfoWindow)
+        private static IMessageWriter BuildNotificationPanelMessageWriter()
         {
-	        errorAndInfoWindow.ThrowIfNull(nameof(errorAndInfoWindow));
-			return new OnlyLogMessageFilter(
+            
+            return new OnlyLogMessageFilter(
                 new MessageTypeFilterDecorator(
                     new NotificationPanelMessageFilteringOptions(),
                     new MessageFocusDecorator(
-                        frmMain,
-                        errorAndInfoWindow,
+                        Windows.ErrorsForm,
                         new NotificationPanelSwitchOnMessageFilteringOptions(),
-                        new NotificationPanelMessageWriter(errorAndInfoWindow)
+                        new NotificationPanelMessageWriter(Windows.ErrorsForm)
                     )
                 )
             );

mRemoteV1/App/ProgramRoot.cs

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

mRemoteV1/App/Runtime.cs

@@ -1,11 +1,26 @@
+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 class Runtime
+	public static class Runtime
     {
         public static bool IsPortableEdition
         {
@@ -19,7 +34,171 @@ 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,38 +1,31 @@
 using System.Windows.Forms;
-using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace mRemoteNG.App
 {
-    public class Screens
+    public static class Screens
     {
-        private readonly FrmMain _frmMain;
-
-        public Screens(FrmMain frmMain)
-        {
-            _frmMain = frmMain.ThrowIfNull(nameof(frmMain));
-        }
-
-        public void SendFormToScreen(Screen screen)
+        public static 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 void SendPanelToScreen(DockContent panel, Screen screen)
+        public static void SendPanelToScreen(DockContent panel, Screen screen)
         {
             panel.DockState = DockState.Float;
             if (panel.ParentForm == null) return;

mRemoteV1/App/Shutdown.cs

@@ -3,41 +3,29 @@ 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 class Shutdown
+    public static 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 void Quit(string updateFilePath = null)
+        public static void Quit(string updateFilePath = null)
         {
             _updateFilePath = updateFilePath;
-            _frmMain.Close();
+            FrmMain.Default.Close();
             ProgramRoot.CloseSingletonInstanceMutex();
         }
 
-        public void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
+        public static void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
         {
             try
             {
@@ -53,34 +41,34 @@ namespace mRemoteNG.App
             }
         }
 
-        private void StopPuttySessionWatcher()
+        private static void StopPuttySessionWatcher()
         {
             PuttySessionsManager.Instance.StopWatcher();
         }
 
-        private void DisposeNotificationAreaIcon()
+        private static void DisposeNotificationAreaIcon()
         {
             if (Runtime.NotificationAreaIcon != null && Runtime.NotificationAreaIcon.Disposed == false)
                 Runtime.NotificationAreaIcon.Dispose();
         }
 
-        private void SaveConnections()
+        private static void SaveConnections()
         {
             if (Settings.Default.SaveConsOnExit)
-                _connectionsService.SaveConnections();
+                Runtime.ConnectionsService.SaveConnections();
         }
 
-        private void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
+        private static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
         {
-            _settingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip, frmMain);
+            Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip, frmMain);
         }
 
-        private void UnregisterBrowsers()
+        private static void UnregisterBrowsers()
         {
             IeBrowserEmulation.Unregister();
         }
 
-        public void StartUpdate()
+        public static void StartUpdate()
         {
             try
             {
@@ -92,7 +80,7 @@ namespace mRemoteNG.App
             }
         }
 
-        private void RunUpdateFile()
+        private static void RunUpdateFile()
         {
             if (UpdatePending)
                 Process.Start(_updateFilePath);

mRemoteV1/App/Startup.cs

@@ -7,7 +7,6 @@ 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;
@@ -18,34 +17,30 @@ using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
-	public class Startup
+    public class Startup
     {
-        private readonly AppUpdater _appUpdate;
+        private AppUpdater _appUpdate;
         private readonly ConnectionIconLoader _connectionIconLoader;
-        private readonly FrmMain _frmMain;
-	    private readonly Windows _windows;
-        private readonly IConnectionsService _connectionsService;
-        private readonly DatabaseConnectorFactory _databaseConnectorFactory;
-        private readonly CompatibilityChecker _compatibilityChecker;
+        private readonly FrmMain _frmMain = FrmMain.Default;
 
-        public Startup(FrmMain frmMain, Windows windows, IConnectionsService connectionsService,
-            AppUpdater appUpdate, DatabaseConnectorFactory databaseConnectorFactory, CompatibilityChecker compatibilityChecker)
+        public static Startup Instance { get; } = new Startup();
+
+        private Startup()
         {
-            _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));
+            _appUpdate = new AppUpdater();
             _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();
+            CompatibilityChecker.CheckCompatibility(messageCollector);
             ParseCommandLineArgs(messageCollector);
             IeBrowserEmulation.Register();
             _connectionIconLoader.GetConnectionIcons();
@@ -64,14 +59,17 @@ 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");
-            var sqlConnectionsUpdateChecker = new SqlConnectionsUpdateChecker(_connectionsService, _databaseConnectorFactory);
-            _connectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(sqlConnectionsUpdateChecker, _connectionsService);
-            _connectionsService.RemoteConnectionsSyncronizer.Enable();
+            Runtime.ConnectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker());
+            Runtime.ConnectionsService.RemoteConnectionsSyncronizer.Enable();
         }
 
         public void CheckForUpdate()
         {
-            if (_appUpdate.IsGetUpdateInfoRunning)
+            if (_appUpdate == null)
+            {
+                _appUpdate = new AppUpdater();
+            }
+            else if (_appUpdate.IsGetUpdateInfoRunning)
             {
                 return;
             }
@@ -109,7 +107,7 @@ namespace mRemoteNG.App
 
                 if (_appUpdate.IsUpdateAvailable())
                 {
-                    _windows.Show(WindowType.Update);
+                    Windows.Show(WindowType.Update);
                 }
             }
             catch (Exception ex)

mRemoteV1/App/Update/AppUpdater.cs

@@ -4,7 +4,6 @@ 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;
@@ -23,7 +22,6 @@ namespace mRemoteNG.App.Update
         private WebProxy _webProxy;
         private Thread _getUpdateInfoThread;
         private Thread _getChangeLogThread;
-        private readonly Func<SecureString> _encryptionKeyRetrievalFunc;
 
         #region Public Properties
 
@@ -50,9 +48,8 @@ namespace mRemoteNG.App.Update
 
         #region Public Methods
 
-        public AppUpdater(Func<SecureString> encryptionKeyRetrievalFunc)
+        public AppUpdater()
         {
-            _encryptionKeyRetrievalFunc = encryptionKeyRetrievalFunc;
             SetProxySettings();
         }
 
@@ -64,7 +61,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, _encryptionKeyRetrievalFunc());
+            var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey);
 
             SetProxySettings(shouldWeUseProxy, proxyAddress, port, useAuthentication, username, password);
         }

mRemoteV1/App/Windows.cs

@@ -1,134 +1,88 @@
-using System;
-using mRemoteNG.App.Update;
-using mRemoteNG.Config.DatabaseConnectors;
-using mRemoteNG.Connection;
-using mRemoteNG.Messages;
-using mRemoteNG.Tools;
-using mRemoteNG.UI;
-using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Window;
-using WeifenLuo.WinFormsUI.Docking;
+using System;
+using mRemoteNG.Messages;
+using mRemoteNG.UI;
 
 namespace mRemoteNG.App
 {
-	public class Windows
+    public static class Windows
     {
-        private readonly IConnectionInitiator _connectionInitiator;
-        private AboutWindow _aboutForm;
-        private ActiveDirectoryImportWindow _adimportForm;
-        private HelpWindow _helpForm;
-        private ExternalToolsWindow _externalappsForm;
-        private PortScanWindow _portscanForm;
-        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;
+        private static AboutWindow _aboutForm;
+        private static ActiveDirectoryImportWindow _adimportForm;
+        private static HelpWindow _helpForm;
+        private static ExternalToolsWindow _externalappsForm;
+        private static PortScanWindow _portscanForm;
+        private static UltraVNCWindow _ultravncscForm;
+        private static ComponentsCheckWindow _componentscheckForm;
 
-        internal ConnectionTreeWindow TreeForm { get; }
-        internal ConfigWindow ConfigForm { get; }
-        internal ErrorAndInfoWindow ErrorsForm { get; }
-        internal ScreenshotManagerWindow ScreenshotForm { get; }
-        internal SSHTransferWindow SshtransferForm { get; private set; }
+        internal static ConnectionTreeWindow TreeForm { get; set; } = new ConnectionTreeWindow();
+        internal static ConfigWindow ConfigForm { get; set; } = new ConfigWindow();
+        internal static ErrorAndInfoWindow ErrorsForm { get; set; } = new ErrorAndInfoWindow();
+        internal static ScreenshotManagerWindow ScreenshotForm { get; set; } = new ScreenshotManagerWindow();
+        private static UpdateWindow UpdateForm { get; set; } = new UpdateWindow();
+        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(_frmMain.pnlDock);
+                        _aboutForm.Show(dockPanel);
                         break;
                     case WindowType.ActiveDirectoryImport:
                         if (_adimportForm == null || _adimportForm.IsDisposed)
-                            _adimportForm = _activeDirectoryImportWindowBuilder();
-                        _adimportForm.Show(_frmMain.pnlDock);
+                            _adimportForm = new ActiveDirectoryImportWindow();
+                        _adimportForm.Show(dockPanel);
                         break;
                     case WindowType.Options:
-                        using (var optionsForm = new frmOptions(_connectionInitiator, Show, _notificationAreaIconBuilder, _connectionsService, _appUpdater, _databaseConnectorFactory, _frmMain))
+                        using (var optionsForm = new frmOptions())
                         {
-                            optionsForm.ShowDialog(_frmMain);
+                            optionsForm.ShowDialog(dockPanel);
                         }
                         break;
                     case WindowType.SSHTransfer:
                         if (SshtransferForm == null || SshtransferForm.IsDisposed)
-                            SshtransferForm = new SSHTransferWindow(_frmMain);
-                        SshtransferForm.Show(_frmMain.pnlDock);
+                            SshtransferForm = new SSHTransferWindow();
+                        SshtransferForm.Show(dockPanel);
                         break;
                     case WindowType.Update:
-                        if (_updateForm == null || _updateForm.IsDisposed)
-                            _updateForm = _updateWindowBuilder();
-                        _updateForm.Show(_frmMain.pnlDock);
+                        if (UpdateForm == null || UpdateForm.IsDisposed)
+                            UpdateForm = new UpdateWindow();
+                        UpdateForm.Show(dockPanel);
                         break;
                     case WindowType.Help:
                         if (_helpForm == null || _helpForm.IsDisposed)
                             _helpForm = new HelpWindow();
-                        _helpForm.Show(_frmMain.pnlDock);
+                        _helpForm.Show(dockPanel);
                         break;
                     case WindowType.ExternalApps:
                         if (_externalappsForm == null || _externalappsForm.IsDisposed)
-                            _externalappsForm = _externalToolsWindowBuilder();
-                        _externalappsForm.Show(_frmMain.pnlDock);
+                            _externalappsForm = new ExternalToolsWindow();
+                        _externalappsForm.Show(dockPanel);
                         break;
                     case WindowType.PortScan:
-                        _portscanForm = _portScanWindowBuilder();
-                        _portscanForm.Show(_frmMain.pnlDock);
+                        _portscanForm = new PortScanWindow();
+                        _portscanForm.Show(dockPanel);
                         break;
                     case WindowType.UltraVNCSC:
                         if (_ultravncscForm == null || _ultravncscForm.IsDisposed)
-                            _ultravncscForm = new UltraVNCWindow(Show);
-                        _ultravncscForm.Show(_frmMain.pnlDock);
+                            _ultravncscForm = new UltraVNCWindow();
+                        _ultravncscForm.Show(dockPanel);
                         break;
                     case WindowType.ComponentsCheck:
                         Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Showing ComponentsCheck window", true);
                         if (_componentscheckForm == null || _componentscheckForm.IsDisposed)
                             _componentscheckForm = new ComponentsCheckWindow();
-                        _componentscheckForm.Show(_frmMain.pnlDock);
+                        _componentscheckForm.Show(dockPanel);
                         break;
                 }
             }
@@ -138,4 +92,4 @@ namespace mRemoteNG.App
             }
         }
     }
-}
+}

mRemoteV1/Config/Connections/ConnectionsLoadedEventArgs.cs

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

mRemoteV1/Config/Connections/CsvConnectionsSaver.cs

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

mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs

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

mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs

@@ -6,8 +6,6 @@ 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
 {
@@ -15,15 +13,13 @@ 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()
         {
-            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
-            databaseConnectorFactory.ThrowIfNull(nameof(databaseConnectorFactory));
-            _sqlConnector = databaseConnectorFactory.SqlDatabaseConnectorFromSettings();
+            _sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings();
             _sqlQuery = new SqlCommand("SELECT * FROM tblUpdate", _sqlConnector.SqlConnection);
             _lastUpdateTime = default(DateTime);
             _lastDatabaseUpdateTime = default(DateTime);
@@ -68,7 +64,7 @@ namespace mRemoteNG.Config.Connections
 
         private bool CheckIfIAmTheLastOneUpdated(DateTime lastUpdateInDb)
         {
-            DateTime LastSqlUpdateWithoutMilliseconds = new DateTime(_connectionsService.LastSqlUpdate.Ticks - (_connectionsService.LastSqlUpdate.Ticks % TimeSpan.TicksPerSecond), _connectionsService.LastSqlUpdate.Kind);
+            DateTime LastSqlUpdateWithoutMilliseconds = new DateTime(Runtime.ConnectionsService.LastSqlUpdate.Ticks - (Runtime.ConnectionsService.LastSqlUpdate.Ticks % TimeSpan.TicksPerSecond), Runtime.ConnectionsService.LastSqlUpdate.Kind);
             return lastUpdateInDb == LastSqlUpdateWithoutMilliseconds;
         }
 

mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs

@@ -1,17 +1,15 @@
-using mRemoteNG.Connection;
-using System;
+using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using mRemoteNG.Connection;
 
 namespace mRemoteNG.Config.Connections
 {
     public class SaveConnectionsOnEdit
     {
-        private readonly IConnectionsService _connectionsService;
+        private readonly ConnectionsService _connectionsService;
 
-        public bool Enabled { get; set; } = true;
-
-        public SaveConnectionsOnEdit(IConnectionsService connectionsService)
+        public SaveConnectionsOnEdit(ConnectionsService connectionsService)
         {
             if (connectionsService == null)
                 throw new ArgumentNullException(nameof(connectionsService));
@@ -22,9 +20,10 @@ namespace mRemoteNG.Config.Connections
 
         private void ConnectionsServiceOnConnectionsLoaded(object sender, ConnectionsLoadedEventArgs connectionsLoadedEventArgs)
         {
+            
+
             connectionsLoadedEventArgs.NewConnectionTreeModel.CollectionChanged += ConnectionTreeModelOnCollectionChanged;
             connectionsLoadedEventArgs.NewConnectionTreeModel.PropertyChanged += ConnectionTreeModelOnPropertyChanged;
-
             foreach (var oldTree in connectionsLoadedEventArgs.PreviousConnectionTreeModel)
             {
                 oldTree.CollectionChanged -= ConnectionTreeModelOnCollectionChanged;
@@ -46,11 +45,7 @@ namespace mRemoteNG.Config.Connections
         {
             if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
-
-            if (!Enabled)
-                return;
-
-            _connectionsService.SaveConnectionsAsync();
+            _connectionsService.SaveConnections();
         }
     }
 }

mRemoteV1/Config/Connections/SqlConnectionsLoader.cs

@@ -2,31 +2,20 @@
 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(_connectionsService);
+            var deserializer = new DataTableDeserializer();
             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,15 +21,14 @@ namespace mRemoteNG.Config.Connections
 {
     public class SqlConnectionsSaver : ISaver<ConnectionTreeModel>
     {
-        private readonly IConnectionsService _connectionsService;
+        private SecureString _password = Runtime.EncryptionKey;
         private readonly SaveFilter _saveFilter;
-        private readonly DatabaseConnectorFactory _databaseConnectorFactory;
 
-        public SqlConnectionsSaver(SaveFilter saveFilter, IConnectionsService connectionsService, DatabaseConnectorFactory databaseConnectorFactory)
+        public SqlConnectionsSaver(SaveFilter saveFilter)
         {
-            _saveFilter = saveFilter.ThrowIfNull(nameof(saveFilter));
-            _databaseConnectorFactory = databaseConnectorFactory.ThrowIfNull(nameof(databaseConnectorFactory));
-            _connectionsService = connectionsService.ThrowIfNull(nameof(connectionsService));
+            if (saveFilter == null)
+                throw new ArgumentNullException(nameof(saveFilter));
+            _saveFilter = saveFilter;
         }
 
         public void Save(ConnectionTreeModel connectionTreeModel)
@@ -41,7 +40,7 @@ namespace mRemoteNG.Config.Connections
             }
                 
 
-            using (var sqlConnector = _databaseConnectorFactory.SqlDatabaseConnectorFromSettings())
+            using (var sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings())
             {
                 sqlConnector.Connect();
                 var databaseVersionVerifier = new SqlDatabaseVersionVerifier(sqlConnector);
@@ -68,17 +67,17 @@ namespace mRemoteNG.Config.Connections
             {
                 if (rootTreeNode.Password)
                 {
-                    _connectionsService.EncryptionKey = rootTreeNode.PasswordString.ConvertToSecureString();
-                    strProtected = cryptographyProvider.Encrypt("ThisIsProtected", _connectionsService.EncryptionKey);
+                    _password = rootTreeNode.PasswordString.ConvertToSecureString();
+                    strProtected = cryptographyProvider.Encrypt("ThisIsProtected", _password);
                 }
                 else
                 {
-                    strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _connectionsService.EncryptionKey);
+                    strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _password);
                 }
             }
             else
             {
-                strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _connectionsService.EncryptionKey);
+                strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", _password);
             }
 
             var sqlQuery = new SqlCommand("DELETE FROM tblRoot", sqlDatabaseConnector.SqlConnection);

mRemoteV1/Config/Connections/XmlConnectionsLoader.cs

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

mRemoteV1/Config/Connections/XmlConnectionsSaver.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
@@ -32,7 +31,7 @@ namespace mRemoteNG.Config.Connections
             try
             {
                 var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
-                var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
                     cryptographyProvider,
                     connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                     _saveFilter);

mRemoteV1/Config/DataProviders/FileBackupPruner.cs

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

mRemoteV1/Config/DatabaseConnectors/DatabaseConnectorFactory.cs

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

mRemoteV1/Config/Import/MRemoteNGCsvImporter.cs

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

mRemoteV1/Config/Import/MRemoteNGXmlImporter.cs

@@ -1,13 +1,10 @@
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Xml;
-using mRemoteNG.Connection;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
-using mRemoteNG.Tools;
 
 
 namespace mRemoteNG.Config.Import
@@ -15,15 +12,6 @@ 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)
@@ -37,7 +25,7 @@ namespace mRemoteNG.Config.Import
 
 	        var dataProvider = new FileDataProvider(fileName);
 	        var xmlString = dataProvider.Load();
-	        var xmlConnectionsDeserializer = new XmlConnectionsDeserializer(_connectionsService, _dialogWindowParent);
+	        var xmlConnectionsDeserializer = new XmlConnectionsDeserializer();
 	        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,12 +35,10 @@ namespace mRemoteNG.Config.Putty
 			}
 		}
 
-	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider puttySessionProvider)
+	    private void AddSessionsFromProvider(AbstractPuttySessionsProvider provider)
 	    {
-	        puttySessionProvider.ThrowIfNull(nameof(puttySessionProvider));
-
-            var rootTreeNode = puttySessionProvider.RootInfo;
-	        puttySessionProvider.GetSessions();
+            var rootTreeNode = provider.RootInfo;
+	        provider.GetSessions();
 
             if (!RootPuttySessionsNodes.Contains(rootTreeNode) && rootTreeNode.HasChildren())
                 RootPuttySessionsNodes.Add(rootTreeNode);

mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs

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

mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs

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

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

@@ -1,213 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
-using mRemoteNG.Credential;
-using mRemoteNG.Security;
-using mRemoteNG.Tools;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-
-namespace mRemoteNG.Config.Serializers.Csv
-{
-	public class CsvConnectionsSerializerMremotengFormat : ISerializer<ConnectionInfo,string>
-    {
-        private readonly SaveFilter _saveFilter;
-        private readonly ICredentialRepositoryList _credentialRepositoryList;
-
-        public CsvConnectionsSerializerMremotengFormat(SaveFilter saveFilter, ICredentialRepositoryList credentialRepositoryList)
-        {
-            saveFilter.ThrowIfNull(nameof(saveFilter));
-            credentialRepositoryList.ThrowIfNull(nameof(credentialRepositoryList));
-
-            _saveFilter = saveFilter;
-            _credentialRepositoryList = credentialRepositoryList;
-        }
-
-        public string Serialize(ConnectionTreeModel connectionTreeModel)
-        {
-            connectionTreeModel.ThrowIfNull(nameof(connectionTreeModel));
-
-            var rootNode = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
-            return Serialize(rootNode);
-        }
-
-        public string Serialize(ConnectionInfo serializationTarget)
-        {
-            serializationTarget.ThrowIfNull(nameof(serializationTarget));
-            var sb = new StringBuilder();
-
-            WriteCsvHeader(sb);
-            SerializeNodesRecursive(serializationTarget, sb);
-            return sb.ToString();
-        }
-
-        private void WriteCsvHeader(StringBuilder sb)
-        {
-            sb.Append("Name;Id;Parent;NodeType;Description;Icon;Panel;");
-            if (_saveFilter.SaveUsername)
-                sb.Append("Username;");
-            if (_saveFilter.SavePassword)
-                sb.Append("Password;");
-            if (_saveFilter.SaveDomain)
-                sb.Append("Domain;");
-            sb.Append("Hostname;Protocol;PuttySession;Port;ConnectToConsole;UseCredSsp;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;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;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)
-        {
-            var nodeAsContainer = node as ContainerInfo;
-            if (nodeAsContainer != null)
-            {
-                foreach (var child in nodeAsContainer.Children)
-                {
-                    SerializeNodesRecursive(child, sb);
-                }
-            }
-
-            // dont serialize the root node
-            if (node is RootNodeInfo)
-                return;
-
-            SerializeConnectionInfo(node, sb);
-        }
-
-        private void SerializeConnectionInfo(ConnectionInfo con, StringBuilder sb)
-        {
-            sb.AppendLine();
-            sb.Append(FormatForCsv(con.Name))
-                .Append(FormatForCsv(con.ConstantID))
-                .Append(FormatForCsv(con.Parent?.ConstantID ?? ""))
-                .Append(FormatForCsv(con.GetTreeNodeType()))
-                .Append(FormatForCsv(con.Description))
-                .Append(FormatForCsv(con.Icon))
-                .Append(FormatForCsv(con.Panel));
-
-            if (_saveFilter.SaveUsername)
-                sb.Append(FormatForCsv(con.Username));
-
-            if (_saveFilter.SavePassword)
-                sb.Append(FormatForCsv(con.Password));
-
-            if (_saveFilter.SaveDomain)
-                sb.Append(FormatForCsv(con.Domain));
-
-            sb.Append(FormatForCsv(con.Hostname))
-                .Append(FormatForCsv(con.Protocol))
-                .Append(FormatForCsv(con.PuttySession))
-                .Append(FormatForCsv(con.Port))
-                .Append(FormatForCsv(con.UseConsoleSession))
-                .Append(FormatForCsv(con.UseCredSsp))
-                .Append(FormatForCsv(con.RenderingEngine))
-                .Append(FormatForCsv(con.ICAEncryptionStrength))
-                .Append(FormatForCsv(con.RDPAuthenticationLevel))
-                .Append(FormatForCsv(con.LoadBalanceInfo))
-                .Append(FormatForCsv(con.Colors))
-                .Append(FormatForCsv(con.Resolution))
-                .Append(FormatForCsv(con.AutomaticResize))
-                .Append(FormatForCsv(con.DisplayWallpaper))
-                .Append(FormatForCsv(con.DisplayThemes))
-                .Append(FormatForCsv(con.EnableFontSmoothing))
-                .Append(FormatForCsv(con.EnableDesktopComposition))
-                .Append(FormatForCsv(con.CacheBitmaps))
-                .Append(FormatForCsv(con.RedirectDiskDrives))
-                .Append(FormatForCsv(con.RedirectPorts))
-                .Append(FormatForCsv(con.RedirectPrinters))
-                .Append(FormatForCsv(con.RedirectClipboard))
-                .Append(FormatForCsv(con.RedirectSmartCards))
-                .Append(FormatForCsv(con.RedirectSound))
-                .Append(FormatForCsv(con.RedirectKeys))
-                .Append(FormatForCsv(con.PreExtApp))
-                .Append(FormatForCsv(con.PostExtApp))
-                .Append(FormatForCsv(con.MacAddress))
-                .Append(FormatForCsv(con.UserField))
-                .Append(FormatForCsv(con.ExtApp))
-                .Append(FormatForCsv(con.VNCCompression))
-                .Append(FormatForCsv(con.VNCEncoding))
-                .Append(FormatForCsv(con.VNCAuthMode))
-                .Append(FormatForCsv(con.VNCProxyType))
-                .Append(FormatForCsv(con.VNCProxyIP))
-                .Append(FormatForCsv(con.VNCProxyPort))
-                .Append(FormatForCsv(con.VNCProxyUsername))
-                .Append(FormatForCsv(con.VNCProxyPassword))
-                .Append(FormatForCsv(con.VNCColors))
-                .Append(FormatForCsv(con.VNCSmartSizeMode))
-                .Append(FormatForCsv(con.VNCViewOnly))
-                .Append(FormatForCsv(con.RDGatewayUsageMethod))
-                .Append(FormatForCsv(con.RDGatewayHostname))
-                .Append(FormatForCsv(con.RDGatewayUseConnectionCredentials))
-                .Append(FormatForCsv(con.RDGatewayUsername))
-                .Append(FormatForCsv(con.RDGatewayPassword))
-                .Append(FormatForCsv(con.RDGatewayDomain));
-
-
-            if (!_saveFilter.SaveInheritance)
-                return;
-
-            sb.Append(FormatForCsv(con.Inheritance.CacheBitmaps))
-                .Append(FormatForCsv(con.Inheritance.Colors))
-                .Append(FormatForCsv(con.Inheritance.Description))
-                .Append(FormatForCsv(con.Inheritance.DisplayThemes))
-                .Append(FormatForCsv(con.Inheritance.DisplayWallpaper))
-                .Append(FormatForCsv(con.Inheritance.EnableFontSmoothing))
-                .Append(FormatForCsv(con.Inheritance.EnableDesktopComposition))
-                .Append(FormatForCsv(con.Inheritance.Domain))
-                .Append(FormatForCsv(con.Inheritance.Icon))
-                .Append(FormatForCsv(con.Inheritance.Panel))
-                .Append(FormatForCsv(con.Inheritance.Password))
-                .Append(FormatForCsv(con.Inheritance.Port))
-                .Append(FormatForCsv(con.Inheritance.Protocol))
-                .Append(FormatForCsv(con.Inheritance.PuttySession))
-                .Append(FormatForCsv(con.Inheritance.RedirectDiskDrives))
-                .Append(FormatForCsv(con.Inheritance.RedirectKeys))
-                .Append(FormatForCsv(con.Inheritance.RedirectPorts))
-                .Append(FormatForCsv(con.Inheritance.RedirectPrinters))
-                .Append(FormatForCsv(con.Inheritance.RedirectClipboard))
-                .Append(FormatForCsv(con.Inheritance.RedirectSmartCards))
-                .Append(FormatForCsv(con.Inheritance.RedirectSound))
-                .Append(FormatForCsv(con.Inheritance.Resolution))
-                .Append(FormatForCsv(con.Inheritance.AutomaticResize))
-                .Append(FormatForCsv(con.Inheritance.UseConsoleSession))
-                .Append(FormatForCsv(con.Inheritance.UseCredSsp))
-                .Append(FormatForCsv(con.Inheritance.RenderingEngine))
-                .Append(FormatForCsv(con.Inheritance.Username))
-                .Append(FormatForCsv(con.Inheritance.ICAEncryptionStrength))
-                .Append(FormatForCsv(con.Inheritance.RDPAuthenticationLevel))
-                .Append(FormatForCsv(con.Inheritance.LoadBalanceInfo))
-                .Append(FormatForCsv(con.Inheritance.PreExtApp))
-                .Append(FormatForCsv(con.Inheritance.PostExtApp))
-                .Append(FormatForCsv(con.Inheritance.MacAddress))
-                .Append(FormatForCsv(con.Inheritance.UserField))
-                .Append(FormatForCsv(con.Inheritance.ExtApp))
-                .Append(FormatForCsv(con.Inheritance.VNCCompression))
-                .Append(FormatForCsv(con.Inheritance.VNCEncoding))
-                .Append(FormatForCsv(con.Inheritance.VNCAuthMode))
-                .Append(FormatForCsv(con.Inheritance.VNCProxyType))
-                .Append(FormatForCsv(con.Inheritance.VNCProxyIP))
-                .Append(FormatForCsv(con.Inheritance.VNCProxyPort))
-                .Append(FormatForCsv(con.Inheritance.VNCProxyUsername))
-                .Append(FormatForCsv(con.Inheritance.VNCProxyPassword))
-                .Append(FormatForCsv(con.Inheritance.VNCColors))
-                .Append(FormatForCsv(con.Inheritance.VNCSmartSizeMode))
-                .Append(FormatForCsv(con.Inheritance.VNCViewOnly))
-                .Append(FormatForCsv(con.Inheritance.RDGatewayUsageMethod))
-                .Append(FormatForCsv(con.Inheritance.RDGatewayHostname))
-                .Append(FormatForCsv(con.Inheritance.RDGatewayUseConnectionCredentials))
-                .Append(FormatForCsv(con.Inheritance.RDGatewayUsername))
-                .Append(FormatForCsv(con.Inheritance.RDGatewayPassword))
-                .Append(FormatForCsv(con.Inheritance.RDGatewayDomain))
-                .Append(FormatForCsv(con.Inheritance.RDPAlertIdleTimeout))
-                .Append(FormatForCsv(con.Inheritance.RDPMinutesToIdleTimeout))
-                .Append(FormatForCsv(con.Inheritance.SoundQuality));
-        }
-
-        private string FormatForCsv(object value)
-        {
-            var cleanedString = value.ToString().Replace(";", "");
-            return cleanedString + ";";
-        }
-    }
-}