version update

Powershell (non ISE) added to common external tools with a handful argument. Several edits.

.github/CONTRIBUTING.md

@@ -1,58 +0,0 @@
-# Welcome!
-
-We are really glad you are interested in contributing to mRemoteNG!
-
-Open source software is best when shared with others. This also applies to the work that goes into the software. Your ideas and passion are what make this software great.
-
-
-### Ways you can contribute
-There are many ways that you can help improve mRemoteNG, even if you don't know how to program.
-
-For example, you might:
-- add documentation or "how-to" articles on the [Wiki](https://github.com/mRemoteNG/mRemoteNG/wiki)
-- answer support questions on the [forum](http://forum.mremoteng.org)
-- [add or improve a translation](https://github.com/mRemoteNG/mRemoteNG/wiki/How-to-Help-Translating-mRemoteNG)
-- submit a [pull request](https://github.com/mRemoteNG/mRemoteNG/pulls) for a [bug or feature ticket](https://github.com/mRemoteNG/mRemoteNG/issues)
-
-
-# Submitting GitHub Issues
-The GitHub Issue tracker is our preferred channel for bug reports and feature requests.
-- For questions or general discussion, please use [our public Gitter chat](https://gitter.im/mRemoteNG/PublicChat) or the [forum](http://forum.mremoteng.org).
-- If you find a security vulnerability, do **NOT** open an issue. Email support@mremoteng.org instead.
-
-### Bug reports
-A bug is any behavior that does not consistently produce the expected result.
-
-Guidelines for bug reports:
-1. Do not open bug reports for questions.
-1. Use the GitHub Issue search to make sure your bug hasn't already been reported.
-1. Include as much detailed information as possible. We've included a default template when opening an issue to make this easier.
-
-### Feature requests
-Feature requests are great! Take some time to compose a well thought out proposal. It's up to you to convince the project maintainers that your feature is a good idea. To ensure your request receives the consideration that it deserves, include as much detail as possible. For example:
-- What is the purpose of the new feature?
-- What situation led you to want this feature?
-- How does the application perform now and how would the new feature change this?
-- If applicable, consider including visual mock-ups to show us what you mean.
-
-# Pull requests
-Good pull requests are a huge help! If you haven't already, please consider reading [GitHub's guide to contributing to open source](https://guides.github.com/activities/contributing-to-open-source/)
-
-Our requests when it comes to pull requests:
-- Be clear about what your PR seeks to do.
-- Keep your PR focused. It should be clear what code changed to achieve your stated goal.
-- Add or update tests when possible. Some of the code base is still very hard to effectively test. If you can, please try to create or update tests that relate to your PR.
-- Please talk with one of the project maintainers before starting work on large pull requests. Otherwise, you run the risk of putting a lot of time into a feature or refactor that gets denied.
-- If you have access to Static Code Analysis tools (like ReSharper), please don't analyze/fix everything in one giant PR. As great as these tools are, they can sometimes cause unintended problems.
-
-# Code Style
-- Please make use of simple types and var where possible
-- Prefer "using" over .Dispose()
-- Avoid nesting "using"
-
-# Your first contributions
-Want to help but don't know where to start? Check out the issues that we've labeled with [`Help Wanted`](https://github.com/mRemoteNG/mRemoteNG/issues?q=is%3Aissue+is%3Aopen+label%3A%22Help+Wanted%22) or [`ready`](https://github.com/mRemoteNG/mRemoteNG/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20label%3A%22ready%22). These will vary in difficulty, but should be possible for new contributors.
-
-Want to help but don't know C#? Check out the issues that we've labeled with [`Documentation`](https://github.com/mRemoteNG/mRemoteNG/labels/Documentation).
-
-Sorry, we currently do not have any tags for truly beginner-friendly issues :(

.github/ISSUE_TEMPLATE.md

@@ -1,30 +0,0 @@
-<!--- Provide a general summary of the issue in the Title above -->
-
-## 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 -->
-
-## 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 -->
-
-## 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):

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +0,0 @@
-<!--- 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.

.gitignore

@@ -283,9 +283,6 @@ Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
 InstallerProjects/Installer/Fragments/FilesFragment.wxs
 InstallerProjects/Installer/Resources/License.rtf
 
-# user preference: .editorconfig - http://editorconfig.org/
-.editorconfig
-
 # gh-pages info
 runlocal.bat
-/_site
+/_site

CREDITS.TXT

@@ -1,144 +0,0 @@
-Contributors
-============
-
-Current mRemoteNG dev team:
-David Sparer (github.com/sparerd)
-Sean Kaim (github.com/kmscode)
-
-Thanks for the awesome new website!
-Bennett Blodinger (github.com/benwa)
-
-Joe Cefoli (github.com/jcefoli)
-countchappy (github.com/countchappy)
-Tony Lambert
-Julien Roncaglia (github.com/vbfox)
-github.com/peterchenadded
-Brandon Wulf (github.com/mrwulf)
-Pedro Rodrigues (github.com/pedro2555)
-github.com/dekelMP
-github.com/farosch
-Bruce (github.com/brucetp)
-Camilo Alvarez (github.com/jotatsu)
-github.com/DamianBis
-github.com/pfjason
-github.com/sirLoaf
-github.com/Fyers
-Vladimir Semenov (github.com/sli-pro)
-Stephan (github.com/st-schuler)
-
-
-Past Contributors
-=================
-
-Felix Deimel - mRemote original developer
-Riley McArdle - mRemoteNG original developer
-
-Hayato Iriumi (github.com/hiriumi)
-Jason Barbier
-Wiktor Beryt
-Lionel Caignec
-Ruben d'Arco
-Holger Henke
-Tom Hiller
-Apisitt Rattana
-Andreas Rehm
-David Vidmar
-github.com/Brandhor
-github.com/Kvarkas
-
-
-Translators
-===========
-
-Eugenio "Ryo567" Mart<72>nez
-Mathieu Pape
-Emanuel Silva
-Robert Siwiec
-Hayato Iriumi
-Sebastien Thieury (github.com/SebThieu)
-Riza Emet
-Lukas Plachy (github.com/rheingold)
-Gyuha Shin
-Stefan (github.com/polluks)
-github.com/emazv72
-Vladimir Semenov (github.com/sli-pro)
-Marco Sousa (github.com/marcomsousa)
-
-
-Included Source Code
-====================
-
-Command Line Arguments Parser
-Copyright <20> 2002 Richard Lopes
-MIT License
-http://www.codeproject.com/KB/recipes/command_line.aspx
-
-FilteredPropertyGrid
-Copyright <20> 2006 Azuria
-http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
-
-InputBox
-Copyright <20> 2016 Jan Slama
-http://www.csharp-examples.net/inputbox/
-
-IP TextBox
-Copyright <20> 2005 mawnkay
-http://www.codeproject.com/Articles/11576/IP-TextBox
-
-PortableSettingsProvider	
-Copyright <20> 2014 crdx
-https://github.com/crdx/PortableSettingsProvider
-
-
-Included Components
-===================
-
-ADTree
-Copyright <20> 2004 Marc Merritt
-Copyright <20> 2008 Felix Deimel
-http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
-
-DockPanel Suite
-Copyright <20> 2016 @roken and @lextm (formerly Weifen Luo)
-MIT License
-https://github.com/dockpanelsuite/dockpanelsuite
-
-GeckoFX 
-Copyright <20> 2016 Tom Hindle
-Mozilla Public License
-https://bitbucket.org/geckofx/
-
-log4net
-Copyright <20> 2001-2015 The Apache Software Foundation
-Apache License Version 2.0
-http://logging.apache.org/log4net/
-
-Magic Library
-Copyright <20> 2002-2003 Crownwood Consulting, Ltd.
-Freely redistributable with attribution
-http://www.dotnetmagic.com/magic_download.html
-
-PuTTY
-Copyright <20> 1997-2017 Simon Tatham
-MIT License
-http://www.chiark.greenend.org.uk/~sgtatham/putty/
-
-Silk Icon Set
-Copyright <20> 2005-2008 FAMFAMFAM
-Creative Commons Attribution 2.5 License
-http://www.famfamfam.com/
-
-SSH.NET
-Copyright <20> 2016
-MIT License
-https://github.com/sshnet/SSH.NET
-
-VncSharp
-Copyright <20> 2004-2009 David Humphrey
-GNU General Public License (GPL) Version 2
-https://github.com/humphd/VncSharp
-
-ObjectListView
-Copyright <20> 2006-2016 Phillip Piper
-GNU General Public License (GPL) Version 3
-https://sourceforge.net/projects/objectlistview/

CREDITS.md

@@ -0,0 +1,127 @@
+# Contributors
+
+## Current mRemoteNG dev team
+
+[David Sparer](http://github.com/sparerd)  
+[Sean Kaim](http://github.com/kmscode)  
+[Faryan Rezagholi](http://github.com/farosch)  
+[Bennett Blodinger](http://github.com/benwa)
+
+[Joe Cefoli](http://github.com/jcefoli)  
+[countchappy](http://github.com/countchappy)  
+Tony Lambert  
+[Julien Roncaglia](http://github.com/vbfox)  
+[peterchenadded](http://github.com/peterchenadded)  
+[Brandon Wulf](http://github.com/mrwulf)  
+[Pedro Rodrigues](http://github.com/pedro2555)  
+[dekelMP](http://github.com/dekelMP)  
+[Bruce](http://github.com/brucetp)  
+[Camilo Alvarez](http://github.com/jotatsu)  
+[DamianBis](http://github.com/DamianBis)  
+[pfjason](http://github.com/pfjason)  
+[sirLoaf](http://github.com/sirLoaf)  
+[Fyers](http://github.com/Fyers)  
+[Vladimir Semenov](http://github.com/sli-pro)  
+[Stephan](http://github.com/st-schuler)  
+[Aleksey Reytsman](http://github.com/areytsman)  
+[Cristian Abelleira](http://github.com/CrAbelleira)  
+[MitchellBot](http://github.com/MitchellBot)  
+[Filippo Ferrazini](http://github.com/Filippo125)
+
+## Past Contributors
+
+Felix Deimel - mRemote original developer  
+Riley McArdle - mRemoteNG original developer  
+
+[Hayato Iriumi](http://github.com/hiriumi)  
+Jason Barbier  
+Wiktor Beryt  
+Lionel Caignec  
+Ruben d'Arco  
+Holger Henke  
+Tom Hiller  
+Apisitt Rattana  
+Andreas Rehm  
+David Vidmar  
+[Brandhor](http://github.com/Brandhor)  
+[Dimitrij](http://github.com/Kvarkas)  
+
+## Translators
+
+Eugenio "Ryo567" Martínez  
+Mathieu Pape  
+Emanuel Silva  
+Robert Siwiec  
+Hayato Iriumi  
+[Sebastien Thieury](http://github.com/SebThieu)  
+Riza Emet  
+[Lukas Plachy](http://github.com/rheingold)  
+Gyuha Shin  
+[Stefan](http://github.com/polluks)  
+[emazv72](http://github.com/emazv72)  
+[Vladimir Semenov](http://github.com/sli-pro)  
+[Marco Sousa](http://github.com/marcomsousa)  
+[wwj402](http://github.com/wwj402)  
+[Fyers](http://github.com/Fyers)  
+[pablomh](http://github.com/pablomh)  
+[Damian Szczepanik](http://github.com/damianszczepanik)  
+[Mant1kor](http://github.com/Mant1kor)
+
+# Included Source Code
+
+**[Command Line Arguments Parser](http://www.codeproject.com/KB/recipes/command_line.aspx)**  
+Copyright © 2002 Richard Lopes  
+MIT License
+
+**[FilteredPropertyGrid](http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx)**  
+Copyright © 2006 Azuria
+
+**[InputBox](http://www.csharp-examples.net/inputbox/)**  
+Copyright © 2016 Jan Slama
+
+**[IP TextBox](http://www.codeproject.com/Articles/11576/IP-TextBox)**  
+Copyright © 2005 mawnkay
+
+**[PortableSettingsProvider](https://github.com/crdx/PortableSettingsProvider)**  
+Copyright © 2014 crdx
+
+**[ADTree](http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx)**  
+Copyright © 2004 Marc Merritt © 2008 Felix Deimel
+
+# Included Components
+
+**[CefSharp](https://github.com/cefsharp/CefSharp)**  
+Copyright © The CefSharp Authors  
+MIT License
+
+**[DockPanel Suite](https://github.com/dockpanelsuite/dockpanelsuite)**  
+Copyright © 2018 @roken and @lextm (formerly Weifen Luo)  
+MIT License
+
+**[log4net](http://logging.apache.org/log4net/)**  
+Copyright © 2001-2015 The Apache Software Foundation  
+Apache License Version 2.0
+
+**[PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/)**  
+Copyright © 1997-2017 Simon Tatham  
+MIT License
+
+**[Silk Icon Set](http://www.famfamfam.com/)**  
+Copyright © 2005-2008 FAMFAMFAM  
+Creative Commons Attribution 2.5 License
+
+**[SSH.NET](https://github.com/sshnet/SSH.NET)**  
+Copyright © 2016  
+MIT License
+
+**[VncSharp](https://github.com/humphd/VncSharp) (Archived)**  
+Copyright © 2004-2009 David Humphrey  
+GNU General Public License (GPL) Version 2
+
+**[ObjectListView](https://sourceforge.net/projects/objectlistview/)**  
+Copyright © 2006-2016 Phillip Piper  
+GNU General Public License (GPL) Version 3
+
+**[ConsoleControl](https://github.com/dwmkerr/consolecontrol)**  
+Copyright © 2015 Dave Kerr  
+MIT License  

InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment>
-    <ComponentGroup Id="CG.ProjectInfoFiles" Directory="INSTALLDIR">
-      <Component Id="C.Changelog" Guid="*">
-        <File Id="ChangelogFile" Name="Changelog.txt" Source="$(var.SolutionDir)CHANGELOG.TXT" KeyPath="yes" />
-      </Component>
-      <Component Id="C.Credits" Guid="*">
-        <File Id="CreditsFile" Name="Credits.txt" Source="$(var.SolutionDir)CREDITS.TXT" KeyPath="yes" />
-      </Component>
-      <Component Id="C.License" Guid="*">
-        <File Id="LicenseFile" Name="License.txt" Source="$(var.SolutionDir)COPYING.TXT" KeyPath="yes" />
-      </Component>
-      <Component Id="C.Readme" Guid="*">
-        <File Id="ReadmeFile" Name="Readme.txt" Source="$(var.SolutionDir)README.TXT" KeyPath="yes" />
-      </Component>
-    </ComponentGroup>
-	</Fragment>
-</Wix>

InstallerProjects/Installer/Localizations/cs-CZ.wxl

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="cs-CZ" Language="1029" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-  
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-  
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-  
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
-  
-</WixLocalization>

InstallerProjects/Installer/Localizations/de-DE.wxl

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="de-DE" Language="1031" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">mRemoteNG jetzt Starten</String>
-  
-</WixLocalization>

InstallerProjects/Installer/Localizations/ja-JP.wxl

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="ja-JP" Language="1041" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-  
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-  
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-  
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
-  
-</WixLocalization>

InstallerProjects/Installer/Localizations/ru-RU.wxl

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="ru-RU" Language="1049" xmlns="http://schemas.microsoft.com/wix/2006/localization">
-  
-  <!-- Install Conditions -->
-  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
-  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
-  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
-  <String Id="Install_OSVersionRequirement">mRemoteNG requires Windows 7 SP1 or higher to run. Please update your operating system and try again.</String>
-  <String Id="Install_RDP80Requirement">mRemoteNG requires RDP 8.0 or higher to run. Windows 7 users will need to install KB2592687</String>
-  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
-  
-  <!-- Directories and File names -->
-  <String Id="Folders_Desktop">Desktop</String>
-  <String Id="File_Credits">Credits</String>
-  <String Id="File_License">License</String>
-  <String Id="File_VersionHistory">Version History</String>
-  
-  <!-- Features and install options -->
-  <String Id="Feature_Complete">Complete</String>
-  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
-  
-  <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
-  
-</WixLocalization>

Jenkinsfile_publish.groovy

@@ -2,7 +2,7 @@ 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 nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.10.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"

README.MD

@@ -1,59 +1,180 @@
-# Welcome to the mRemoteNG project!
+**NOTICE: This project is currently stalled and we are transitioning to a new maintainer. Please see [this stickied issue](https://github.com/mRemoteNG/mRemoteNG/issues/1949) for more details. Development help would be greatly appreciated.**
 
-[![Twitter Follow](https://img.shields.io/twitter/follow/mRemoteNG.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=mRemoteNG)
-[![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat)
-[![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer)
+<br/><br/>
+<p align="center">
+  <img width="500" src="https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/Tools/img/logo.png">
+</p>
+  
+<p align="center">
+  An open source, multi-protocol, tabbed remote connections manager allowing you to view all of your connections in a simple yet powerful interface
+</p>
 
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)
+<p align="center">
+  <img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/mremoteng/mremoteng/total?label=Overall%20Downloads&style=for-the-badge">
+</p>
 
-[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG)
+<p align="center">
+  <a href="https://www.reddit.com/r/mRemoteNG/">
+    <img alt="Subreddit subscribers" src="https://img.shields.io/reddit/subreddit-subscribers/mremoteng?label=Reddit&logo=Reddit&style=flat-square">
+  </a>
+  <a href="https://twitter.com/mremoteng">
+    <img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/mremoteng?color=%231DA1F2&label=Twitter&logo=Twitter&style=flat-square">
+  </a>
+  <a href="https://gitter.im/mRemoteNG/PublicChat">
+    <img alt="Gitter" src="https://img.shields.io/gitter/room/mRemoteNG/PublicChat?label=Join%20the%20Chat&logo=Gitter&style=flat-square">
+  </a>  
+  <a href="https://www.paypal.me/DavidSparer">
+    <img alt="PayPal" src="https://img.shields.io/badge/%24-PayPal-blue.svg?label=Donate&logo=PayPal&style=flat-square">
+  </a>
+  <a href="bitcoin:16fUnHUM3k7W9Fvpc6dug7TAdfeGEcLbSg">
+    <img alt="Bitcoin" src="https://img.shields.io/badge/%24-Bitcoin.svg?label=Donate&logo=bitcoin&style=flat-square">
+  </a>
+</p>
+
+<p align="center">
+  <a href="https://github.com/mRemoteNG/mRemoteNG/blob/develop/COPYING.TXT">
+    <img alt="License" src="https://img.shields.io/github/license/mremoteng/mremoteng?label=License&style=flat">
+  </a>
+  <a href="https://bestpractices.coreinfrastructure.org/projects/529">
+    <img alt="CII Best Practices" src="https://bestpractices.coreinfrastructure.org/projects/529/badge?style=flat">
+  </a>
+  <a href='https://mremoteng.readthedocs.io/en/latest/?badge=latest'>
+    <img src='https://readthedocs.org/projects/mremoteng/badge/?version=latest' alt='Documentation Status' />
+  </a>
+</p>
+
+---
 
 | 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) |
-
-mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
+| 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.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) |
+| Prerelease | [![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.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) |
 
 ## Features
 
-mRemoteNG is a fork of mRemote: an open source, tabbed, multi-protocol, remote connections manager. mRemoteNG adds bug fixes and new features to mRemote.
+The following protocols are supported:
 
-It allows you to view all of your remote connections in a simple yet powerful tabbed interface.
-
-mRemoteNG supports the following protocols:
-
-* RDP (Remote Desktop/Terminal Server)
+* RDP (Remote Desktop Protocol)
 * VNC (Virtual Network Computing)
-* ICA (Citrix Independent Computing Architecture)
 * SSH (Secure Shell)
 * Telnet (TELecommunication NETwork)
 * HTTP/HTTPS (Hypertext Transfer Protocol)
 * rlogin (Remote Login)
 * Raw Socket Connections
+* Powershell remoting
 
-For a detailed feature list and general usage support, refer to the [User Manual](https://github.com/mRemoteNG/mRemoteNG/wiki/User-Manual).
+For a detailed feature list and general usage support, refer to the [Documentation](https://mremoteng.readthedocs.io/en/latest/).
 
 ## Installation
 
-Before installing make sure you have all the required [prerequisites](https://github.com/mRemoteNG/mRemoteNG/wiki/Prerequisites).
+### Supported Operating Systems
 
-mRemoteNG is available as a redistributable msi package, and can be downloaded from the following locations:
+- [Windows 10](https://en.wikipedia.org/wiki/Windows_10)
+- [Windows 8.1](https://en.wikipedia.org/wiki/Windows_8.1)
+- [Windows Server 2019](https://en.wikipedia.org/wiki/Windows_Server_2019)
+- [Windows Server 2016](https://en.wikipedia.org/wiki/Windows_Server_2016)
+- [Windows Server 2012 R2](https://en.wikipedia.org/wiki/Windows_Server_2012_R2)
+
+### Packaging
+
+Downloads are provided in three different packages.
+
+#### Binary package
+
+The binary package of mRemoteNG is a compiled version of mRemoteNG which comes in an MSI installer.
+This is the most common way to install mRemoteNG and get up and running.
+
+#### Portable package
+
+The portable package contains a modified version of the executable which stores and loads all your settings from files in the application's directory.
+This package can be used to run mRemoteNG from a USB stick and preserve your configuration wherever you go.
+
+#### Source package
+
+This contains the source code from which mRemoteNG is build.
+You will need to compile it yourself using Visual Studio.
+
+### Minimum Requirements
+
+* [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
+* [Microsoft .NET Framework 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=17851)
+* Microsoft Terminal Service Client 6.0 or later
+  * Needed if you use RDP. mstscax.dll and/or msrdp.ocx be registered.
+* [Citrix ICA Client](https://www.citrix.com/downloads/citrix-receiver.html)
+  * Needed if you use ICA. wfica.ocx must be registered
+
+### Download
+
+mRemoteNG is available as a redistributable MSI package or as a portable ZIP package and can be downloaded from the following locations:
 * [GitHub](https://github.com/mRemoteNG/mRemoteNG/releases)
 * [Project Website](https://mremoteng.org/download)
 
-mRemoteNG is supported on Windows 7 or later.
-Windows 7 and Windows Server 2008 installations must ensure the [listed required updates](https://github.com/mRemoteNG/mRemoteNG/wiki/Prerequisites#full-list-of-required-windows-updates-for-windows-7--server-2008-clients) are installed and active.
+### Command line install
+
+The MSI package of mRemoteNG can be installed using the command line:
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value]`
+
+| Property | Value | Description |
+|-|-|-|
+| INSTALLDIR | `folder path` | This allows you to set the installation directory from the command line. For paths that contain spaces, enclose the path in double quotes (""). This overrides any value found in the registry. |
+| IGNOREPREREQUISITES | `0` or `1` | When set to `1`, the installer will not be halted if any prerequisite check is not met. You must still run the installer as administrator. |
+
+#### Examples
+
+**Install to a custom folder**
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi INSTALLDIR="D:\Work Apps\mRemoteNG"`
+
+**Ignore prerequisites during a normal install**
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi IGNOREPREREQUISITES=1`
+
+**Ignore prerequisites during a silent install**
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /qn IGNOREPREREQUISITES=1`
+
+### Troubleshooting installation
+
+Turn on verbose logging by using the `/lv* <log path>` argument at the command line.
+
+`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /l*v C:\mremoteng_install.log`
+
+## Uninstall
+
+### Standard Uninstall
+
+mRemoteNG basic binary package can be uninstalled with Windows Control Panel. If for some reason it does not work please
+follow information provided below for Manual Uninstall.
+
+### Manual Uninstall
+
+_If you are using the Portable version, simply deleting the folder that contains mRemoteNG should be sufficient. These uninstall instructions are only necessary for the normal binary .MSI installed version of mRemoteNG_
+
+* Delete the folder where mRemoteNG was installed. By default, this is:
+	`%PROGRAMFILES%\mRemoteNG`
+
+* Delete the mRemoteNG install entry from one of the following locations. Search for "mRemoteNG" in the DisplayName field:
+  * x86: ``HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\``
+  * x64: ``HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\``
+
+* (Optional) If you would also like to delete user data remove `%LOCALAPPDATA%\mRemoteNG`
+
+## Featured Projects
+
+* [PSmRemoteNG](https://github.com/realslacker/PSmRemoteNG) A module to create mRemoteNG connection files from PowerShell.
 
 ## Contribute
 
 If you find mRemoteNG useful and would like to contribute, it would be greatly appreciated. When you contribute, you make it possible for the team to cover the costs of producing mRemoteNG.
 
 ### Submit Code
-Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/Development) on how to configure your development environment and submit a pull request.
+Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to configure your development environment and submit a pull request.
 
 ### Translate
-Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/How%20to%20Help%20Translating%20mRemoteNG) on how to help make mRemoteNG a polygot
+Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to help make mRemoteNG a polyglot.
 
-[![Developed with ReSharper](https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/.github/icon_ReSharper.png)](https://www.jetbrains.com/resharper/)
+</br>
+<p align="center">
+  <img alt="Developed with ReSharper" src="https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/Tools/img/icon_ReSharper.png">
+</p>

Readme.txt

@@ -1,25 +0,0 @@
-mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
-
-It allows you to store all your remote connections in a simple yet powerful interface.
-
-Currently these protocols are supported:
-
- * RDP (Remote Desktop)
- * VNC (Virtual Network Computing)
- * ICA (Independent Computing Architecture)
- * SSH (Secure Shell)
- * Telnet (TELecommunication NETwork)
- * HTTP/S (Hypertext Transfer Protocol)
- * Rlogin (Rlogin)
- * RAW
-
-mRemoteNG can be installed on Windows 7 or later.
-
-Windows 7 systems require RDP version 8:   
-https://support.microsoft.com/en-us/kb/2592687   
-OR   
-https://support.microsoft.com/en-us/kb/2923545   
-
-Windows 8+ support RDP version 8+ out of the box.
-
-RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).

Tools/7zip/License.txt

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

Tools/7zip/history.txt

@@ -5,6 +5,21 @@ This file contains only information about changes related to that package exclus
 The full history of changes is listed in history.txt in main 7-Zip program.
 
 
+19.00          2019-02-21
+-------------------------
+- Encryption strength for 7z archives was increased:
+  the size of random initialization vector was increased from 64-bit to 128-bit,
+  and the pseudo-random number generator was improved.
+- Some bugs were fixed.
+
+
+18.06          2018-12-30
+-------------------------
+- The speed for LZMA/LZMA2 compressing was increased by 3-10%,
+  and there are minor changes in compression ratio.
+- Some bugs were fixed.
+
+
 18.05          2018-04-30
 -------------------------
 - The speed for LZMA/LZMA2 compressing was increased 

Tools/7zip/readme.txt

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

Tools/CreateBulkConnections_ConfCons2_6.ps1

@@ -1,60 +1,208 @@
 #####################################
-# Author: David Sparer
-# Summary: 
+# Authors: David Sparer & Jack Denton
+# 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. 
+#   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 = ""
+foreach ($Path in 'HKLM:\SOFTWARE\WOW6432Node\mRemoteNG', 'HKLM:\SOFTWARE\mRemoteNG') {
+    Try {
+        $mRNGPath = (Get-ItemProperty -Path $Path -Name InstallDir -ErrorAction Stop).InstallDir
+        break
+    }
+    Catch {
+        continue
+    }
+}
+if (!$mRNGPath) {
+    Add-Type -AssemblyName System.Windows.Forms
+    $FolderBrowser = [System.Windows.Forms.FolderBrowserDialog]@{
+        Description         = 'Please select the folder which contains mRemoteNG.exe'
+        ShowNewFolderButton = $false
+    }
+    
+    $Response = $FolderBrowser.ShowDialog()
+    
+    if ($Response.value__ -eq 1) {
+        $mRNGPath = $FolderBrowser.SelectedPath
+    }
+    elseif ($Response.value__ -eq 2) {
+        Write-Warning 'A folder containing mRemoteNG.exe has not been selected'
+        return
+    }
+}
+$null = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $mRNGPath -ChildPath "mRemoteNG.exe"))
+Add-Type -Path (Join-Path -Path $mRNGPath -ChildPath "BouncyCastle.Crypto.dll")
 
-if ($PathToMrngFolder -eq "") {
-    Write-Error -Message 'You must set the $PathToMrngFolder variable in this script to the folder which contains mRemoteNG.exe'
+
+
+function ConvertTo-mRNGSerializedXml {
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory)]
+        [mRemoteNG.Connection.ConnectionInfo[]]
+        $Xml
+)
+
+    function Get-ChildNodes {
+        Param ($Xml)
+
+        $Xml
+
+        if ($Xml -is [mRemoteNG.Container.ContainerInfo] -and $Xml.HasChildren()) {
+            foreach ($Node in $Xml.Children) {
+                Get-ChildNodes -Xml $Node
+            }
+        }
+    }
+
+    $AllNodes = Get-ChildNodes -Xml $Xml
+    if (
+        $AllNodes.Password -or
+        $AllNodes.RDGatewayPassword -or
+        $AllNodes.VNCProxyPassword
+    ) {
+        $Password = Read-Host -Message 'If you have password protected your ConfCons.xml please enter the password here otherwise just press enter' -AsSecureString
+    }
+    else {
+        $Password = [securestring]::new()
+    }
+    $CryptoProvider = [mRemoteNG.Security.SymmetricEncryption.AeadCryptographyProvider]::new()
+    $SaveFilter = [mRemoteNG.Security.SaveFilter]::new()
+    $ConnectionNodeSerializer = [mRemoteNG.Config.Serializers.Xml.XmlConnectionNodeSerializer26]::new($CryptoProvider, $Password, $SaveFilter)
+    $XmlSerializer = [mRemoteNG.Config.Serializers.Xml.XmlConnectionsSerializer]::new($CryptoProvider, $ConnectionNodeSerializer)
+
+    $RootNode = [mRemoteNG.Tree.Root.RootNodeInfo]::new('Connection')
+    foreach ($Node in $Xml) {
+        $RootNode.AddChild($Node)
+    }
+    $XmlSerializer.Serialize($RootNode)
 }
 
-$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-mRNGConnection {
+    [CmdletBinding(DefaultParameterSetName = 'Credential')]
+    Param (
+        [Parameter(Mandatory)]
+        [string]
+        $Name,
 
-function New-mRemoteNGXmlSerializer {
-    [CmdletBinding()]
-    param (
-        [SecureString]
-        $EncryptionKey
+        [Parameter(Mandatory)]
+        [string]
+        $Hostname,
+
+        [Parameter(Mandatory)]
+        [mRemoteNG.Connection.Protocol.ProtocolType]
+        $Protocol,
+
+        [Parameter(ParameterSetName = 'Credential')]
+        [pscredential]
+        $Credential,
+
+        [Parameter(ParameterSetName = 'InheritCredential')]
+        [switch]
+        $InheritCredential,
+
+        [Parameter()]
+        [mRemoteNG.Container.ContainerInfo]
+        $ParentContainer,
+
+        [Parameter()]
+        [switch]
+        $PassThru
     )
 
-    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
+    $Connection = [mRemoteNG.Connection.ConnectionInfo]@{
+        Name     = $Name
+        Hostname = $Hostname
+        Protocol = $Protocol
+    }
+
+    if ($Credential) {
+        $Connection.Username = $Credential.GetNetworkCredential().UserName
+        $Connection.Domain = $Credential.GetNetworkCredential().Domain
+        $Connection.Password = $Credential.GetNetworkCredential().Password
+    }
+
+    if ($InheritCredential) {
+        $Connection.Inheritance.Username = $true
+        $Connection.Inheritance.Domain = $true
+        $Connection.Inheritance.Password = $true
+    }
+
+    if ($ParentContainer) {
+        $ParentContainer.AddChild($Connection)
+
+        if ($PSBoundParameters.ContainsKey('PassThru')) {
+            $Connection
+        }
+    }
+    else {
+        $Connection
     }
 }
 
-function New-mRemoteNGConnectionInfo {
+function New-mRNGContainer {
+    [CmdletBinding(DefaultParameterSetName = 'Credential')]
+    Param (
+        [Parameter(Mandatory)]
+        [string]
+        $Name,
+
+        [Parameter(ParameterSetName = 'Credential')]
+        [pscredential]
+        $Credential,
+
+        [Parameter(ParameterSetName = 'InheritCredential')]
+        [switch]
+        $InheritCredential,
+
+        [Parameter()]
+        [mRemoteNG.Container.ContainerInfo]
+        $ParentContainer
+    )
+
+    $Container = [mRemoteNG.Container.ContainerInfo]@{
+        Name = $Name
+    }
+
+    if ($Credential) {
+        $Container.Username = $Credential.GetNetworkCredential().UserName
+        $Container.Domain = $Credential.GetNetworkCredential().Domain
+        $Container.Password = $Credential.GetNetworkCredential().Password
+    }
+
+    if ($InheritCredential) {
+        $Container.Inheritance.Username = $true
+        $Container.Inheritance.Domain = $true
+        $Container.Inheritance.Password = $true
+    }
+
+    if ($ParentContainer) {
+        $ParentContainer.AddChild($Container)
+    }
+    
+    $Container
+}
+
+function Export-mRNGXml {
     [CmdletBinding()]
-    param ()
+    param (
+        [Parameter()]
+        [string]
+        $Path,
 
-    PROCESS {
-        $connectionInfo = New-Object -TypeName mRemoteNG.Connection.ConnectionInfo
-        Write-Output $connectionInfo
-    }
+        [Parameter()]
+        [string]
+        $SerializedXml
+    )
+
+    $FilePathProvider = [mRemoteNG.Config.DataProviders.FileDataProvider]::new($Path)
+    $filePathProvider.Save($SerializedXml)
 }
 
-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
 
 
 
@@ -62,53 +210,85 @@ $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
+$Connections = foreach ($i in 1..5) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'Server-{0:D2}' -f $i
+        Hostname          = 'Server-{0:D2}' -f $i
+        Protocol          = 'RDP'
+        InheritCredential = $true
+    }
+    New-mRNGConnection @Splat
 }
 
-Write-Output $xml
+# Serialize the connections
+$SerializedXml = ConvertTo-mRNGSerializedXml -Xml $Connections
+
+# Write the XML to a file ready to import into mRemoteNG
+Export-mRNGXml -Path "$ENV:APPDATA\mRemoteNG\PowerShellGenerated.xml" -SerializedXml $SerializedXml
+
+# Now open up mRemoteNG and press Ctrl+O and open up the exported XML file
 
 
 
 
 #----------------------------------------------------------------
 # 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)
+# You can also create containers and add connections and containers to them, which will be nested correctly when serialized
+# If you specify the ParentContainer parameter for new connections then there will be no output unless the PassThru parameter is also used
 
-foreach($i in 1..3)
-{
-    $connectionInfo = New-mRemoteNGConnectionInfo
+$ProdServerCreds = Get-Credential
+$ProdServers = New-mRNGContainer -Name 'ProdServers' -Credential $ProdServerCreds
 
-    # 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)
+foreach ($i in 1..3) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'Server-{0:D2}' -f $i
+        Hostname          = 'Server-{0:D2}' -f $i
+        Protocol          = 'RDP'
+        InheritCredential = $true
+        ParentContainer   = $ProdServers
+    }
+    New-mRNGConnection @Splat
 }
 
-# Call ToString() on the top-level container to get the XML of it and all its children
-Write-Output $serializedContainer.ToString()
+$ProdWebServers = New-mRNGContainer -Name 'WebServers' -ParentContainer $ProdServers -InheritCredential
+
+foreach ($i in 1..3) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'WebServer-{0:D2}' -f $i
+        Hostname          = 'WebServer-{0:D2}' -f $i
+        Protocol          = 'SSH1'
+        InheritCredential = $true
+        ParentContainer   = $ProdWebServers
+    }
+    New-mRNGConnection @Splat
+}
+
+$DevServers = New-mRNGContainer -Name 'DevServers'
+
+foreach ($i in 1..3) {
+    # Create new connection
+    $Splat = @{
+        Name              = 'DevServer-{0:D2}' -f $i
+        Hostname          = 'DevServer-{0:D2}' -f $i
+        Protocol          = 'RDP'
+        InheritCredential = $true
+        ParentContainer   = $DevServers
+        PassThru          = $true
+    }
+
+    # Specified the PassThru parameter in order to catch the connection and change a property
+    $Connection = New-mRNGConnection @Splat
+    $Connection.Resolution = 'FullScreen'
+}
+
+# Serialize the container
+$SerializedXml = ConvertTo-mRNGSerializedXml -Xml $ProdServers, $DevServers
+
+# Write the XML to a file ready to import into mRemoteNG
+Export-mRNGXml -Path "$ENV:APPDATA\mRemoteNG\PowerShellGenerated.xml" -SerializedXml $SerializedXml
+
+# Now open up mRemoteNG and press Ctrl+O and open up the exported XML file

Tools/build-relport.cmd

@@ -1,45 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-
-set SOLUTIONDIR=%~dp0..
-
-rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
-set SIGCHECK="%SOLUTIONDIR%\Tools\exes\sigcheck.exe"
-set SEVENZIP="%SOLUTIONDIR%\Tools\7zip\7za.exe"
-
-set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
-call %VCVARSALL% x86
-
-IF NOT "%~1"=="build" goto skipbuild
-echo Building...
-"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" "%SOLUTIONDIR%\mRemoteV1.sln" /Rebuild "Release Portable"
-
-:skipbuild
-IF NOT EXIST "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe" echo Did you forget to build? && goto end
-set SIGCHECK=!SIGCHECK:"=^"!
-set SIGCHECK=!SIGCHECK: =^^ !
-set SIGCHECK=!SIGCHECK:(=^^(!
-set SIGCHECK=!SIGCHECK:)=^^)!
-for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe"`) do (
-   set PRODUCT_VERSION_SHORT=%%i.%%j
-   set PRODUCT_VERSION=%%i.%%j.%%k.%%l
-)
-echo Version is %PRODUCT_VERSION%
-
-set PORTABLEZIP="%SOLUTIONDIR%\Release\mRemoteNG-Portable-%PRODUCT_VERSION%.zip"
-
-rmdir /S /Q "%SOLUTIONDIR%\mRemoteV1\bin\package"
-mkdir "%SOLUTIONDIR%\mRemoteV1\bin\package"
-copy "%SOLUTIONDIR%\*.txt" "%SOLUTIONDIR%\mRemoteV1\bin\package"
-copy "%SOLUTIONDIR%\Installer Projects\Installer\Dependencies\PuTTYNG.exe" "%SOLUTIONDIR%\mRemoteV1\bin\package"
-
-xcopy /S /Y "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable" "%SOLUTIONDIR%\mRemoteV1\bin\package"
-
-echo Creating portable ZIP file...
-echo %PORTABLEZIP% 
-del /f /q %PORTABLEZIP% > nul 2>&1
-%SEVENZIP% a -bt -mx=9 -tzip -y -r %PORTABLEZIP% "%SOLUTIONDIR%\mRemoteV1\bin\package\*.*"
-%SEVENZIP% a -bt -mx=9 -tzip -y %PORTABLEZIP% "%SOLUTIONDIR%\*.TXT"
-
-:end

Tools/copy_puttyng.ps1

@@ -10,6 +10,6 @@ param (
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 Write-Output "Copying PUTTYNG to correct directory"
-Copy-Item -Path (Join-Path -Path $SolutionDir -ChildPath "mRemoteV1\Resources\PuTTYNG.exe") -Destination $TargetDir -Force
+Copy-Item -Path (Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\Resources\PuTTYNG.exe") -Destination $TargetDir -Force
 
 Write-Output ""

Tools/copy_themes.ps1

@@ -11,7 +11,7 @@ param (
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 Write-Output "Copying THEMES folder to output"
 
-$sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteV1\Resources\Themes' ) 
+$sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteNG\Resources\Themes' ) 
 $DestinationDir = [io.path]::combine($TargetDir , 'Themes') 
 
 robocopy $sourceFiles $DestinationDir *.vstheme /s

Tools/copy_tiles.ps1

@@ -0,0 +1,17 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+Write-Output "Copying TILES folder to output"
+
+$sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteNG\Resources\Tiles' ) 
+robocopy $sourceFiles $TargetDir *.*
+
+Write-Output ""

Tools/create_upg_chk_files.ps1

@@ -30,7 +30,7 @@ function New-MsiUpdateFileContent {
     $fileContents = `
 "Version: $version
 dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$TagName/$($MsiFile.Name)
-clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.TXT
+clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.md
 CertificateThumbprint: $certThumbprint
 Checksum: $hash"
     Write-Output $fileContents

Tools/move_help_files.ps1

@@ -1,23 +0,0 @@
-param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TargetDir
-)
-
-Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-$path_HelpFilesDir = Join-Path -Path $TargetDir -ChildPath "Help"
-
-Write-Output "Moving Help files to correct directory"
-
-# Remove stale Help files, if they exist
-if (Test-Path -Path $path_HelpFilesDir) {
-    Remove-Item -Path $path_HelpFilesDir -Recurse -Force
-}
-
-# Move Help files
-Move-Item -Path (Join-Path -Path $TargetDir -ChildPath "Resources\Help") -Destination $path_HelpFilesDir -Force
-Start-Sleep -Seconds 2
-Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "Resources") -Recurse -Force
-
-Write-Output ""

Tools/old/BUILD.CMD

@@ -1,149 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-
-set VERSIONTAG=
-
-set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
-set DEVENV="devenv.exe"
-set MAKENSIS="%ProgramFiles(x86)%\NSIS\Unicode\makensis.exe"
-set RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
-set SIGNCMD=signtool.exe sign /n "Astrospark Technologies, LLC" /sha1 "1cbd910dbd6e77f26506e7f600736972f700673f" /tr http://timestamp.comodoca.com/rfc3161
-
-rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
-set SIGCHECK="%ProgramFiles(x86)%\Sigcheck\sigcheck.exe"
-
-call %VCVARSALL% x86
-
-rmdir /s /q "%~dp0\mRemoteV1\bin" > nul 2>&1
-rmdir /s /q "%~dp0\mRemoteV1\obj" > nul 2>&1
-
-if exist "%~dp0\mRemoteV1\bin" goto ERROR_RMDIR
-if exist "%~dp0\mRemoteV1\obj" goto ERROR_RMDIR
-goto NOERROR_RMDIR
-
-:ERROR_RMDIR
-echo.
-echo Could not clean output directories.
-echo.
-echo Build process failed.
-echo.
-goto END
-
-:NOERROR_RMDIR
-
-echo Building release version...
-%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
-
-echo Building portable version...
-%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
-
-echo Signing binaries...
-%SIGNCMD% ^
-	"%~dp0\mRemoteV1\bin\Release\de\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\el\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\en-US\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\es\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\es-AR\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\fr\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\hu\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\it\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\nb-NO\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\nl\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\pl\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\pt\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\pt-BR\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\ru\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\uk\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\zh-CN\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\zh-TW\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\AxInterop.WFICALib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\Interop.MSTSCLib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\Interop.ShDocVw.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\Interop.WFICALib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\de\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\el\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\en-US\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\es\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\es-AR\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\fr\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\hu\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\it\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\nb-NO\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\nl\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\pl\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\pt\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\pt-BR\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\ru\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\uk\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\zh-CN\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\zh-TW\mRemoteNG.resources.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" ^
-	"%~dp0\mRemoteV1\bin\Release Portable\mRemoteNG.exe" ^
-
-
-rem Do not remove the two blank lines above this line.
-
-mkdir "%~dp0\Release" > nul 2>&1
-
-echo Getting product version...
-set VERSIONNSH="%~dp0\Release\Version.nsh"
-set SIGCHECK=!SIGCHECK:"=^"!
-set SIGCHECK=!SIGCHECK: =^^ !
-set SIGCHECK=!SIGCHECK:(=^^(!
-set SIGCHECK=!SIGCHECK:)=^^)!
-for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe"`) do (
-   set PRODUCT_VERSION_SHORT=%%i.%%j
-   echo ^^!define PRODUCT_VERSION "%%i.%%j.%%k.%%l" > %VERSIONNSH%
-   echo ^^!define PRODUCT_VERSION_SHORT "%%i.%%j" >> %VERSIONNSH%
-   echo ^^!define PRODUCT_VERSION_MAJOR "%%i" >> %VERSIONNSH%
-   echo ^^!define PRODUCT_VERSION_MINOR "%%j" >> %VERSIONNSH%
-)
-echo Version is %PRODUCT_VERSION_SHORT%
-
-echo Creating installer package...
-if defined VERSIONTAG (
-	%MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% "%~dp0\Installer\mRemote.nsi"
-
-	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.exe"
-	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
-	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
-) else (
-	%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
-
-	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%.exe"
-	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%.zip"
-	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%.zip"
-)
-
-del %VERSIONNSH%
-
-echo Signing installer package...
-%SIGNCMD% %INSTALLEREXE%
-
-echo Creating release ZIP file...
-del /f /q %BINARYZIP% > nul 2>&1
-%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
-%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep -afzip -inul %BINARYZIP% "%~dp0\*.TXT"
-
-echo Creating portable ZIP file...
-del /f /q %PORTABLEZIP% > nul 2>&1
-%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
-%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep -afzip -inul %PORTABLEZIP% "%~dp0\*.TXT"
-
-echo.
-echo Build process complete.
-echo.
-
-:END
-pause

Tools/old/Sort Language Files.cmd

@@ -1,26 +0,0 @@
-@echo off
-
-set TEMP_FOLDER="%TEMP%\Translations.tmp"
-set SORTRESX="%~dp0\Tools\SortRESX.exe"
-
-echo.
-echo This script sorts the language files
-echo.
-
-choice /m "Would you like to continue?"
-
-echo.
-
-rmdir /s /q %TEMP_FOLDER%
-mkdir %TEMP_FOLDER%
-copy "%~dp0\mRemoteV1\Language\*.resx" %TEMP_FOLDER%
-
-pushd %TEMP_FOLDER%
-for %%f in (*) do %SORTRESX% %TEMP_FOLDER%\%%f "%~dp0\mRemoteV1\Language\%%f"
-popd
-
-rmdir /s /q %TEMP_FOLDER%
-
-echo Done.
-echo.
-pause

Tools/old/Update Languages.cmd

@@ -1,55 +0,0 @@
-@echo off
-
-set ZIP_FILE="%~dp0\..\mremoteng.zip"
-set TEMP_FOLDER="%TEMP%\Translations.tmp"
-set SORTRESX="%~dp0\Tools\SortRESX.exe"
-set RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
-
-call :expand %ZIP_FILE%
-goto :skip
-:expand
-set ZIP_FILE="%~f1"
-exit /b
-:skip
-
-echo.
-echo This script updates the language files with new translations from Crowdin
-echo.
-echo Download the latest translation file from Crowdin and place it here:
-echo.
-echo %ZIP_FILE%
-echo.
-
-choice /m "Would you like to continue?"
-
-echo.
-
-mkdir %TEMP_FOLDER%
-%RAR% x -o+ %ZIP_FILE% *.* %TEMP_FOLDER%
-
-%SORTRESX% %TEMP_FOLDER%\ar\Language.ar.resx "%~dp0\mRemoteV1\Language\Language.ar.resx"
-%SORTRESX% %TEMP_FOLDER%\bg\Language.bg.resx "%~dp0\mRemoteV1\Language\Language.bg.resx"
-%SORTRESX% %TEMP_FOLDER%\de\Language.de.resx "%~dp0\mRemoteV1\Language\Language.de.resx"
-%SORTRESX% %TEMP_FOLDER%\el\Language.el.resx "%~dp0\mRemoteV1\Language\Language.el.resx"
-%SORTRESX% %TEMP_FOLDER%\en-US\Language.en.resx "%~dp0\mRemoteV1\Language\Language.en-US.resx"
-%SORTRESX% %TEMP_FOLDER%\es-AR\Language.es.resx "%~dp0\mRemoteV1\Language\Language.es-AR.resx"
-%SORTRESX% %TEMP_FOLDER%\es-ES\Language.es.resx "%~dp0\mRemoteV1\Language\Language.es.resx"
-%SORTRESX% %TEMP_FOLDER%\fr\Language.fr.resx "%~dp0\mRemoteV1\Language\Language.fr.resx"
-%SORTRESX% %TEMP_FOLDER%\he\Language.he.resx "%~dp0\mRemoteV1\Language\Language.he.resx"
-%SORTRESX% %TEMP_FOLDER%\hu\Language.hu.resx "%~dp0\mRemoteV1\Language\Language.hu.resx"
-%SORTRESX% %TEMP_FOLDER%\it\Language.it.resx "%~dp0\mRemoteV1\Language\Language.it.resx"
-%SORTRESX% %TEMP_FOLDER%\nb\Language.nb.resx "%~dp0\mRemoteV1\Language\Language.nb-NO.resx"
-%SORTRESX% %TEMP_FOLDER%\nl\Language.nl.resx "%~dp0\mRemoteV1\Language\Language.nl.resx"
-%SORTRESX% %TEMP_FOLDER%\pl\Language.pl.resx "%~dp0\mRemoteV1\Language\Language.pl.resx"
-%SORTRESX% %TEMP_FOLDER%\pt-BR\Language.pt.resx "%~dp0\mRemoteV1\Language\Language.pt-BR.resx"
-%SORTRESX% %TEMP_FOLDER%\pt-PT\Language.pt.resx "%~dp0\mRemoteV1\Language\Language.pt.resx"
-%SORTRESX% %TEMP_FOLDER%\ru\Language.ru.resx "%~dp0\mRemoteV1\Language\Language.ru.resx"
-%SORTRESX% %TEMP_FOLDER%\uk\Language.uk.resx "%~dp0\mRemoteV1\Language\Language.uk.resx"
-%SORTRESX% %TEMP_FOLDER%\zh-CN\Language.zh.resx "%~dp0\mRemoteV1\Language\Language.zh-CN.resx"
-%SORTRESX% %TEMP_FOLDER%\zh-TW\Language.zh.resx "%~dp0\mRemoteV1\Language\Language.zh-TW.resx"
-
-rmdir /s /q %TEMP_FOLDER%
-
-echo Done.
-echo.
-pause

Tools/postbuild_installer.ps1

@@ -33,11 +33,12 @@ Format-Table -AutoSize -Wrap -InputObject @{
     "TargetDir" = $TargetDir
     "TargetFileName" = $TargetFileName
     "ConfigurationName" = $ConfigurationName
+    "CertificatePath" = $CertificatePath
     "ExcludeFromSigning" = $ExcludeFromSigning
 }
 
 
-& "$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\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
 & "$PSScriptRoot\rename_installer_with_version.ps1" -SolutionDir $SolutionDir
 & "$PSScriptRoot\copy_release_installer.ps1" -SourcePath $TargetDir -DestinationDir (Join-Path -Path $SolutionDir -ChildPath "Release")

Tools/postbuild_mremoteng.ps1

@@ -26,13 +26,14 @@ param (
 )
 
 Write-Output "+=================================================================+"
-Write-Output "|                  Beginning mRemoteV1 Post Build                 |"
+Write-Output "|                  Beginning mRemoteNG Post Build                 |"
 Write-Output "+=================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
     "TargetDir" = $TargetDir
     "TargetFileName" = $TargetFileName
     "ConfigurationName" = $ConfigurationName
+    "CertificatePath" = $CertificatePath
     "ExcludeFromSigning" = $ExcludeFromSigning
 }
 
@@ -40,11 +41,12 @@ Format-Table -AutoSize -Wrap -InputObject @{
 
 & "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\copy_themes.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
-& "$PSScriptRoot\move_help_files.ps1" -TargetDir $TargetDir
+& "$PSScriptRoot\copy_tiles.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
+& "$PSScriptRoot\sphinx_docs.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$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\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
 & "$PSScriptRoot\zip_symbols.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/rename_installer_with_version.ps1

@@ -8,7 +8,7 @@ $renameTarget = $SolutionDir + "InstallerProjects\Installer\bin\Release\en-US\mR
 Write-Host $SolutionDir
 Write-Host $renameTarget
 
-$targetVersionedFile = "$SolutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
+$targetVersionedFile = "$SolutionDir\mRemoteNG\bin\Release\mRemoteNG.exe"
 $version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
 
 

Tools/sign_binaries.ps1

@@ -12,12 +12,16 @@ param (
     $Exclude,
 
     [string]
+    [AllowEmptyString()]
     # The code signing certificate to use when signing the files.
     $CertificatePath,
 
     [string]
     # Password to unlock the code signing certificate.
-    $CertificatePassword
+    $CertificatePassword,
+    
+    [string]
+    $SolutionDir
 )
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
@@ -26,51 +30,59 @@ Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 $timeserver = "http://timestamp.verisign.com/scripts/timstamp.dll"
 
 
-if ($ConfigurationName -notmatch "Release") {
-    Write-Output "This is not a release build - we won't sign files."
-    return
-}
+#  validate release versions and if the certificate value was passed
+if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
 
-if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf)) {
-    Write-Output "Certificate is not present - we won't sign files."
-    return
-}
+	if(-Not ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) {
+		$CertificatePath = Join-Path -Path $SolutionDir -ChildPath $CertificatePath
+	}
 
-if ($CertificatePassword -eq "") {
-    Write-Output "No certificate password was provided - we won't sign files."
-    return
-}
+	# make sure the cert is actually available
+	if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf))
+	{
+	    Write-Output "Certificate is not present - we won't sign files."
+	    return
+	}
 
-try {
-    $certKeyStore = [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeySet
-    $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($CertificatePath, $CertificatePassword, $certKeyStore) -ErrorAction Stop
-} catch {
-    Write-Output "Error loading certificate file - we won't sign files."
-    Write-Output $Error[0]
-    return
-}
+	if ($CertificatePassword -eq "") {
+	    Write-Output "No certificate password was provided - we won't sign files."
+	    return
+	}
 
-# Sign MSI if we are building a release version and the certificate is available
-Write-Output "Signing Binaries"
-Write-Output "Getting files from path: $TargetDir"
-$signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -notcontains $_.Name}
+	try {
+	    $certKeyStore = [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeySet
+	    $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($CertificatePath, $CertificatePassword, $certKeyStore) -ErrorAction Stop
+	} catch {
+	    Write-Output "Error loading certificate file - we won't sign files."
+	    Write-Output $Error[0]
+	    return
+	}
 
-$excluded_files = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -contains $_.Name}
-$excluded_files | ForEach-Object `
-    -Begin { Write-Output "The following files were excluded from signing due to being on the exclusion list:" } `
-    -Process { Write-Output "-- $($_.FullName)" }
+	# Sign MSI if we are building a release version and the certificate is available
+	Write-Output "Signing Binaries"
+	Write-Output "Getting files from path: $TargetDir"
+	$signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -notcontains $_.Name}
 
-Write-Output "Signable files count: $($signableFiles.Count)"
+	$excluded_files = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"} | ?{$Exclude -contains $_.Name}
+	$excluded_files | ForEach-Object `
+	    -Begin { Write-Output "The following files were excluded from signing due to being on the exclusion list:" } `
+	    -Process { Write-Output "-- $($_.FullName)" }
+
+	Write-Output "Signable files count: $($signableFiles.Count)"
 
 
-foreach ($file in $signableFiles) {
-    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
-}
+	foreach ($file in $signableFiles) {
+	    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
+	}
 
 
-# Release certificate
-if ($cert -ne $null) {
-    $cert.Dispose()
+	# Release certificate
+	if ($cert -ne $null) {
+	    $cert.Dispose()
+	}
+} else {
+    Write-Output "This is not a release build or CertificatePath wasn't provided - we won't sign files."
+    Write-Output "Config: $($ConfigurationName)`tCertPath: $($CertificatePath)"
 }
 
 Write-Output ""

Tools/sphinx_docs.ps1

@@ -0,0 +1,33 @@
+param (	
+	[string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+	
+	[string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+Write-Output "Building HTML-Documentation with Sphinx"
+
+$path_HelpFilesDir = Join-Path -Path $TargetDir -ChildPath "Help"
+$path_SphinxSourceDir = Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\Documentation"
+
+# Remove stale Help files, if they exist
+if (Test-Path -Path $path_HelpFilesDir) {
+    Remove-Item -Path $path_HelpFilesDir -Recurse -Force
+}
+
+# Build docs
+sphinx-build $path_SphinxSourceDir $path_HelpFilesDir
+
+# Place dummy html file if build failed
+if (-Not (Test-Path $path_HelpFilesDir\index.html -PathType Leaf)) {
+    New-Item -Path $path_HelpFilesDir -ItemType "directory"
+    New-Item $path_HelpFilesDir\index.html
+    Set-Content $path_HelpFilesDir\index.html 'Welcome to mRemoteNG!'
+} 
+
+Write-Output ""

Tools/tidy_files_for_release.ps1

@@ -13,7 +13,12 @@ Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 # Remove unnecessary files from Release versions
 if ($ConfigurationName -match "Release") {
     Write-Output "Removing unnecessary files from Release versions"
-    Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
+
+    $test = Join-Path -Path $TargetDir -ChildPath "app.publish"
+    if (Test-Path  $test -PathType Container) {
+        Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
+    }
+
     $filesToDelete = Get-ChildItem -Path $TargetDir -Recurse -Include @(
         "*.publish",
         "*.xml",
@@ -21,7 +26,9 @@ if ($ConfigurationName -match "Release") {
         "*.log",
         "*vshost*",
         "*.tmp"
-    )
+    ) -Exclude @(
+        "mRemoteNG.VisualElementsManifest.xml"
+	)
     Remove-Item -Path $filesToDelete.FullName
     Write-Output $filesToDelete.FullName
 }

Tools/verify_binary_signatures.ps1

@@ -9,15 +9,25 @@ param (
     
     [string]
     [Parameter(Mandatory=$true)]
+    [AllowEmptyString()]
     # The code signing certificate to use when signing the files.
-    $CertificatePath
+    $CertificatePath,
+    
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir
 )
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 
-#  validate release versions and if the certificate is available
-if ($ConfigurationName -match "Release") {
+#  validate release versions and if the certificate value was passed
+if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
 	
+	if(-Not ([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) ) {
+		$CertificatePath = Join-Path -Path $SolutionDir -ChildPath $CertificatePath
+	}
+	
+	# make sure the cert is actually available
 	if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf))
 	{
 	    Write-Output "Certificate is not present - files likely not signed - we won't verify file signatures."
@@ -42,7 +52,8 @@ if ($ConfigurationName -match "Release") {
         Write-Output "All files have valid signatures."
     }
 } else {
-    Write-Output "This is not a release build - we won't verify file signatures."
+    Write-Output "This is not a release build or CertificatePath wasn't provided - we won't verify file signatures."
+    Write-Output "Config: $($ConfigurationName)`tCertPath: $($CertificatePath)"
 }
 
 Write-Output ""

Tools/zip_portable_files.ps1

@@ -33,21 +33,21 @@ $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"
+    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteNG\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"
+    $tempFolderPath = Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\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
+    Copy-Item "$($SolutionDir)mRemoteNG\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
+    #Write-Output "$($SolutionDir)mRemoteNG\bin\$ConfigurationName" 
+    #Write-Output "$($SolutionDir)mRemoteNG\bin\package"
+    Copy-Item "$($SolutionDir)mRemoteNG\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

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

@@ -33,7 +33,7 @@ $SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
 if ($ConfigurationName -match "Release") {
     Write-Output "Packaging debug symbols"
    
-    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
+    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteNG\bin\$($ConfigurationName)\mRemoteNG.exe"
 
     Write-Output "Version is $($version)"
 

appveyor.yml

@@ -1,28 +0,0 @@
-version: 1.76.{build}
-pull_requests:
-  do_not_increment_build_number: true
-image: Visual Studio 2017
-configuration:
-- Release
-- Release Portable
-- Release Installer
-platform: x86
-clone_depth: 1
-install:
-- ps: C:\projects\mremoteng\mRemoteV1\Resources\CitrixReceiver.exe DONOTSTARTCC=1 ENABLE_SSON="No" /silent | out-null
-before_build:
-- cmd: nuget restore
-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

mRemoteNG.Specs/App.config

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
-  </configSections>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.16.0.0" newVersion="2.16.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
-  </startup>
-  <specFlow>
-    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
-    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
-    <unitTestProvider name="NUnit" />
-  </specFlow>
-</configuration>

mRemoteNG.Specs/mRemoteNG.Specs.csproj

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>mRemoteNG.Specs</RootNamespace>
-    <AssemblyName>mRemoteNG.Specs</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TechTalk.SpecFlow, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.2.2.1\lib\net45\TechTalk.SpecFlow.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Features\CredentialRepository.feature.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>CredentialRepository.feature</DependentUpon>
-    </Compile>
-    <Compile Include="Features\CredentialRepositoryList.feature.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>CredentialRepositoryList.feature</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StepDefinitions\CredentialRepositoryListSteps.cs" />
-    <Compile Include="StepDefinitions\CredentialRepositorySteps.cs" />
-    <Compile Include="Utilities\CredRepoXmlFileBuilder.cs" />
-    <Compile Include="Utilities\XmlCredentialRepoBuilder.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="Features\CredentialRepository.feature">
-      <Generator>SpecFlowSingleFileGenerator</Generator>
-      <LastGenOutput>CredentialRepository.feature.cs</LastGenOutput>
-    </None>
-    <None Include="Features\CredentialRepositoryList.feature">
-      <Generator>SpecFlowSingleFileGenerator</Generator>
-      <LastGenOutput>CredentialRepositoryList.feature.cs</LastGenOutput>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\mRemoteV1\mRemoteV1.csproj">
-      <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
-      <Name>mRemoteV1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

mRemoteNG.Specs/packages.config

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
-  <package id="NUnit" version="3.9.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.7.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net46" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net46" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.3" targetFramework="net46" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.7.0" targetFramework="net46" />
-  <package id="NUnit.Runners" version="3.7.0" targetFramework="net46" />
-  <package id="SpecFlow" version="2.2.1" targetFramework="net46" />
-  <package id="SpecFlow.NUnit" version="2.2.1" targetFramework="net46" />
-  <package id="SpecFlow.NUnit.Runners" version="2.2.1" targetFramework="net46" />
-</packages>

mRemoteNG.sln

@@ -1,22 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 14.0.25420.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteV1", "mRemoteV1\mRemoteV1.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InstallerProjects", "InstallerProjects", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mRemoteNGInstaller", "mRemoteNGInstaller", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomActions", "InstallerProjects\CustomActions\CustomActions.csproj", "{5423D985-CB48-4344-B47F-E8C6D60C8B04}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomActions", "mRemoteNGInstaller\CustomActions\CustomActions.csproj", "{5423D985-CB48-4344-B47F-E8C6D60C8B04}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "InstallerProjects\Installer\Installer.wixproj", "{F0168B9F-6815-40DF-BA53-46CEE7683B68}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "mRemoteNGInstaller\Installer\Installer.wixproj", "{F0168B9F-6815-40DF-BA53-46CEE7683B68}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04} = {5423D985-CB48-4344-B47F-E8C6D60C8B04}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNG.Specs", "mRemoteNG.Specs\mRemoteNG.Specs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -73,6 +73,7 @@ Global
 		{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.Build.0 = Debug|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
@@ -87,6 +88,7 @@ Global
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x86.ActiveCfg = Release|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
 		{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
@@ -98,25 +100,24 @@ Global
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x86.ActiveCfg = Release Portable|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.ActiveCfg = Release|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.ActiveCfg = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.Build.0 = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.Build.0 = Release|Any CPU
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.ActiveCfg = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.Build.0 = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.Build.0 = Debug|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.Build.0 = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

mRemoteNG/.editorconfig

@@ -0,0 +1,53 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = crlf
+indent_style = space
+
+[*.xml]
+indent_size = 4
+
+[*.cs]
+indent_size = 4
+trim_trailing_whitespace = true
+charset = utf-8-bom
+
+# reStructuredText
+[*.rst]
+charset = utf-8
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 3
+max_line_length = 120
+
+# Organize usings
+dotnet_sort_system_directives_first = true
+
+# this. preferences
+dotnet_style_qualification_for_field = false:none
+dotnet_style_qualification_for_property = false:none
+dotnet_style_qualification_for_method = false:none
+dotnet_style_qualification_for_event = false:none
+
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false

mRemoteNG/App/CompatibilityChecker.cs

@@ -1,11 +1,13 @@
-using Microsoft.Win32;
-using mRemoteNG.App.Info;
-using mRemoteNG.UI.Forms;
-using mRemoteNG.UI.TaskDialog;
-using System;
+using System;
 using System.Diagnostics;
 using System.Windows.Forms;
+using Microsoft.Win32;
+using mRemoteNG.App.Info;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.TaskDialog;
 
 namespace mRemoteNG.App
 {
@@ -21,17 +23,28 @@ namespace mRemoteNG.App
         {
             if (Settings.Default.OverrideFIPSCheck)
             {
-                messageCollector.AddMessage(MessageClass.InformationMsg, "OverrideFIPSCheck is set. Will skip check...", true);
+                messageCollector.AddMessage(MessageClass.InformationMsg, "OverrideFIPSCheck is set. Will skip check", true);
                 return;
             }
 
-            messageCollector.AddMessage(MessageClass.InformationMsg, "Checking FIPS Policy...", true);
+            messageCollector.AddMessage(MessageClass.InformationMsg, "Checking FIPS policy...", true);
+            messageCollector.AddMessage(MessageClass.InformationMsg, $"FIPS2003: {FipsPolicyEnabledForServer2003()}", true);
+            messageCollector.AddMessage(MessageClass.InformationMsg, $"FIPS2008+: {FipsPolicyEnabledForServer2008AndNewer()}", true);
+
             if (!FipsPolicyEnabledForServer2003() && !FipsPolicyEnabledForServer2008AndNewer()) return;
 
-            var errorText = string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
+            var errorText = string.Format(Language.ErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
             messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);
 
-            var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, errorText, "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.OkCancel, ESysIcons.Warning, ESysIcons.Warning);
+            //About to pop up a message, let's not block it...
+            FrmSplashScreen.getInstance().Close();
+
+            var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName,
+                                                                Language.CompatibilityProblemDetected, errorText, "",
+                                                                "",
+                                                                Language.CheckboxDoNotShowThisMessageAgain,
+                                                                ETaskDialogButtons.OkCancel, ESysIcons.Warning,
+                                                                ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked && ShouldIStayOrShouldIGo == DialogResult.OK)
             {
                 messageCollector.AddMessage(MessageClass.ErrorMsg, "User requests that FIPS check be overridden", true);
@@ -46,20 +59,18 @@ namespace mRemoteNG.App
 
         private static bool FipsPolicyEnabledForServer2003()
         {
-            var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa");
-            var fipsPolicy = regKey?.GetValue("FIPSAlgorithmPolicy");
-            if (fipsPolicy == null) return false;
-            fipsPolicy = Convert.ToInt32(fipsPolicy);
-            return (int)fipsPolicy != 0;
+            var regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa");
+            if (!(regKey?.GetValue("FIPSAlgorithmPolicy") is int fipsPolicy))
+                return false;
+            return fipsPolicy != 0;
         }
 
         private static bool FipsPolicyEnabledForServer2008AndNewer()
         {
-            var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy");
-            var fipsPolicy = regKey?.GetValue("Enabled");
-            if (fipsPolicy == null) return false;
-            fipsPolicy = Convert.ToInt32(fipsPolicy);
-            return (int)fipsPolicy != 0;
+            var regKey = Registry.LocalMachine.OpenSubKey(@"System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy");
+            if (!(regKey?.GetValue("Enabled") is int fipsPolicy))
+                return false;
+            return fipsPolicy != 0;
         }
 
         private static void CheckLenovoAutoScrollUtility(MessageCollector messageCollector)
@@ -79,10 +90,22 @@ namespace mRemoteNG.App
                 messageCollector.AddExceptionMessage("Error in CheckLenovoAutoScrollUtility", ex);
             }
 
-            if (proccesses.Length <= 0) return;
-            CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected, Application.ProductName), "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok, ESysIcons.Warning, ESysIcons.Warning);
+            if (proccesses.Length <= 0)
+            {
+                messageCollector.AddMessage(MessageClass.InformationMsg, "Lenovo AutoScroll Utility not found", true);
+                return;
+            }
+
+            messageCollector.AddMessage(MessageClass.WarningMsg, "Lenovo AutoScroll Utility found", true);
+
+            CTaskDialog.MessageBox(Application.ProductName, Language.CompatibilityProblemDetected,
+                                   string.Format(Language.CompatibilityLenovoAutoScrollUtilityDetected,
+                                                 Application.ProductName), "",
+                                   "", Language.CheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok,
+                                   ESysIcons.Warning,
+                                   ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked)
                 Settings.Default.CompatibilityWarnLenovoAutoScrollUtility = false;
         }
     }
-}
+}

mRemoteNG/App/Export.cs

@@ -0,0 +1,117 @@
+using System;
+using System.Linq;
+using System.Windows.Forms;
+using mRemoteNG.Config.Connections;
+using mRemoteNG.Config.DataProviders;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Security.Factories;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using mRemoteNG.UI.Forms;
+
+
+namespace mRemoteNG.App
+{
+    public static class Export
+    {
+        public static void ExportToFile(ConnectionInfo selectedNode, ConnectionTreeModel connectionTreeModel)
+        {
+            try
+            {
+                var saveFilter = new SaveFilter();
+
+                using (var exportForm = new FrmExport())
+                {
+                    if (selectedNode?.GetTreeNodeType() == TreeNodeType.Container)
+                        exportForm.SelectedFolder = selectedNode as ContainerInfo;
+                    else if (selectedNode?.GetTreeNodeType() == TreeNodeType.Connection)
+                    {
+                        if (selectedNode.Parent.GetTreeNodeType() == TreeNodeType.Container)
+                            exportForm.SelectedFolder = selectedNode.Parent;
+                        exportForm.SelectedConnection = selectedNode;
+                    }
+
+                    if (exportForm.ShowDialog(FrmMain.Default) != DialogResult.OK)
+                        return;
+
+                    ConnectionInfo exportTarget;
+                    switch (exportForm.Scope)
+                    {
+                        case FrmExport.ExportScope.SelectedFolder:
+                            exportTarget = exportForm.SelectedFolder;
+                            break;
+                        case FrmExport.ExportScope.SelectedConnection:
+                            exportTarget = exportForm.SelectedConnection;
+                            break;
+                        default:
+                            exportTarget = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
+                            break;
+                    }
+
+                    saveFilter.SaveUsername = exportForm.IncludeUsername;
+                    saveFilter.SavePassword = exportForm.IncludePassword;
+                    saveFilter.SaveDomain = exportForm.IncludeDomain;
+                    saveFilter.SaveInheritance = exportForm.IncludeInheritance;
+                    saveFilter.SaveCredentialId = exportForm.IncludeAssignedCredential;
+
+                    SaveExportFile(exportForm.FileName, exportForm.SaveFormat, saveFilter, exportTarget);
+                }
+            }
+            catch (Exception ex)
+            {
+                Runtime.MessageCollector.AddExceptionMessage("App.Export.ExportToFile() failed.", ex);
+            }
+        }
+
+        private static void SaveExportFile(string fileName,
+                                           SaveFormat saveFormat,
+                                           SaveFilter saveFilter,
+                                           ConnectionInfo exportTarget)
+        {
+            try
+            {
+                ISerializer<ConnectionInfo, string> serializer;
+                switch (saveFormat)
+                {
+                    case SaveFormat.mRXML:
+                        var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
+                        var rootNode = exportTarget.GetRootParent() as RootNodeInfo;
+                        var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+                                                                                         cryptographyProvider,
+                                                                                         rootNode?.PasswordString
+                                                                                                 .ConvertToSecureString() ??
+                                                                                         new RootNodeInfo(RootNodeType
+                                                                                                              .Connection)
+                                                                                             .PasswordString
+                                                                                             .ConvertToSecureString(),
+                                                                                         saveFilter);
+                        serializer = new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer);
+                        break;
+                    case SaveFormat.mRCSV:
+                        serializer =
+                            new CsvConnectionsSerializerMremotengFormat(saveFilter, Runtime.CredentialProviderCatalog);
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(saveFormat), saveFormat, null);
+                }
+
+                var serializedData = serializer.Serialize(exportTarget);
+                var fileDataProvider = new FileDataProvider(fileName);
+                fileDataProvider.Save(serializedData);
+            }
+            catch (Exception ex)
+            {
+                Runtime.MessageCollector.AddExceptionStackTrace($"Export.SaveExportFile(\"{fileName}\") failed.", ex);
+            }
+            finally
+            {
+                Runtime.ConnectionsService.RemoteConnectionsSyncronizer?.Enable();
+            }
+        }
+    }
+}

mRemoteNG/App/Import.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
@@ -6,6 +6,7 @@ using mRemoteNG.Config.Import;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Tools;
 
 namespace mRemoteNG.App
@@ -23,13 +24,13 @@ namespace mRemoteNG.App
                     openFileDialog.Multiselect = true;
 
                     var fileTypes = new List<string>();
-                    fileTypes.AddRange(new[] {Language.strFilterAllImportable, "*.xml;*.rdp;*.rdg;*.dat;*.csv"});
-                    fileTypes.AddRange(new[] {Language.strFiltermRemoteXML, "*.xml"});
-                    fileTypes.AddRange(new[] {Language.strFiltermRemoteCSV, "*.csv"});
-                    fileTypes.AddRange(new[] {Language.strFilterRDP, "*.rdp"});
-                    fileTypes.AddRange(new[] {Language.strFilterRdgFiles, "*.rdg"});
-                    fileTypes.AddRange(new[] {Language.strFilterPuttyConnectionManager, "*.dat"});
-                    fileTypes.AddRange(new[] {Language.strFilterAll, "*.*"});
+                    fileTypes.AddRange(new[] {Language.FilterAllImportable, "*.xml;*.rdp;*.rdg;*.dat;*.csv"});
+                    fileTypes.AddRange(new[] {Language.FiltermRemoteXML, "*.xml"});
+                    fileTypes.AddRange(new[] {Language.FiltermRemoteCSV, "*.csv"});
+                    fileTypes.AddRange(new[] {Language.FilterRDP, "*.rdp"});
+                    fileTypes.AddRange(new[] {Language.FilterRdgFiles, "*.rdg"});
+                    fileTypes.AddRange(new[] {Language.FilterPuttyConnectionManager, "*.dat"});
+                    fileTypes.AddRange(new[] {Language.FilterAll, "*.*"});
 
                     openFileDialog.Filter = string.Join("|", fileTypes.ToArray());
 
@@ -40,7 +41,7 @@ namespace mRemoteNG.App
 						openFileDialog.FileNames, 
 						importDestinationContainer, 
 						Runtime.ConnectionsService,
-						fileName => MessageBox.Show(string.Format(Language.strImportFileFailedContent, fileName), Language.strImportFileFailedMainInstruction,
+						fileName => MessageBox.Show(string.Format(Language.ImportFileFailedContent, fileName), Language.AskUpdatesMainInstruction,
 							MessageBoxButtons.OK, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1));
                 }
             }
@@ -74,7 +75,9 @@ namespace mRemoteNG.App
 	        }
 		}
 
-        public static void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOu)
+        public static void ImportFromActiveDirectory(string ldapPath,
+                                                     ContainerInfo importDestinationContainer,
+                                                     bool importSubOu)
         {
             try
             {
@@ -89,7 +92,9 @@ namespace mRemoteNG.App
             }
         }
 
-        public static void ImportFromPortScan(IEnumerable<ScanHost> hosts, ProtocolType protocol, ContainerInfo importDestinationContainer)
+        public static void ImportFromPortScan(IEnumerable<ScanHost> hosts,
+                                              ProtocolType protocol,
+                                              ContainerInfo importDestinationContainer)
         {
             try
             {

mRemoteNG/App/Info/ConnectionsFileInfo.cs

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

mRemoteNG/App/Info/GeneralAppInfo.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using System.Windows.Forms;
+using static System.Environment;
+
+
+namespace mRemoteNG.App.Info
+{
+    public static class GeneralAppInfo
+    {
+        public const string UrlHome = "https://www.mremoteng.org";
+        public const string UrlDonate = "https://mremoteng.org/contribute";
+        public const string UrlForum = "https://www.reddit.com/r/mRemoteNG";
+        public const string UrlBugs = "https://bugs.mremoteng.org";
+        public static string ApplicationVersion = Application.ProductVersion;
+        public static readonly string ProductName = Application.ProductName;
+
+        public static readonly string Copyright =
+            ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(),
+                                                                      typeof(AssemblyCopyrightAttribute), false))
+            .Copyright;
+
+        public static readonly string HomePath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+
+        //public static string ReportingFilePath = "";
+        public static readonly string PuttyPath = HomePath + "\\PuTTYNG.exe";
+
+        public static string UserAgent
+        {
+            get
+            {
+                var details = new List<string>
+                {
+                    "compatible",
+                    OSVersion.Platform == PlatformID.Win32NT
+                        ? $"Windows NT {OSVersion.Version.Major}.{OSVersion.Version.Minor}"
+                        : OSVersion.VersionString
+                };
+                if (Is64BitProcess)
+                {
+                    details.Add("WOW64");
+                }
+
+                details.Add(Thread.CurrentThread.CurrentUICulture.Name);
+                details.Add($".NET CLR {Environment.Version}");
+                var detailsString = string.Join("; ", details.ToArray());
+
+                return $"Mozilla/5.0 ({detailsString}) {ProductName}/{ApplicationVersion}";
+            }
+        }
+
+        public static Version GetApplicationVersion()
+        {
+            System.Version.TryParse(ApplicationVersion, out var v);
+            return v;
+        }
+    }
+}

mRemoteNG/App/Info/SettingsFileInfo.cs

@@ -0,0 +1,29 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using mRemoteNG.Connection;
+
+namespace mRemoteNG.App.Info
+{
+    public static class SettingsFileInfo
+    {
+        private static readonly string ExePath =
+            Path.GetDirectoryName(Assembly.GetAssembly(typeof(ConnectionInfo))?.Location);
+
+        public static string SettingsPath =>
+            Runtime.IsPortableEdition
+                ? ExePath
+                : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName;
+
+        public static string LayoutFileName { get; } = "pnlLayout.xml";
+        public static string ExtAppsFilesName { get; } = "extApps.xml";
+        public static string ThemesFileName { get; } = "Themes.xml";
+
+        public static string ThemeFolder { get; } =
+            SettingsPath != null ? Path.Combine(SettingsPath, "Themes") : String.Empty;
+
+        public static string InstalledThemeFolder { get; } =
+            ExePath != null ? Path.Combine(ExePath, "Themes") : String.Empty;
+    }
+}

mRemoteNG/App/Info/UpdateChannelInfo.cs

@@ -1,4 +1,6 @@
 using System;
+using mRemoteNG.Properties;
+
 // ReSharper disable InconsistentNaming
 
 namespace mRemoteNG.App.Info
@@ -27,7 +29,9 @@ namespace mRemoteNG.App.Info
 
         private static string GetChannelFileName(string channel)
         {
-            return Runtime.IsPortableEdition ? GetChannelFileNamePortableEdition(channel) : GetChannelFileNameNormalEdition(channel);
+            return Runtime.IsPortableEdition
+                ? GetChannelFileNamePortableEdition(channel)
+                : GetChannelFileNameNormalEdition(channel);
         }
 
         private static string GetChannelFileNameNormalEdition(string channel)
@@ -62,7 +66,8 @@ namespace mRemoteNG.App.Info
 
         private static Uri GetUpdateTxtUri(string channel)
         {
-            return new Uri(new Uri(Settings.Default.UpdateAddress), new Uri(GetChannelFileName(channel), UriKind.Relative));
+            return new Uri(new Uri(Settings.Default.UpdateAddress),
+                           new Uri(GetChannelFileName(channel), UriKind.Relative));
         }
 
         private static bool IsValidChannel(string s)

mRemoteNG/App/Initialization/ConnectionIconLoader.cs

@@ -11,7 +11,7 @@ namespace mRemoteNG.App.Initialization
 
         public ConnectionIconLoader(string folderPath)
         {
-            if(string.IsNullOrEmpty(folderPath))
+            if (string.IsNullOrEmpty(folderPath))
                 throw new ArgumentException($"{nameof(folderPath)} must be a valid folder path.");
 
             _path = folderPath;

mRemoteNG/App/Initialization/CredsAndConsSetup.cs

@@ -1,16 +1,19 @@
 using System.IO;
 using mRemoteNG.Config.Connections;
+using mRemoteNG.Properties;
 
 namespace mRemoteNG.App.Initialization
 {
-	public class CredsAndConsSetup
+    public class CredsAndConsSetup
     {
         public void LoadCredsAndCons()
         {
             new SaveConnectionsOnEdit(Runtime.ConnectionsService);
 
-            if (Settings.Default.FirstStart && !Settings.Default.LoadConsFromCustomLocation && !File.Exists(Runtime.ConnectionsService.GetStartupConnectionFileName()))
-                Runtime.ConnectionsService.NewConnectionsFile(Runtime.ConnectionsService.GetStartupConnectionFileName());
+            if (Settings.Default.FirstStart && !Settings.Default.LoadConsFromCustomLocation &&
+                !File.Exists(Runtime.ConnectionsService.GetStartupConnectionFileName()))
+                Runtime.ConnectionsService.NewConnectionsFile(Runtime.ConnectionsService
+                                                                     .GetStartupConnectionFileName());
 
             Runtime.LoadConnections();
         }

mRemoteNG/App/Initialization/MessageCollectorSetup.cs

@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+using System.Linq;
+using mRemoteNG.Messages;
+using mRemoteNG.Messages.MessageFilteringOptions;
+using mRemoteNG.Messages.MessageWriters;
+using mRemoteNG.Messages.WriterDecorators;
+
+namespace mRemoteNG.App.Initialization
+{
+    public class MessageCollectorSetup
+    {
+        public static void SetupMessageCollector(MessageCollector messageCollector,
+                                                 IList<IMessageWriter> messageWriterList)
+        {
+            messageCollector.CollectionChanged += (o, args) =>
+            {
+                var messages = args.NewItems.Cast<IMessage>().ToArray();
+                foreach (var printer in messageWriterList)
+                    foreach (var message in messages)
+                        printer.Write(message);
+            };
+        }
+
+        public static void BuildMessageWritersFromSettings(IList<IMessageWriter> messageWriterList)
+        {
+#if DEBUG
+            messageWriterList.Add(BuildDebugConsoleWriter());
+#endif
+            messageWriterList.Add(BuildTextLogMessageWriter());
+            messageWriterList.Add(BuildNotificationPanelMessageWriter());
+            messageWriterList.Add(BuildPopupMessageWriter());
+        }
+
+        private static IMessageWriter BuildDebugConsoleWriter()
+        {
+            return new DebugConsoleMessageWriter();
+        }
+
+        private static IMessageWriter BuildTextLogMessageWriter()
+        {
+            return new MessageTypeFilterDecorator(
+                                                  new LogMessageTypeFilteringOptions(),
+                                                  new TextLogMessageWriter(Logger.Instance)
+                                                 );
+        }
+
+        private static IMessageWriter BuildNotificationPanelMessageWriter()
+        {
+            return new OnlyLogMessageFilter(
+                                            new MessageTypeFilterDecorator(
+                                                                           new
+                                                                               NotificationPanelMessageFilteringOptions(),
+                                                                           new MessageFocusDecorator(
+                                                                                                     Windows.ErrorsForm,
+                                                                                                     new
+                                                                                                         NotificationPanelSwitchOnMessageFilteringOptions(),
+                                                                                                     new
+                                                                                                         NotificationPanelMessageWriter(Windows
+                                                                                                                                            .ErrorsForm)
+                                                                                                    )
+                                                                          )
+                                           );
+        }
+
+        private static IMessageWriter BuildPopupMessageWriter()
+        {
+            return new OnlyLogMessageFilter(
+                                            new MessageTypeFilterDecorator(
+                                                                           new PopupMessageFilteringOptions(),
+                                                                           new PopupMessageWriter()
+                                                                          )
+                                           );
+        }
+    }
+}

mRemoteNG/App/Initialization/StartupDataLogger.cs

@@ -3,6 +3,7 @@ using System.Management;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App.Initialization
 {
@@ -43,7 +44,8 @@ namespace mRemoteNG.App.Initialization
 
             try
             {
-                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem WHERE Primary=True").Get())
+                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem WHERE Primary=True")
+                    .Get())
                 {
                     var managementObject = (ManagementObject)o;
                     osVersion = Convert.ToString(managementObject.GetPropertyValue("Caption")).Trim();
@@ -54,6 +56,7 @@ namespace mRemoteNG.App.Initialization
             {
                 _messageCollector.AddExceptionMessage("Error retrieving operating system information from WMI.", ex);
             }
+
             var osData = string.Join(" ", osVersion, servicePack);
             return osData;
         }
@@ -65,6 +68,7 @@ namespace mRemoteNG.App.Initialization
             {
                 servicePack = $"Service Pack {servicePackNumber}";
             }
+
             return servicePack;
         }
 
@@ -73,7 +77,8 @@ namespace mRemoteNG.App.Initialization
             var architecture = string.Empty;
             try
             {
-                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_Processor WHERE DeviceID=\'CPU0\'").Get())
+                foreach (var o in new ManagementObjectSearcher("SELECT AddressWidth FROM Win32_Processor WHERE DeviceID=\'CPU0\'")
+                    .Get())
                 {
                     var managementObject = (ManagementObject)o;
                     var addressWidth = Convert.ToInt32(managementObject.GetPropertyValue("AddressWidth"));
@@ -84,6 +89,7 @@ namespace mRemoteNG.App.Initialization
             {
                 _messageCollector.AddExceptionMessage("Error retrieving operating system address width from WMI.", ex);
             }
+
             return architecture;
         }
 
@@ -91,7 +97,7 @@ namespace mRemoteNG.App.Initialization
         {
             var data = $"{Application.ProductName} {Application.ProductVersion}";
             if (Runtime.IsPortableEdition)
-                data += $" {Language.strLabelPortableEdition}";
+                data += $" {Language.PortableEdition}";
             data += " starting.";
             _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
         }
@@ -110,7 +116,8 @@ namespace mRemoteNG.App.Initialization
 
         private void LogCultureData()
         {
-            var data = $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}";
+            var data =
+                $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}";
             _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
         }
     }

mRemoteNG/App/Logger.cs

@@ -4,11 +4,13 @@ using System.Windows.Forms;
 using log4net;
 using log4net.Appender;
 using log4net.Config;
+using mRemoteNG.Properties;
+
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.App
 {
-	public class Logger
+    public class Logger
     {
         public static readonly Logger Instance = new Logger();
 
@@ -23,7 +25,7 @@ namespace mRemoteNG.App
 
         private void Initialize()
         {
-            XmlConfigurator.Configure();
+            XmlConfigurator.Configure(LogManager.CreateRepository("mRemoteNG"));
             if (string.IsNullOrEmpty(Settings.Default.LogFilePath))
                 Settings.Default.LogFilePath = BuildLogFilePath();
 
@@ -32,7 +34,7 @@ namespace mRemoteNG.App
 
         public void SetLogPath(string path)
         {
-            var repository = LogManager.GetRepository();
+            var repository = LogManager.GetRepository("mRemoteNG");
             var appenders = repository.GetAppenders();
 
             foreach (var appender in appenders)
@@ -42,7 +44,8 @@ namespace mRemoteNG.App
                 fileAppender.File = path;
                 fileAppender.ActivateOptions();
             }
-            Log = LogManager.GetLogger("Logger");
+
+            Log = LogManager.GetLogger("mRemoteNG", "Logger");
         }
 
         private static string BuildLogFilePath()
@@ -56,7 +59,8 @@ namespace mRemoteNG.App
 
         private static string GetLogPathNormalEdition()
         {
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Application.ProductName);
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                                Application.ProductName);
         }
 
         private static string GetLogPathPortableEdition()

mRemoteNG/App/NativeMethods.cs

@@ -4,6 +4,7 @@ using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Text;
 
+#pragma warning disable 649
 #pragma warning disable 169
 
 namespace mRemoteNG.App
@@ -11,33 +12,41 @@ namespace mRemoteNG.App
     public static class NativeMethods
     {
         #region Functions
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool AppendMenu(IntPtr hMenu, int uFlags, IntPtr uIDNewItem, string lpNewItem);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr CreatePopupMenu();
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
-			
+        internal static extern IntPtr FindWindowEx(IntPtr parentHandle,
+                                                   IntPtr childAfter,
+                                                   string lclassName,
+                                                   string windowTitle);
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr GetForegroundWindow();
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool InsertMenu(IntPtr hMenu, int uPosition, int uFlags, IntPtr uIDNewItem, string lpNewItem);
-			
+        internal static extern bool InsertMenu(IntPtr hMenu,
+                                               int uPosition,
+                                               int uFlags,
+                                               IntPtr uIDNewItem,
+                                               string lpNewItem);
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern int IsIconic(IntPtr hWnd);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool MoveWindow(IntPtr hWnd, int x, int y, int cx, int cy, bool repaint);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
 
@@ -54,31 +63,38 @@ namespace mRemoteNG.App
         internal static extern IntPtr SendMessage(IntPtr hWnd, uint msg, IntPtr wParam, string lParam);
 
         [DllImport("user32.dll", CharSet = CharSet.Unicode)]
-        internal static extern IntPtr SendMessage([In] IntPtr hWnd, [In] uint msg, [Out] StringBuilder wParam, [In] IntPtr lParam);
+        internal static extern IntPtr SendMessage([In] IntPtr hWnd,
+                                                  [In] uint msg,
+                                                  [Out] StringBuilder wParam,
+                                                  [In] IntPtr lParam);
 
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer);
 
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern bool SetForegroundWindow(IntPtr hWnd);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool SetMenuItemBitmaps(IntPtr hMenu, int uPosition, int uFlags, IntPtr hBitmapUnchecked, IntPtr hBitmapChecked);
-			
+        internal static extern bool SetMenuItemBitmaps(IntPtr hMenu,
+                                                       int uPosition,
+                                                       int uFlags,
+                                                       IntPtr hBitmapUnchecked,
+                                                       IntPtr hBitmapChecked);
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern long SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern int ShowWindow(IntPtr hWnd, int nCmdShow);
-			
+
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern IntPtr WindowFromPoint(Point point);
 
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern int GetClassName(IntPtr hWnd, System.Text.StringBuilder lpClassName, int nMaxCount);
+        internal static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
 
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern int GetDlgCtrlID(IntPtr hwndCtl);
@@ -92,9 +108,11 @@ namespace mRemoteNG.App
         [DllImport("kernel32", SetLastError = true)]
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern bool CloseHandle(IntPtr handle);
+
         #endregion
 
         #region Structures
+
         [StructLayout(LayoutKind.Sequential)]
         internal struct WINDOWPOS
         {
@@ -130,60 +148,71 @@ namespace mRemoteNG.App
             public long right;
             public long bottom;
         }
+
         #endregion
 
         #region Helpers
+
         public static int MAKELONG(int wLow, int wHigh)
         {
             return wLow | wHigh << 16;
         }
-			
+
         public static int MAKELPARAM(ref int wLow, ref int wHigh)
         {
             return MAKELONG(wLow, wHigh);
         }
-			
+
         public static int LOWORD(int value)
         {
             return value & 0xFFFF;
         }
-			
+
         public static int LOWORD(IntPtr value)
         {
             return LOWORD(value.ToInt32());
         }
-			
+
         public static int HIWORD(int value)
         {
             return value >> 16;
         }
-			
+
         public static int HIWORD(IntPtr value)
         {
             return HIWORD(value.ToInt32());
         }
+
         #endregion
 
         #region Constants
+
         public const int TRUE = 1;
 
         #region GetWindowLong
+
         public const int GWL_STYLE = (-16);
+
         #endregion
 
         #region AppendMenu / ModifyMenu / DeleteMenu / RemoveMenu
+
         public const int MF_BYCOMMAND = 0x0;
         public const int MF_BYPOSITION = 0x400;
         public const int MF_STRING = 0x0;
         public const int MF_POPUP = 0x10;
         public const int MF_SEPARATOR = 0x800;
+
         #endregion
 
         #region WM_LBUTTONDOWN / WM_LBUTTONUP
+
         public const int MK_LBUTTON = 0x1;
+
         #endregion
 
         #region ShowWindow
+
         public const uint SW_HIDE = 0;
         public const uint SW_SHOWNORMAL = 1;
         public const uint SW_SHOWMINIMIZED = 2;
@@ -195,9 +224,11 @@ namespace mRemoteNG.App
         public const uint SW_SHOWMINNOACTIVE = 7;
         public const uint SW_SHOWNA = 8;
         public const uint SW_RESTORE = 9;
+
         #endregion
 
         #region SetWindowPos / WM_WINDOWPOSCHANGING / WM_WINDOWPOSCHANGED
+
         /// <summary>
         /// Retains the current size (ignores the cx and cy parameters).
         /// </summary>
@@ -269,12 +300,12 @@ namespace mRemoteNG.App
         public const int SWP_NOCLIENTMOVE = 0x1000;
 
         /// <summary>
-        /// Prevents generation of the WM_SYNCPAINT message. 
+        /// Prevents generation of the WM_SYNCPAINT message.
         /// </summary>
         public const int SWP_DEFERERASE = 0x2000;
 
         /// <summary>
-        /// If the calling thread and the thread that owns the window are attached to different input queues, the system posts the request to the thread that owns the window. This prevents the calling thread from blocking its execution while other threads process the request. 
+        /// If the calling thread and the thread that owns the window are attached to different input queues, the system posts the request to the thread that owns the window. This prevents the calling thread from blocking its execution while other threads process the request.
         /// </summary>
         public const int SWP_ASYNCWINDOWPOS = 0x4000;
 
@@ -282,15 +313,19 @@ namespace mRemoteNG.App
         /// 
         /// </summary>
         public const int SWP_STATECHANGED = 0x8000;
+
         #endregion
 
         #region Window Placement Flags (WPF)
+
         public const uint WPF_SETMINPOSITION = 0x1;
         public const uint WPF_RESTORETOMAXIMIZED = 0x2;
         public const uint WPF_ASYNCWINDOWPLACEMENT = 0x4;
+
         #endregion
 
         #region WM_ACTIVATE
+
         /// <summary>
         /// 
         /// </summary>
@@ -303,14 +338,16 @@ namespace mRemoteNG.App
 
         /// <summary>
         /// Sent to both the window being activated and the window being deactivated.
-        /// If the windows use the same input queue, the message is sent synchronously, first to the window procedure of the 
-        /// top-level window being deactivated, then to the window procedure of the top-level window being activated. If the 
+        /// If the windows use the same input queue, the message is sent synchronously, first to the window procedure of the
+        /// top-level window being deactivated, then to the window procedure of the top-level window being activated. If the
         /// windows use different input queues, the message is sent asynchronously, so the window is activated immediately.
         /// </summary>
         public const int WA_CLICKACTIVE = 0x2;
+
         #endregion
 
         #region Window Messages
+
         /// <summary>
         /// Sent when an application requests that a window be created by calling the CreateWindowEx or CreateWindow function. (The message is sent before the function returns.) The window procedure of the new window receives this message after the window is created, but before the window becomes visible.
         /// </summary>
@@ -332,7 +369,7 @@ namespace mRemoteNG.App
         public const int WM_SETTEXT = 0xC;
 
         /// <summary>
-        /// Copies the text that corresponds to a window into a buffer provided by the caller. 
+        /// Copies the text that corresponds to a window into a buffer provided by the caller.
         /// </summary>
         public const int WM_GETTEXT = 0xD;
 
@@ -347,7 +384,7 @@ namespace mRemoteNG.App
         public const int WM_ACTIVATEAPP = 0x1C;
 
         /// <summary>
-        /// Sent to a window if the mouse causes the cursor to move within a window and mouse input is not captured. 
+        /// Sent to a window if the mouse causes the cursor to move within a window and mouse input is not captured.
         /// </summary>
         public const int WM_SETCURSOR = 0x20;
 
@@ -372,12 +409,12 @@ namespace mRemoteNG.App
         public const int WM_WINDOWPOSCHANGED = 0x47;
 
         /// <summary>
-        /// Posted to the window with the keyboard focus when a nonsystem key is pressed. A nonsystem key is a key that is pressed when the ALT key is not pressed. 
+        /// Posted to the window with the keyboard focus when a nonsystem key is pressed. A nonsystem key is a key that is pressed when the ALT key is not pressed.
         /// </summary>
         public const int WM_KEYDOWN = 0x100;
 
         /// <summary>
-        /// Posted to the window with the keyboard focus when a nonsystem key is released. A nonsystem key is a key that is pressed when the ALT key is not pressed, or a keyboard key that is pressed when a window has the keyboard focus. 
+        /// Posted to the window with the keyboard focus when a nonsystem key is released. A nonsystem key is a key that is pressed when the ALT key is not pressed, or a keyboard key that is pressed when a window has the keyboard focus.
         /// </summary>
         public const int WM_KEYUP = 0x101;
 
@@ -432,7 +469,7 @@ namespace mRemoteNG.App
         public const int WM_MBUTTONUP = 0x208;
 
         /// <summary>
-        /// Posted when the user presses the first or second X button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse. 
+        /// Posted when the user presses the first or second X button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
         /// </summary>
         public const int WM_XBUTTONDOWN = 0x20B;
 
@@ -447,47 +484,56 @@ namespace mRemoteNG.App
         public const int WM_PARENTNOTIFY = 0x210;
 
         /// <summary>
-        /// Sent one time to a window after it enters the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns. 
+        /// Sent one time to a window after it enters the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns.
         /// </summary>
         public const int WM_ENTERSIZEMOVE = 0x231;
 
         /// <summary>
-        /// Sent one time to a window, after it has exited the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns. 
+        /// Sent one time to a window, after it has exited the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns.
         /// </summary>
         public const int WM_EXITSIZEMOVE = 0x232;
 
         /// <summary>
-        /// Sent to the first window in the clipboard viewer chain when the content of the clipboard changes. This enables a clipboard viewer window to display the new content of the clipboard. 
+        /// Sent to the first window in the clipboard viewer chain when the content of the clipboard changes. This enables a clipboard viewer window to display the new content of the clipboard.
         /// </summary>
         public const int WM_DRAWCLIPBOARD = 0x308;
 
         /// <summary>
-        /// Sent to the first window in the clipboard viewer chain when a window is being removed from the chain. 
+        /// Sent to the first window in the clipboard viewer chain when a window is being removed from the chain.
         /// </summary>
         public const int WM_CHANGECBCHAIN = 0x30D;
+
         #endregion
 
         #region Window Styles
+
         public const int WS_MAXIMIZE = 0x1000000;
         public const int WS_VISIBLE = 0x10000000;
         public const int WS_CHILD = 0x40000000;
         public const int WS_EX_MDICHILD = 0x40;
+
         #endregion
 
         #region Virtual Key Codes
+
         public const int VK_CONTROL = 0x11;
         public const int VK_C = 0x67;
+
         #endregion
 
         #region EM
+
         public const uint ECM_FIRST = 0x1500;
         public const uint EM_SETCUEBANNER = ECM_FIRST + 1;
         public const uint EM_GETCUEBANNER = ECM_FIRST + 2;
+
         #endregion
 
         #region LB
+
         public const int LB_ERR = -1;
         public const int LB_SELECTSTRING = 0x18C;
+
         #endregion
 
         #region TCM

mRemoteNG/App/ProgramRoot.cs

@@ -1,14 +1,15 @@
-using mRemoteNG.UI.Forms;
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Windows.Forms;
+using mRemoteNG.Properties;
+using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
     public static class ProgramRoot
     {
-        private static Mutex mutex;
+        private static Mutex _mutex;
 
         /// <summary>
         /// The main entry point for the application.
@@ -24,21 +25,23 @@ namespace mRemoteNG.App
 
         private static void StartApplication()
         {
+            CatchAllUnhandledExceptions();
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+            var frmSplashScreen = FrmSplashScreen.getInstance();
+            frmSplashScreen.Show();
             Application.Run(FrmMain.Default);
         }
 
         public static void CloseSingletonInstanceMutex()
         {
-            mutex?.Close();
+            _mutex?.Close();
         }
 
         private static void StartApplicationAsSingleInstance()
         {
             const string mutexID = "mRemoteNG_SingleInstanceMutex";
-            bool newInstanceCreated;
-            mutex = new Mutex(false, mutexID, out newInstanceCreated);
+            _mutex = new Mutex(false, mutexID, out var newInstanceCreated);
             if (!newInstanceCreated)
             {
                 SwitchToCurrentInstance();
@@ -46,7 +49,7 @@ namespace mRemoteNG.App
             }
 
             StartApplication();
-            GC.KeepAlive(mutex);
+            GC.KeepAlive(_mutex);
         }
 
         private static void SwitchToCurrentInstance()
@@ -64,10 +67,41 @@ namespace mRemoteNG.App
             var currentProcess = Process.GetCurrentProcess();
             foreach (var enumeratedProcess in Process.GetProcessesByName(currentProcess.ProcessName))
             {
-                if (enumeratedProcess.Id != currentProcess.Id && enumeratedProcess.MainModule.FileName == currentProcess.MainModule.FileName && enumeratedProcess.MainWindowHandle != IntPtr.Zero)
+                if (enumeratedProcess.Id != currentProcess.Id &&
+                    enumeratedProcess.MainModule.FileName == currentProcess.MainModule.FileName &&
+                    enumeratedProcess.MainWindowHandle != IntPtr.Zero)
                     windowHandle = enumeratedProcess.MainWindowHandle;
             }
+
             return windowHandle;
         }
+
+        private static void CatchAllUnhandledExceptions()
+        {
+            Application.ThreadException += ApplicationOnThreadException;
+            Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledException;
+        }
+
+        private static void ApplicationOnThreadException(object sender, ThreadExceptionEventArgs e)
+        {
+            if (!FrmSplashScreen.getInstance().IsDisposed)
+                FrmSplashScreen.getInstance().Close();
+
+            if (FrmMain.Default.IsDisposed) return;
+            
+            var window = new FrmUnhandledException(e.Exception, false);
+            window.ShowDialog(FrmMain.Default);
+            
+        }
+
+        private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            if (!FrmSplashScreen.getInstance().IsDisposed)
+                FrmSplashScreen.getInstance().Close();
+
+            var window = new FrmUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
+            window.ShowDialog(FrmMain.Default);
+        }
     }
 }

mRemoteNG/App/Runtime.cs

@@ -1,4 +1,4 @@
-using mRemoteNG.App.Info;
+using mRemoteNG.App.Info;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection;
 using mRemoteNG.Credential;
@@ -15,6 +15,8 @@ using System.IO;
 using System.Security;
 using System.Threading;
 using System.Windows.Forms;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App
 {
@@ -32,15 +34,26 @@ namespace mRemoteNG.App
             }
         }
 
+        /// <summary>
+        /// Feature flag to enable the credential manager feature
+        /// </summary>
+        public static bool UseCredentialManager => false;
+
         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 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);
+
+        public static ConnectionsService ConnectionsService { get; } =
+            new ConnectionsService(PuttySessionsManager.Instance);
 
         #region Connections Loading/Saving
+
         public static void LoadConnectionsAsync()
         {
             var t = new Thread(LoadConnectionsBGd);
@@ -96,11 +109,19 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
+                FrmSplashScreen.getInstance().Close();
+
                 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);
+                    MessageCollector.AddExceptionMessage(Language.LoadFromSqlFailed, ex);
+                    var commandButtons = string.Join("|", Language._TryAgain,
+                                                     Language.CommandOpenConnectionFile,
+                                                     string.Format(Language.CommandExitProgram,
+                                                                   Application.ProductName));
+                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.LoadFromSqlFailed,
+                                               Language.LoadFromSqlFailedContent,
+                                               MiscTools.GetExceptionMessageRecursive(ex), "", "",
+                                               commandButtons, false, ESysIcons.Error, ESysIcons.Error);
                     switch (CTaskDialog.CommandButtonResult)
                     {
                         case 0:
@@ -115,16 +136,20 @@ namespace mRemoteNG.App
                             return;
                     }
                 }
+
                 if (ex is FileNotFoundException && !withDialog)
                 {
-                    MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), ex, MessageClass.InformationMsg);
+                    MessageCollector.AddExceptionMessage(
+                                                         string.Format(Language.ConnectionsFileCouldNotBeLoadedNew,
+                                                                       connectionFileName), ex,
+                                                         MessageClass.InformationMsg);
 
                     string[] commandButtons =
                     {
                         Language.ConfigurationCreateNew,
                         Language.ConfigurationCustomPath,
                         Language.ConfigurationImportFile,
-                        Language.strMenuExit
+                        Language.Exit
                     };
 
                     var answered = false;
@@ -133,13 +158,13 @@ namespace mRemoteNG.App
                         try
                         {
                             CTaskDialog.ShowTaskDialogBox(
-                                GeneralAppInfo.ProductName, 
-                                Language.ConnectionFileNotFound, 
-                                "", "", "", "", "", 
-                                string.Join(" | ", commandButtons), 
-                                ETaskDialogButtons.None, 
-                                ESysIcons.Question, 
-                                ESysIcons.Question);
+                                                          GeneralAppInfo.ProductName,
+                                                          Language.ConnectionFileNotFound,
+                                                          "", "", "", "", "",
+                                                          string.Join(" | ", commandButtons),
+                                                          ETaskDialogButtons.None,
+                                                          ESysIcons.Question,
+                                                          ESysIcons.Question);
 
                             switch (CTaskDialog.CommandButtonResult)
                             {
@@ -160,17 +185,24 @@ namespace mRemoteNG.App
                                     Application.Exit();
                                     answered = true;
                                     break;
-                            }                               
+                            }
                         }
                         catch (Exception exc)
                         {
-                            MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), exc, MessageClass.InformationMsg);
+                            MessageCollector.AddExceptionMessage(
+                                                                 string
+                                                                     .Format(Language.ConnectionsFileCouldNotBeLoadedNew,
+                                                                             connectionFileName), exc,
+                                                                 MessageClass.InformationMsg);
                         }
                     }
+
                     return;
                 }
 
-                MessageCollector.AddExceptionStackTrace(string.Format(Language.strConnectionsFileCouldNotBeLoaded, connectionFileName), ex);
+                MessageCollector.AddExceptionStackTrace(
+                                                        string.Format(Language.ConnectionsFileCouldNotBeLoaded,
+                                                                      connectionFileName), ex);
                 if (connectionFileName != ConnectionsService.GetStartupConnectionFileName())
                 {
                     LoadConnections(withDialog);
@@ -178,12 +210,16 @@ namespace mRemoteNG.App
                 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);
+                                    string.Format(Language.ErrorStartupConnectionFileLoad, Environment.NewLine,
+                                                  Application.ProductName,
+                                                  ConnectionsService.GetStartupConnectionFileName(),
+                                                  MiscTools.GetExceptionMessageRecursive(ex)),
+                                    @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     Application.Exit();
                 }
             }
         }
+
         #endregion
     }
 }

mRemoteNG/App/Shutdown.cs

@@ -3,8 +3,11 @@ using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 using mRemoteNG.Config.Putty;
+using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
+
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.App
@@ -25,7 +28,10 @@ namespace mRemoteNG.App
             ProgramRoot.CloseSingletonInstanceMutex();
         }
 
-        public static void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
+        public static void Cleanup(Control quickConnectToolStrip,
+                                   ExternalToolsToolStrip externalToolsToolStrip,
+                                   MultiSshToolStrip multiSshToolStrip,
+                                   FrmMain frmMain)
         {
             try
             {
@@ -37,7 +43,7 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strSettingsCouldNotBeSavedOrTrayDispose, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.SettingsCouldNotBeSavedOrTrayDispose, ex);
             }
         }
 
@@ -58,9 +64,13 @@ namespace mRemoteNG.App
                 Runtime.ConnectionsService.SaveConnections();
         }
 
-        private static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
+        private static void SaveSettings(Control quickConnectToolStrip,
+                                         ExternalToolsToolStrip externalToolsToolStrip,
+                                         MultiSshToolStrip multiSshToolStrip,
+                                         FrmMain frmMain)
         {
-            Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip, frmMain);
+            Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip,
+                                                       frmMain);
         }
 
         private static void UnregisterBrowsers()

mRemoteNG/App/Startup.cs

@@ -5,10 +5,10 @@ using System.Globalization;
 using mRemoteNG.App.Info;
 using mRemoteNG.App.Initialization;
 using mRemoteNG.App.Update;
-using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Connections.Multiuser;
 using mRemoteNG.Connection;
 using mRemoteNG.Messages;
+using mRemoteNG.Properties;
 using mRemoteNG.Tools;
 using mRemoteNG.Tools.Cmdline;
 using mRemoteNG.UI;
@@ -37,15 +37,16 @@ namespace mRemoteNG.App
 
         public void InitializeProgram(MessageCollector messageCollector)
         {
-            Debug.Print("---------------------------" + Environment.NewLine + "[START] - " + Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture));
+            Debug.Print("---------------------------" + Environment.NewLine + "[START] - " +
+                        Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture));
             var startupLogger = new StartupDataLogger(messageCollector);
             startupLogger.LogStartupData();
             CompatibilityChecker.CheckCompatibility(messageCollector);
             ParseCommandLineArgs(messageCollector);
             IeBrowserEmulation.Register();
             _connectionIconLoader.GetConnectionIcons();
-            DefaultConnectionInfo.Instance.LoadFrom(Settings.Default, a=>"ConDefault"+a);
-            DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, a=>"InhDefault"+a);
+            DefaultConnectionInfo.Instance.LoadFrom(Settings.Default, a => "ConDefault" + a);
+            DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, a => "InhDefault" + a);
         }
 
         private static void ParseCommandLineArgs(MessageCollector messageCollector)
@@ -59,7 +60,8 @@ namespace mRemoteNG.App
             messageCollector.AddMessage(MessageClass.DebugMsg, "Determining if we need a database syncronizer");
             if (!Settings.Default.UseSQLServer) return;
             messageCollector.AddMessage(MessageClass.DebugMsg, "Creating database syncronizer");
-            Runtime.ConnectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker());
+            Runtime.ConnectionsService.RemoteConnectionsSyncronizer =
+                new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker());
             Runtime.ConnectionsService.RemoteConnectionsSyncronizer.Enable();
         }
 
@@ -74,7 +76,12 @@ namespace mRemoteNG.App
                 return;
             }
 
-            var nextUpdateCheck = Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Settings.Default.CheckForUpdatesFrequencyDays))));
+            var nextUpdateCheck =
+                Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add(
+                                                                                 TimeSpan
+                                                                                     .FromDays(Convert.ToDouble(Settings
+                                                                                                                .Default
+                                                                                                                .CheckForUpdatesFrequencyDays))));
             if (!Settings.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck)
             {
                 return;
@@ -100,6 +107,7 @@ namespace mRemoteNG.App
                 {
                     return;
                 }
+
                 if (e.Error != null)
                 {
                     throw e.Error;

mRemoteNG/App/SupportedCultures.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Runtime.Serialization;
+using mRemoteNG.Properties;
+
+// ReSharper disable ArrangeAccessorOwnerBody
+
+namespace mRemoteNG.App
+{
+    [Serializable]
+    public sealed class SupportedCultures : Dictionary<string, string>
+    {
+        private static SupportedCultures _Instance;
+
+        private static SupportedCultures SingletonInstance
+        {
+            get { return _Instance ?? (_Instance = new SupportedCultures()); }
+        }
+
+
+        private SupportedCultures()
+        {
+            foreach (var CultureName in Settings.Default.SupportedUICultures.Split(','))
+            {
+                try
+                {
+                    var CultureInfo = new CultureInfo(CultureName.Trim());
+                    Add(CultureInfo.Name, CultureInfo.TextInfo.ToTitleCase(CultureInfo.NativeName));
+                }
+                catch (Exception ex)
+                {
+                    Debug.Print(
+                                $"An exception occurred while adding the culture {CultureName} to the list of supported cultures. {ex.StackTrace}");
+                }
+            }
+        }
+
+        // fix CA2229 - https://docs.microsoft.com/en-us/visualstudio/code-quality/ca2229-implement-serialization-constructors?view=vs-2017
+        private SupportedCultures(SerializationInfo info, StreamingContext context)
+        {
+            throw new NotImplementedException();
+        }
+
+        public static bool IsNameSupported(string CultureName)
+        {
+            return SingletonInstance.ContainsKey(CultureName);
+        }
+
+        public static bool IsNativeNameSupported(string CultureNativeName)
+        {
+            return SingletonInstance.ContainsValue(CultureNativeName);
+        }
+
+        public static string get_CultureName(string CultureNativeName)
+        {
+            var Names = new string[SingletonInstance.Count + 1];
+            var NativeNames = new string[SingletonInstance.Count + 1];
+
+            SingletonInstance.Keys.CopyTo(Names, 0);
+            SingletonInstance.Values.CopyTo(NativeNames, 0);
+
+            for (var Index = 0; Index <= SingletonInstance.Count; Index++)
+            {
+                if (NativeNames[Index] == CultureNativeName)
+                {
+                    return Names[Index];
+                }
+            }
+
+            throw (new KeyNotFoundException());
+        }
+
+        public static string get_CultureNativeName(string CultureName)
+        {
+            return SingletonInstance[CultureName];
+        }
+
+        public static List<string> CultureNativeNames
+        {
+            get
+            {
+                var ValueList = new List<string>();
+                foreach (var Value in SingletonInstance.Values)
+                {
+                    ValueList.Add(Value);
+                }
+
+                return ValueList;
+            }
+        }
+    }
+}

mRemoteNG/App/Update/AppUpdater.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net;
 using System.ComponentModel;
@@ -7,11 +7,13 @@ using System.Reflection;
 using mRemoteNG.App.Info;
 using mRemoteNG.Security.SymmetricEncryption;
 using System.Security.Cryptography;
+using mRemoteNG.Properties;
 #if !PORTABLE
 using mRemoteNG.Tools;
 
-#else 
+#else
 using System.Windows.Forms;
+
 #endif
 // ReSharper disable ArrangeAccessorOwnerBody
 
@@ -66,7 +68,12 @@ namespace mRemoteNG.App.Update
             SetProxySettings(shouldWeUseProxy, proxyAddress, port, useAuthentication, username, password);
         }
 
-        public void SetProxySettings(bool useProxy, string address, int port, bool useAuthentication, string username, string password)
+        public void SetProxySettings(bool useProxy,
+                                     string address,
+                                     int port,
+                                     bool useAuthentication,
+                                     string username,
+                                     string password)
         {
             if (useProxy && !string.IsNullOrEmpty(address))
             {
@@ -107,7 +114,8 @@ namespace mRemoteNG.App.Update
         {
             if (CurrentUpdateInfo == null || !CurrentUpdateInfo.IsValid)
             {
-                throw new InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync().");
+                throw new InvalidOperationException(
+                                                    "CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync().");
             }
 
             if (IsGetChangeLogRunning)
@@ -131,27 +139,29 @@ namespace mRemoteNG.App.Update
             if (CurrentUpdateInfo == null || !CurrentUpdateInfo.IsValid)
             {
                 throw new InvalidOperationException(
-                    "CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().");
+                                                    "CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().");
             }
 #if !PORTABLE
-            CurrentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "msi"));
+            CurrentUpdateInfo.UpdateFilePath =
+ Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "msi"));
 #else
-		    var sfd = new SaveFileDialog
-		    {
-		        InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),
+            var sfd = new SaveFileDialog
+            {
+                InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),
                 FileName = CurrentUpdateInfo.FileName,
-		        RestoreDirectory = true
-		    };
-		    if (sfd.ShowDialog() == DialogResult.OK)
-		    {
+                RestoreDirectory = true
+            };
+            if (sfd.ShowDialog() == DialogResult.OK)
+            {
                 CurrentUpdateInfo.UpdateFilePath = sfd.FileName;
             }
-		    else
-		    {
-		        return;
-		    }
+            else
+            {
+                return;
+            }
 #endif
-            DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress, CurrentUpdateInfo.UpdateFilePath);
+            DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress,
+                                                      CurrentUpdateInfo.UpdateFilePath);
         }
 
         #endregion
@@ -191,7 +201,9 @@ namespace mRemoteNG.App.Update
         }
 
         private static DownloadStringCompletedEventArgs NewDownloadStringCompletedEventArgs(string result,
-            Exception exception, bool cancelled, object userToken)
+                                                                                            Exception exception,
+                                                                                            bool cancelled,
+                                                                                            object userToken)
         {
             var type = typeof(DownloadStringCompletedEventArgs);
             const BindingFlags bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance;
@@ -201,7 +213,7 @@ namespace mRemoteNG.App.Update
 
             if (constructor == null)
                 return null;
-            return (DownloadStringCompletedEventArgs) constructor.Invoke(arguments);
+            return (DownloadStringCompletedEventArgs)constructor.Invoke(arguments);
         }
 
         private DownloadStringCompletedEventArgs DownloadString(Uri address)
@@ -233,12 +245,19 @@ namespace mRemoteNG.App.Update
 
             if (!e.Cancelled && e.Error == null)
             {
-                CurrentUpdateInfo = UpdateInfo.FromString(e.Result);
-
-                Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
-                if (!Settings.Default.UpdatePending)
+                try
                 {
-                    Settings.Default.UpdatePending = IsUpdateAvailable();
+                    CurrentUpdateInfo = UpdateInfo.FromString(e.Result);
+
+                    Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
+                    if (!Settings.Default.UpdatePending)
+                    {
+                        Settings.Default.UpdatePending = IsUpdateAvailable();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    e = NewDownloadStringCompletedEventArgs(e.Result, ex, e.Cancelled, null);
                 }
             }
 
@@ -326,11 +345,13 @@ namespace mRemoteNG.App.Update
         {
             add
             {
-                GetUpdateInfoCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Combine(GetUpdateInfoCompletedEventEvent, value);
+                GetUpdateInfoCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Combine(GetUpdateInfoCompletedEventEvent, value);
             }
             remove
             {
-                GetUpdateInfoCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Remove(GetUpdateInfoCompletedEventEvent, value);
+                GetUpdateInfoCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Remove(GetUpdateInfoCompletedEventEvent, value);
             }
         }
 
@@ -340,11 +361,13 @@ namespace mRemoteNG.App.Update
         {
             add
             {
-                GetChangeLogCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Combine(GetChangeLogCompletedEventEvent, value);
+                GetChangeLogCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Combine(GetChangeLogCompletedEventEvent, value);
             }
             remove
             {
-                GetChangeLogCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Remove(GetChangeLogCompletedEventEvent, value);
+                GetChangeLogCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Remove(GetChangeLogCompletedEventEvent, value);
             }
         }
 
@@ -354,11 +377,15 @@ namespace mRemoteNG.App.Update
         {
             add
             {
-                DownloadUpdateProgressChangedEventEvent = (DownloadProgressChangedEventHandler)Delegate.Combine(DownloadUpdateProgressChangedEventEvent, value);
+                DownloadUpdateProgressChangedEventEvent =
+                    (DownloadProgressChangedEventHandler)Delegate.Combine(DownloadUpdateProgressChangedEventEvent,
+                                                                          value);
             }
             remove
             {
-                DownloadUpdateProgressChangedEventEvent = (DownloadProgressChangedEventHandler)Delegate.Remove(DownloadUpdateProgressChangedEventEvent, value);
+                DownloadUpdateProgressChangedEventEvent =
+                    (DownloadProgressChangedEventHandler)Delegate.Remove(DownloadUpdateProgressChangedEventEvent,
+                                                                         value);
             }
         }
 
@@ -368,11 +395,13 @@ namespace mRemoteNG.App.Update
         {
             add
             {
-                DownloadUpdateCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Combine(DownloadUpdateCompletedEventEvent, value);
+                DownloadUpdateCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Combine(DownloadUpdateCompletedEventEvent, value);
             }
             remove
             {
-                DownloadUpdateCompletedEventEvent = (AsyncCompletedEventHandler)Delegate.Remove(DownloadUpdateCompletedEventEvent, value);
+                DownloadUpdateCompletedEventEvent =
+                    (AsyncCompletedEventHandler)Delegate.Remove(DownloadUpdateCompletedEventEvent, value);
             }
         }
 

mRemoteNG/App/Update/UpdateFile.cs

@@ -7,12 +7,16 @@ namespace mRemoteNG.App.Update
     public class UpdateFile
     {
         #region Public Properties
+
         // ReSharper disable MemberCanBePrivate.Local
         // ReSharper disable once MemberCanBePrivate.Global
-        public Dictionary<string, string> Items { get; } = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+        public Dictionary<string, string> Items { get; } =
+            new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
+
         #endregion
 
         #region Public Methods
+
         public UpdateFile(string content)
         {
             FromString(content);
@@ -24,8 +28,8 @@ namespace mRemoteNG.App.Update
         {
             if (string.IsNullOrEmpty(content)) return;
 
-            char[] keyValueSeparators = { ':', '=' };
-            char[] commentCharacters = { '#', ';', '\'' };
+            char[] keyValueSeparators = {':', '='};
+            char[] commentCharacters = {'#', ';', '\''};
 
             // no separators means no valid update data...
             if (content.Trim().IndexOfAny(keyValueSeparators) == -1) return;
@@ -47,7 +51,7 @@ namespace mRemoteNG.App.Update
                         continue;
 
                     // make sure we have valid data in both parts before adding to the collection. If either part is empty, then it's not valid data.
-                    if(string.IsNullOrEmpty(parts[0].Trim()) || string.IsNullOrEmpty(parts[1].Trim()))
+                    if (string.IsNullOrEmpty(parts[0].Trim()) || string.IsNullOrEmpty(parts[1].Trim()))
                         continue;
 
                     Items.Add(parts[0].Trim(), parts[1].Trim());
@@ -83,13 +87,14 @@ namespace mRemoteNG.App.Update
         {
             var value = GetString("dURL");
             var sv = value.Split('/');
-            return sv[sv.Length-1];
+            return sv[sv.Length - 1];
         }
 
         public string GetChecksum(string key = "Checksum")
         {
             return GetString(key).Replace(" ", "").ToUpperInvariant();
         }
+
         #endregion
     }
 }

mRemoteNG/App/Update/UpdateInfo.cs

@@ -1,4 +1,5 @@
 using System;
+
 // ReSharper disable UnusedAutoPropertyAccessor.Local
 
 namespace mRemoteNG.App.Update
@@ -43,6 +44,7 @@ namespace mRemoteNG.App.Update
                 newInfo.Checksum = updateFile.GetChecksum();
                 newInfo.IsValid = newInfo.CheckIfValid();
             }
+
             return newInfo;
         }
 
@@ -50,11 +52,11 @@ namespace mRemoteNG.App.Update
         {
             if (string.IsNullOrEmpty(Version.ToString()))
                 return false;
-            if(string.IsNullOrEmpty(DownloadAddress.AbsoluteUri))
+            if (string.IsNullOrEmpty(DownloadAddress.AbsoluteUri))
                 return false;
             if (string.IsNullOrEmpty(ChangeLogAddress.AbsoluteUri))
                 return false;
-#if false            
+#if false
             if (string.IsNullOrEmpty(ImageAddress.AbsoluteUri))
                 return false;
             if (string.IsNullOrEmpty(ImageLinkAddress.AbsoluteUri))

mRemoteNG/App/Windows.cs

@@ -1,5 +1,4 @@
 using System;
-using mRemoteNG.Messages;
 using mRemoteNG.UI;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.Window;
@@ -8,13 +7,12 @@ namespace mRemoteNG.App
 {
     public static class Windows
     {
-        private static AboutWindow _aboutForm;
         private static ActiveDirectoryImportWindow _adimportForm;
         private static HelpWindow _helpForm;
         private static ExternalToolsWindow _externalappsForm;
         private static PortScanWindow _portscanForm;
+        private static ScreenshotManagerWindow _screenshotmanagerForm;
         private static UltraVNCWindow _ultravncscForm;
-        private static ComponentsCheckWindow _componentscheckForm;
         private static ConnectionTreeWindow _treeForm;
 
         internal static ConnectionTreeWindow TreeForm
@@ -30,7 +28,6 @@ namespace mRemoteNG.App
         internal static SSHTransferWindow SshtransferForm { get; private set; } = new SSHTransferWindow();
 
 
-
         public static void Show(WindowType windowType)
         {
             try
@@ -39,21 +36,17 @@ namespace mRemoteNG.App
                 // ReSharper disable once SwitchStatementMissingSomeCases
                 switch (windowType)
                 {
-                    case WindowType.About:
-                        if (_aboutForm == null || _aboutForm.IsDisposed)
-                            _aboutForm = new AboutWindow();
-                        _aboutForm.Show(dockPanel);
-                        break;
                     case WindowType.ActiveDirectoryImport:
                         if (_adimportForm == null || _adimportForm.IsDisposed)
                             _adimportForm = new ActiveDirectoryImportWindow();
                         _adimportForm.Show(dockPanel);
                         break;
                     case WindowType.Options:
-                        using (var optionsForm = new frmOptions())
+                        using (var optionsForm = new FrmOptions())
                         {
                             optionsForm.ShowDialog(dockPanel);
                         }
+
                         break;
                     case WindowType.SSHTransfer:
                         if (SshtransferForm == null || SshtransferForm.IsDisposed)
@@ -79,17 +72,15 @@ namespace mRemoteNG.App
                         _portscanForm = new PortScanWindow();
                         _portscanForm.Show(dockPanel);
                         break;
+                    case WindowType.ScreenshotManager:
+                        _screenshotmanagerForm = new ScreenshotManagerWindow();
+                        _screenshotmanagerForm.Show(dockPanel);
+                        break;
                     case WindowType.UltraVNCSC:
                         if (_ultravncscForm == null || _ultravncscForm.IsDisposed)
                             _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(dockPanel);
-                        break;
                 }
             }
             catch (Exception ex)

mRemoteNG/Config/ConfirmCloseEnum.cs

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

mRemoteNG/Config/Connections/ConnectionsLoadedEventArgs.cs

@@ -36,10 +36,11 @@ namespace mRemoteNG.Config.Connections
         /// </summary>
         public string NewSourcePath { get; }
 
-        public ConnectionsLoadedEventArgs(
-            Optional<ConnectionTreeModel> previousTreeModelModel, ConnectionTreeModel newTreeModelModel,
-            bool previousSourceWasDatabase, bool newSourceIsDatabase,
-            string newSourcePath)
+        public ConnectionsLoadedEventArgs(Optional<ConnectionTreeModel> previousTreeModelModel,
+                                          ConnectionTreeModel newTreeModelModel,
+                                          bool previousSourceWasDatabase,
+                                          bool newSourceIsDatabase,
+                                          string newSourcePath)
         {
             if (previousTreeModelModel == null)
                 throw new ArgumentNullException(nameof(previousTreeModelModel));
@@ -55,4 +56,4 @@ namespace mRemoteNG.Config.Connections
             NewSourcePath = newSourcePath;
         }
     }
-}
+}

mRemoteNG/Config/Connections/ConnectionsSavedEventArgs.cs

@@ -10,7 +10,10 @@ namespace mRemoteNG.Config.Connections
         public bool UsingDatabase { get; }
         public string ConnectionFileName { get; }
 
-        public ConnectionsSavedEventArgs(ConnectionTreeModel modelThatWasSaved, bool previouslyUsingDatabase, bool usingDatabase, string connectionFileName)
+        public ConnectionsSavedEventArgs(ConnectionTreeModel modelThatWasSaved,
+                                         bool previouslyUsingDatabase,
+                                         bool usingDatabase,
+                                         string connectionFileName)
         {
             if (modelThatWasSaved == null)
                 throw new ArgumentNullException(nameof(modelThatWasSaved));
@@ -21,4 +24,4 @@ namespace mRemoteNG.Config.Connections
             ConnectionFileName = connectionFileName;
         }
     }
-}
+}

mRemoteNG/Config/Connections/CsvConnectionsSaver.cs

@@ -1,8 +1,7 @@
 using System;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 
@@ -26,10 +25,11 @@ namespace mRemoteNG.Config.Connections
 
         public void Save(ConnectionTreeModel connectionTreeModel, string propertyNameTrigger = "")
         {
-            var csvConnectionsSerializer = new CsvConnectionsSerializerMremotengFormat(_saveFilter, Runtime.CredentialProviderCatalog);
+            var csvConnectionsSerializer =
+                new CsvConnectionsSerializerMremotengFormat(_saveFilter, Runtime.CredentialProviderCatalog);
             var dataProvider = new FileDataProvider(_connectionFileName);
             var csvContent = csvConnectionsSerializer.Serialize(connectionTreeModel);
             dataProvider.Save(csvContent);
         }
     }
-}
+}

mRemoteNG/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgs.cs

@@ -3,7 +3,8 @@ using mRemoteNG.Config.DatabaseConnectors;
 
 namespace mRemoteNG.Config.Connections.Multiuser
 {
-    public delegate void ConnectionsUpdateAvailableEventHandler(object sender, ConnectionsUpdateAvailableEventArgs args);
+    public delegate void
+        ConnectionsUpdateAvailableEventHandler(object sender, ConnectionsUpdateAvailableEventArgs args);
 
     public class ConnectionsUpdateAvailableEventArgs : EventArgs
     {

mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs

@@ -27,7 +27,8 @@ namespace mRemoteNG.Config.Connections.Multiuser
         {
             _updateChecker.UpdateCheckStarted += OnUpdateCheckStarted;
             _updateChecker.UpdateCheckFinished += OnUpdateCheckFinished;
-            _updateChecker.ConnectionsUpdateAvailable += (sender, args) => ConnectionsUpdateAvailable?.Invoke(sender, args);
+            _updateChecker.ConnectionsUpdateAvailable +=
+                (sender, args) => ConnectionsUpdateAvailable?.Invoke(sender, args);
             _updateTimer.Elapsed += (sender, args) => _updateChecker.IsUpdateAvailableAsync();
             ConnectionsUpdateAvailable += Load;
         }
@@ -81,6 +82,7 @@ namespace mRemoteNG.Config.Connections.Multiuser
             Dispose(true);
             GC.SuppressFinalize(this);
         }
+
         private void Dispose(bool itIsSafeToAlsoFreeManagedObjects)
         {
             if (!itIsSafeToAlsoFreeManagedObjects) return;

mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs

@@ -1,26 +1,25 @@
-using mRemoteNG.App;
-using mRemoteNG.Config.Connections.Multiuser;
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Threading;
+using mRemoteNG.App;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Messages;
-using System;
-using System.Data;
-using System.Data.SqlClient;
-using System.Threading;
 
-namespace mRemoteNG.Config.Connections
+namespace mRemoteNG.Config.Connections.Multiuser
 {
     public class SqlConnectionsUpdateChecker : IConnectionsUpdateChecker
     {
-        private readonly SqlDatabaseConnector _sqlConnector;
-        private readonly SqlCommand _sqlQuery;
+        private readonly IDatabaseConnector _dbConnector;
+        private readonly DbCommand _dbQuery;
         private DateTime LastUpdateTime => Runtime.ConnectionsService.LastSqlUpdate;
         private DateTime _lastDatabaseUpdateTime;
 
 
         public SqlConnectionsUpdateChecker()
         {
-            _sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings();
-            _sqlQuery = new SqlCommand("SELECT * FROM tblUpdate", _sqlConnector.SqlConnection);
+            _dbConnector = DatabaseConnectorFactory.DatabaseConnectorFromSettings();
+            _dbQuery = _dbConnector.DbCommand("SELECT * FROM tblUpdate");
             _lastDatabaseUpdateTime = default(DateTime);
         }
 
@@ -46,11 +45,13 @@ namespace mRemoteNG.Config.Connections
         {
             try
             {
-                _sqlConnector.Connect();
+                _dbConnector.Connect();
             }
-            catch(Exception e)
+            catch (Exception e)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Unable to connect to Sql DB to check for updates." + Environment.NewLine + e.Message, true);
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
+                                                    "Unable to connect to Sql DB to check for updates." +
+                                                    Environment.NewLine + e.Message, true);
             }
         }
 
@@ -63,7 +64,9 @@ namespace mRemoteNG.Config.Connections
 
         private bool CheckIfIAmTheLastOneUpdated(DateTime lastUpdateInDb)
         {
-            DateTime lastSqlUpdateWithoutMilliseconds = new DateTime(LastUpdateTime.Ticks - (LastUpdateTime.Ticks % TimeSpan.TicksPerSecond), LastUpdateTime.Kind);
+            DateTime lastSqlUpdateWithoutMilliseconds =
+                new DateTime(LastUpdateTime.Ticks - (LastUpdateTime.Ticks % TimeSpan.TicksPerSecond),
+                             LastUpdateTime.Kind);
             return lastUpdateInDb == lastSqlUpdateWithoutMilliseconds;
         }
 
@@ -72,7 +75,7 @@ namespace mRemoteNG.Config.Connections
             var lastUpdateInDb = default(DateTime);
             try
             {
-                var sqlReader = _sqlQuery.ExecuteReader(CommandBehavior.CloseConnection);
+                var sqlReader = _dbQuery.ExecuteReader(CommandBehavior.CloseConnection);
                 sqlReader.Read();
                 if (sqlReader.HasRows)
                     lastUpdateInDb = Convert.ToDateTime(sqlReader["LastUpdate"]);
@@ -80,20 +83,25 @@ namespace mRemoteNG.Config.Connections
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, "Error executing Sql query to get updates from the DB." + Environment.NewLine + ex.Message, true);
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
+                                                    "Error executing Sql query to get updates from the DB." +
+                                                    Environment.NewLine + ex.Message, true);
             }
+
             _lastDatabaseUpdateTime = lastUpdateInDb;
             return lastUpdateInDb;
         }
 
 
         public event EventHandler UpdateCheckStarted;
+
         private void RaiseUpdateCheckStartedEvent()
         {
             UpdateCheckStarted?.Invoke(this, EventArgs.Empty);
         }
 
         public event UpdateCheckFinishedEventHandler UpdateCheckFinished;
+
         private void RaiseUpdateCheckFinishedEvent(bool updateAvailable)
         {
             var args = new ConnectionsUpdateCheckFinishedEventArgs {UpdateAvailable = updateAvailable};
@@ -101,10 +109,11 @@ namespace mRemoteNG.Config.Connections
         }
 
         public event ConnectionsUpdateAvailableEventHandler ConnectionsUpdateAvailable;
+
         private void RaiseConnectionsUpdateAvailableEvent()
         {
             Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Remote connection update is available");
-            var args = new ConnectionsUpdateAvailableEventArgs(_sqlConnector, _lastDatabaseUpdateTime);
+            var args = new ConnectionsUpdateAvailableEventArgs(_dbConnector, _lastDatabaseUpdateTime);
             ConnectionsUpdateAvailable?.Invoke(this, args);
         }
 
@@ -116,9 +125,9 @@ namespace mRemoteNG.Config.Connections
         private void Dispose(bool itIsSafeToDisposeManagedObjects)
         {
             if (!itIsSafeToDisposeManagedObjects) return;
-            _sqlConnector.Disconnect();
-            _sqlConnector.Dispose();
-            _sqlQuery.Dispose();
+            _dbConnector.Disconnect();
+            _dbConnector.Dispose();
+            _dbQuery.Dispose();
         }
     }
 }

mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs

@@ -19,9 +19,11 @@ namespace mRemoteNG.Config.Connections
             connectionsService.ConnectionsLoaded += ConnectionsServiceOnConnectionsLoaded;
         }
 
-        private void ConnectionsServiceOnConnectionsLoaded(object sender, ConnectionsLoadedEventArgs connectionsLoadedEventArgs)
+        private void ConnectionsServiceOnConnectionsLoaded(object sender,
+                                                           ConnectionsLoadedEventArgs connectionsLoadedEventArgs)
         {
-            connectionsLoadedEventArgs.NewConnectionTreeModel.CollectionChanged += ConnectionTreeModelOnCollectionChanged;
+            connectionsLoadedEventArgs.NewConnectionTreeModel.CollectionChanged +=
+                ConnectionTreeModelOnCollectionChanged;
             connectionsLoadedEventArgs.NewConnectionTreeModel.PropertyChanged += ConnectionTreeModelOnPropertyChanged;
 
             foreach (var oldTree in connectionsLoadedEventArgs.PreviousConnectionTreeModel)
@@ -31,19 +33,22 @@ namespace mRemoteNG.Config.Connections
             }
         }
 
-        private void ConnectionTreeModelOnPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs)
+        private void ConnectionTreeModelOnPropertyChanged(object sender,
+                                                          PropertyChangedEventArgs propertyChangedEventArgs)
         {
             SaveConnectionOnEdit(propertyChangedEventArgs.PropertyName);
         }
 
-        private void ConnectionTreeModelOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
+        private void ConnectionTreeModelOnCollectionChanged(object sender,
+                                                            NotifyCollectionChangedEventArgs
+                                                                notifyCollectionChangedEventArgs)
         {
             SaveConnectionOnEdit();
         }
 
         private void SaveConnectionOnEdit(string propertyName = "")
         {
-            if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
+            if (!Properties.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
             if (FrmMain.Default.IsClosing)
                 return;
@@ -51,4 +56,4 @@ namespace mRemoteNG.Config.Connections
             _connectionsService.SaveConnectionsAsync(propertyName);
         }
     }
-}
+}

mRemoteNG/Config/Connections/SaveFormat.cs

@@ -7,4 +7,4 @@
         mRCSV,
         SQL
     }
-}
+}

mRemoteNG/Config/Connections/SqlConnectionsLoader.cs

@@ -5,7 +5,7 @@ using System.Security;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.MsSql;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -17,25 +17,28 @@ using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Connections
 {
-	public class SqlConnectionsLoader : IConnectionsLoader
+    public class SqlConnectionsLoader : IConnectionsLoader
     {
-        private readonly IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>> _localConnectionPropertiesDeserializer;
+        private readonly IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>>
+            _localConnectionPropertiesDeserializer;
+
         private readonly IDataProvider<string> _dataProvider;
 
         public Func<Optional<SecureString>> AuthenticationRequestor { get; set; } =
             () => MiscTools.PasswordDialog("", false);
 
         public SqlConnectionsLoader(
-            IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>> localConnectionPropertiesDeserializer, 
+            IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>> localConnectionPropertiesDeserializer,
             IDataProvider<string> dataProvider)
         {
-            _localConnectionPropertiesDeserializer = localConnectionPropertiesDeserializer.ThrowIfNull(nameof(localConnectionPropertiesDeserializer));
+            _localConnectionPropertiesDeserializer =
+                localConnectionPropertiesDeserializer.ThrowIfNull(nameof(localConnectionPropertiesDeserializer));
             _dataProvider = dataProvider.ThrowIfNull(nameof(dataProvider));
         }
 
         public ConnectionTreeModel Load()
         {
-            var connector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings();
+            var connector = DatabaseConnectorFactory.DatabaseConnectorFromSettings();
             var dataProvider = new SqlDataProvider(connector);
             var metaDataRetriever = new SqlDatabaseMetaDataRetriever();
             var databaseVersionVerifier = new SqlDatabaseVersionVerifier(connector);
@@ -61,7 +64,9 @@ namespace mRemoteNG.Config.Connections
             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
             var cipherText = metaData.Protected;
             var authenticator = new PasswordAuthenticator(cryptographyProvider, cipherText, AuthenticationRequestor);
-            var authenticated = authenticator.Authenticate(new RootNodeInfo(RootNodeType.Connection).DefaultPassword.ConvertToSecureString());
+            var authenticated =
+                authenticator.Authenticate(new RootNodeInfo(RootNodeType.Connection).DefaultPassword
+                                                                                    .ConvertToSecureString());
 
             if (authenticated)
                 return authenticator.LastAuthenticatedPassword;
@@ -75,19 +80,20 @@ namespace mRemoteNG.Config.Connections
 
             rootNode
                 .GetRecursiveChildList()
-                .Join(localConnectionProperties, 
-                    con => con.ConstantID, 
-                    locals => locals.ConnectionId,
-                    (con, locals) => new {Connection = con, LocalProperties = locals})
+                .Join(localConnectionProperties,
+                      con => con.ConstantID,
+                      locals => locals.ConnectionId,
+                      (con, locals) => new {Connection = con, LocalProperties = locals})
                 .ForEach(x =>
                 {
                     x.Connection.PleaseConnect = x.LocalProperties.Connected;
+                    x.Connection.Favorite = x.LocalProperties.Favorite;
                     if (x.Connection is ContainerInfo container)
                         container.IsExpanded = x.LocalProperties.Expanded;
                 });
         }
 
-        private SqlConnectionListMetaData HandleFirstRun(SqlDatabaseMetaDataRetriever metaDataRetriever, SqlDatabaseConnector connector)
+        private SqlConnectionListMetaData HandleFirstRun(SqlDatabaseMetaDataRetriever metaDataRetriever, IDatabaseConnector connector)
         {
 	        metaDataRetriever.WriteDatabaseMetaData(new RootNodeInfo(RootNodeType.Connection), connector);
 	        return metaDataRetriever.GetDatabaseMetaData(connector);

mRemoteNG/Config/Connections/SqlConnectionsSaver.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Globalization;
 using System.Linq;
 using mRemoteNG.App;
@@ -8,11 +7,12 @@ using mRemoteNG.App.Info;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.MsSql;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql;
 using mRemoteNG.Config.Serializers.Versioning;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
@@ -27,10 +27,10 @@ namespace mRemoteNG.Config.Connections
         private readonly ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string> _localPropertiesSerializer;
         private readonly IDataProvider<string> _dataProvider;
 
-        public SqlConnectionsSaver(
-            SaveFilter saveFilter, 
-            ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string> localPropertieSerializer,
-            IDataProvider<string> localPropertiesDataProvider)
+        public SqlConnectionsSaver(SaveFilter saveFilter,
+                                   ISerializer<IEnumerable<LocalConnectionPropertiesModel>, string>
+                                       localPropertieSerializer,
+                                   IDataProvider<string> localPropertiesDataProvider)
         {
             if (saveFilter == null)
                 throw new ArgumentNullException(nameof(saveFilter));
@@ -47,33 +47,36 @@ namespace mRemoteNG.Config.Connections
 
             if (PropertyIsLocalOnly(propertyNameTrigger))
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, 
-                    $"Property {propertyNameTrigger} is local only. Not saving to database.");
+                Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg,
+                                                    $"Property {propertyNameTrigger} is local only. Not saving to database.");
                 return;
             }
 
             if (SqlUserIsReadOnly())
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Trying to save connection tree but the SQL read only checkbox is checked, aborting!");
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
+                                                    "Trying to save connection tree but the SQL read only checkbox is checked, aborting!");
                 return;
             }
 
-            using (var sqlConnector = DatabaseConnectorFactory.SqlDatabaseConnectorFromSettings())
+            using (var dbConnector = DatabaseConnectorFactory.DatabaseConnectorFromSettings())
             {
-                sqlConnector.Connect();
-                var databaseVersionVerifier = new SqlDatabaseVersionVerifier(sqlConnector);
+                dbConnector.Connect();
+                var databaseVersionVerifier = new SqlDatabaseVersionVerifier(dbConnector);
                 var metaDataRetriever = new SqlDatabaseMetaDataRetriever();
-                var metaData = metaDataRetriever.GetDatabaseMetaData(sqlConnector);
+                var metaData = metaDataRetriever.GetDatabaseMetaData(dbConnector);
 
                 if (!databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion))
                 {
-                    Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strErrorConnectionListSaveFailed);
+                    Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
+                                                        Language.ErrorConnectionListSaveFailed);
                     return;
                 }
 
-                metaDataRetriever.WriteDatabaseMetaData(rootTreeNode, sqlConnector);
-                UpdateConnectionsTable(rootTreeNode, sqlConnector);
-                UpdateUpdatesTable(sqlConnector);
+                metaDataRetriever.WriteDatabaseMetaData(rootTreeNode, dbConnector);
+                UpdateConnectionsTable(rootTreeNode, dbConnector);
+                UpdateUpdatesTable(dbConnector);
+
             }
 
             Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Saved connections to database");
@@ -90,7 +93,8 @@ namespace mRemoteNG.Config.Connections
         private bool PropertyIsLocalOnly(string property)
         {
             return property == nameof(ConnectionInfo.OpenConnections) ||
-                   property == nameof(ContainerInfo.IsExpanded);
+                   property == nameof(ContainerInfo.IsExpanded) ||
+                   property == nameof(ContainerInfo.Favorite);
         }
 
         private void UpdateLocalConnectionProperties(ContainerInfo rootNode)
@@ -99,7 +103,8 @@ namespace mRemoteNG.Config.Connections
             {
                 ConnectionId = info.ConstantID,
                 Connected = info.OpenConnections.Count > 0,
-                Expanded = info is ContainerInfo c && c.IsExpanded
+                Expanded = info is ContainerInfo c && c.IsExpanded,
+                Favorite = info.Favorite,
             });
 
             var serializedProperties = _localPropertiesSerializer.Serialize(a);
@@ -107,7 +112,7 @@ namespace mRemoteNG.Config.Connections
             Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Saved local connection properties");
         }
 
-        private void UpdateRootNodeTable(RootNodeInfo rootTreeNode, SqlDatabaseConnector sqlDatabaseConnector)
+        private void UpdateRootNodeTable(RootNodeInfo rootTreeNode, IDatabaseConnector databaseConnector)
         {
             var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
             string strProtected;
@@ -128,49 +133,52 @@ namespace mRemoteNG.Config.Connections
                 strProtected = cryptographyProvider.Encrypt("ThisIsNotProtected", Runtime.EncryptionKey);
             }
 
-            var sqlQuery = new SqlCommand("DELETE FROM tblRoot", sqlDatabaseConnector.SqlConnection);
-            sqlQuery.ExecuteNonQuery();
+            var dbQuery = databaseConnector.DbCommand("DELETE FROM tblRoot");
+            dbQuery.ExecuteNonQuery();
 
             if (rootTreeNode != null)
             {
-                sqlQuery =
-                    new SqlCommand(
+                dbQuery =
+                    databaseConnector.DbCommand(
                         "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES(\'" +
                         MiscTools.PrepareValueForDB(rootTreeNode.Name) + "\', 0, \'" + strProtected + "\'," +
-                        ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) + ")",
-                        sqlDatabaseConnector.SqlConnection);
-                sqlQuery.ExecuteNonQuery();
+                        ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) + ")");
+                dbQuery.ExecuteNonQuery();
             }
             else
             {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, $"UpdateRootNodeTable: rootTreeNode was null. Could not insert!");
+                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
+                                                    $"UpdateRootNodeTable: rootTreeNode was null. Could not insert!");
             }
         }
 
-        private void UpdateConnectionsTable(RootNodeInfo rootTreeNode, SqlDatabaseConnector sqlDatabaseConnector)
+        private void UpdateConnectionsTable(RootNodeInfo rootTreeNode, IDatabaseConnector databaseConnector)
         {
-            var cryptoProvider = new LegacyRijndaelCryptographyProvider();
-            var serializer = new DataTableSerializer(_saveFilter, cryptoProvider, rootTreeNode.PasswordString.ConvertToSecureString());
-            var dataTable = serializer.Serialize(rootTreeNode);
-            var dataProvider = new SqlDataProvider(sqlDatabaseConnector);
+            var dataProvider = new SqlDataProvider(databaseConnector);
+            var currentDataTable = dataProvider.Load();
+
+            var cryptoProvider = new LegacyRijndaelCryptographyProvider();
+            var serializer = new DataTableSerializer(_saveFilter, cryptoProvider,
+                                                     rootTreeNode.PasswordString.ConvertToSecureString());
+            serializer.SetSourceDataTable(currentDataTable);
+            var dataTable = serializer.Serialize(rootTreeNode);
+            //var dbQuery = databaseConnector.DbCommand("DELETE FROM tblCons");
+            //dbQuery.ExecuteNonQuery();
 
-            var sqlQuery = new SqlCommand("DELETE FROM tblCons", sqlDatabaseConnector.SqlConnection);
-            sqlQuery.ExecuteNonQuery();
             dataProvider.Save(dataTable);
         }
 
-        private void UpdateUpdatesTable(SqlDatabaseConnector sqlDatabaseConnector)
+        private void UpdateUpdatesTable(IDatabaseConnector databaseConnector)
         {
-            var sqlQuery = new SqlCommand("DELETE FROM tblUpdate", sqlDatabaseConnector.SqlConnection);
-            sqlQuery.ExecuteNonQuery();
-            sqlQuery = new SqlCommand("INSERT INTO tblUpdate (LastUpdate) VALUES(\'" + MiscTools.DBDate(DateTime.Now) + "\')", sqlDatabaseConnector.SqlConnection);
-            sqlQuery.ExecuteNonQuery();
+            var dbQuery = databaseConnector.DbCommand("DELETE FROM tblUpdate");
+            dbQuery.ExecuteNonQuery();
+            dbQuery = databaseConnector.DbCommand("INSERT INTO tblUpdate (LastUpdate) VALUES(\'" + MiscTools.DBDate(DateTime.Now) + "\')");
+            dbQuery.ExecuteNonQuery();
         }
 
         private bool SqlUserIsReadOnly()
         {
-            return mRemoteNG.Settings.Default.SQLReadOnly;
-
+            return Properties.Settings.Default.SQLReadOnly;
         }
     }
-}
+}

mRemoteNG/Config/Connections/XmlConnectionsLoader.cs

@@ -1,10 +1,10 @@
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using System;
 using System.IO;
 using System.Security;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -33,8 +33,8 @@ namespace mRemoteNG.Config.Connections
 
         private Optional<SecureString> PromptForPassword()
         {
-            var password = MiscTools.PasswordDialog("", false);
+            var password = MiscTools.PasswordDialog(Path.GetFileName(_connectionFilePath), false);
             return password;
         }
     }
-}
+}

mRemoteNG/Config/Connections/XmlConnectionsSaver.cs

@@ -2,8 +2,7 @@
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
@@ -32,15 +31,16 @@ namespace mRemoteNG.Config.Connections
             try
             {
                 var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
-                var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
+                var serializerFactory = new XmlConnectionSerializerFactory();
+                
+                var xmlConnectionsSerializer = serializerFactory.Build(
                     cryptographyProvider,
-                    connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
-                    _saveFilter);
-                var xmlConnectionsSerializer = new XmlConnectionsSerializer(cryptographyProvider, connectionNodeSerializer)
-                {
-                    UseFullEncryption = mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile
-                };
-                var xml = xmlConnectionsSerializer.Serialize(connectionTreeModel);
+                    connectionTreeModel,
+                    _saveFilter,
+                    Properties.Settings.Default.EncryptCompleteConnectionsFile);
+
+                var rootNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
+                var xml = xmlConnectionsSerializer.Serialize(rootNode);
 
                 var fileDataProvider = new FileDataProviderWithRollingBackup(_connectionFileName);
                 fileDataProvider.Save(xml);
@@ -51,4 +51,4 @@ namespace mRemoteNG.Config.Connections
             }
         }
     }
-}
+}

mRemoteNG/Config/CredentialHarvester.cs

@@ -14,13 +14,14 @@ namespace mRemoteNG.Config
         private readonly IEqualityComparer<ICredentialRecord> _credentialComparer = new CredentialDomainUserComparer();
 
         // maps a connectioninfo (by its id) to the credential object that was harvested
-        public Dictionary<Guid, ICredentialRecord> ConnectionToCredentialMap { get; } = new Dictionary<Guid, ICredentialRecord>();
+        public Dictionary<Guid, ICredentialRecord> ConnectionToCredentialMap { get; } =
+            new Dictionary<Guid, ICredentialRecord>();
 
         public IEnumerable<ICredentialRecord> Harvest(XDocument xDocument, SecureString decryptionKey)
         {
             if (xDocument == null)
                 throw new ArgumentNullException(nameof(xDocument));
-            
+
             var cryptoProvider = new CryptoProviderFactoryFromXml(xDocument.Root).Build();
 
             foreach (var element in xDocument.Descendants("Node"))
@@ -37,7 +38,9 @@ namespace mRemoteNG.Config
 
                 if (ConnectionToCredentialMap.Values.Contains(newCredential, _credentialComparer))
                 {
-                    var existingCredential = ConnectionToCredentialMap.Values.First(record => _credentialComparer.Equals(newCredential, record));
+                    var existingCredential =
+                        ConnectionToCredentialMap.Values.First(record =>
+                                                                   _credentialComparer.Equals(newCredential, record));
                     ConnectionToCredentialMap.Add(connectionId, existingCredential);
                 }
                 else
@@ -47,21 +50,24 @@ namespace mRemoteNG.Config
             return ConnectionToCredentialMap.Values.Distinct(_credentialComparer);
         }
 
-        private ICredentialRecord BuildCredential(XElement element, ICryptographyProvider cryptographyProvider, SecureString decryptionKey)
+        private ICredentialRecord BuildCredential(XElement element,
+                                                  ICryptographyProvider cryptographyProvider,
+                                                  SecureString decryptionKey)
         {
             var credential = new CredentialRecord
             {
                 Title = $"{element.Attribute("Username")?.Value}\\{element.Attribute("Domain")?.Value}",
                 Username = element.Attribute("Username")?.Value,
                 Domain = element.Attribute("Domain")?.Value,
-                Password = cryptographyProvider.Decrypt(element.Attribute("Password")?.Value, decryptionKey).ConvertToSecureString()
+                Password = cryptographyProvider.Decrypt(element.Attribute("Password")?.Value, decryptionKey)
+                                               .ConvertToSecureString()
             };
             return credential;
         }
 
         private static bool EntryHasSomeCredentialData(XElement e)
         {
-            return e.Attribute("Username")?.Value != "" || 
+            return e.Attribute("Username")?.Value != "" ||
                    e.Attribute("Domain")?.Value != "" ||
                    e.Attribute("Password")?.Value != "";
         }

mRemoteNG/Config/CredentialRecordLoader.cs

@@ -13,7 +13,8 @@ namespace mRemoteNG.Config
         private readonly IDataProvider<string> _dataProvider;
         private readonly ISecureDeserializer<string, IEnumerable<ICredentialRecord>> _deserializer;
 
-        public CredentialRecordLoader(IDataProvider<string> dataProvider, ISecureDeserializer<string, IEnumerable<ICredentialRecord>> deserializer)
+        public CredentialRecordLoader(IDataProvider<string> dataProvider,
+                                      ISecureDeserializer<string, IEnumerable<ICredentialRecord>> deserializer)
         {
             if (dataProvider == null)
                 throw new ArgumentNullException(nameof(dataProvider));

mRemoteNG/Config/CredentialRecordSaver.cs

@@ -13,7 +13,8 @@ namespace mRemoteNG.Config
         private readonly IDataProvider<string> _dataProvider;
         private readonly ISecureSerializer<IEnumerable<ICredentialRecord>, string> _serializer;
 
-        public CredentialRecordSaver(IDataProvider<string> dataProvider, ISecureSerializer<IEnumerable<ICredentialRecord>, string> serializer)
+        public CredentialRecordSaver(IDataProvider<string> dataProvider,
+                                     ISecureSerializer<IEnumerable<ICredentialRecord>, string> serializer)
         {
             if (dataProvider == null)
                 throw new ArgumentNullException(nameof(dataProvider));

mRemoteNG/Config/CredentialRepositoryListLoader.cs

@@ -11,7 +11,8 @@ namespace mRemoteNG.Config
         private readonly IDataProvider<string> _dataProvider;
         private readonly CredentialRepositoryListDeserializer _deserializer;
 
-        public CredentialRepositoryListLoader(IDataProvider<string> dataProvider, CredentialRepositoryListDeserializer deserializer)
+        public CredentialRepositoryListLoader(IDataProvider<string> dataProvider,
+                                              CredentialRepositoryListDeserializer deserializer)
         {
             if (dataProvider == null)
                 throw new ArgumentNullException(nameof(dataProvider));

mRemoteNG/Config/CredentialRepositoryListSaver.cs

@@ -25,4 +25,4 @@ namespace mRemoteNG.Config
             _dataProvider.Save(data);
         }
     }
-}
+}