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

@@ -285,4 +285,4 @@ InstallerProjects/Installer/Resources/License.rtf
 
 # gh-pages info
 runlocal.bat
-/_site
+/_site

CREDITS.TXT

@@ -1,150 +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
-Faryan Rezagholi (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)
-Aleksey Reytsman (github.com/areytsman)
-Cristian Abelleira (github.com/CrAbelleira)
-github.com/MitchellBot
-
-
-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)
-github.com/wwj402
-github.com/Fyers
-github.com/pablomh
-
-
-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> 2018 @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,22 +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>
-      <Component Id="C.TileManifest" Guid="*">
-        <File Id="TileManifest" Name="mRemoteNG.VisualElementsManifest.xml" Source="$(var.SolutionDir)mRemoteV1\bin\Release\mRemoteNG.VisualElementsManifest.xml" KeyPath="yes" />
-      </Component>
-    </ComponentGroup>
-	</Fragment>
-</Wix>

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>
 
-[![Github Releases](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/total.svg?style=flat-square)](https://github.com/mRemoteNG/mRemoteNG/releases/)
+<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>
 
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)
+<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.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
-| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
-| 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.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
-
-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 polyglot
+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/appveyor_after_build.ps1

@@ -1,73 +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="Tools\exes\sigcheck.exe"
-$SEVENZIP="Tools\7zip\7za.exe"
-
-if ($ConfigurationName -eq "Release Portable") {
-    Write-Output "Packaging Release Portable ZIP"
-   
-    $version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
-
-    Write-Output "Version is $($version)"
-
-    $PortableZip="Release\mRemoteNG-Portable-$($version).zip"
-
-    Remove-Item -Recurse "mRemoteV1\bin\package" -ErrorAction SilentlyContinue | Out-Null
-    New-Item "mRemoteV1\bin\package" -ItemType  "directory" | Out-Null
-    
-    Copy-Item "mRemoteV1\Resources\PuTTYNG.exe" -Destination "mRemoteV1\bin\package"
-
-    Copy-Item "mRemoteV1\bin\$ConfigurationName\*" -Destination "mRemoteV1\bin\package" -Recurse -Force -Exclude *.pdb
-    Copy-Item "*.txt" -Destination "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 ".\mRemoteV1\bin\package\*.*"
-}
-else {
-    Write-Output "We will not zip anything - this isnt a portable release build."
-}
-
-Write-Output ""
-Write-Output ""
-
-if ($ConfigurationName -match "Release" -And $ConfigurationName -ne "Release Installer") {
-    Write-Output "Packaging debug symbols"
-   
-    $version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
-
-    Write-Output "Version is $($version)"
-
-    if ($ConfigurationName -match "Portable") {
-        $zipFilePrefix = "mRemoteNG-Portable-symbols"
-    } else {
-        $zipFilePrefix = "mRemoteNG-symbols"
-    }
-
-    $outputZipPath="Release\$zipFilePrefix-$($version).zip"
-
-    Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
-    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
-    $SymPath = (Join-Path -Path mRemoteV1\bin\$($ConfigurationName) -ChildPath "*.pdb")
-    if(Test-Path "$SymPath") {
-    	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath "$SymPath"
-    } else {
-    	Write-Output "No Debugging Symbols Found..."
-    }
-    	
-}
-else {
-    Write-Output "We will not package debug symbols for this configuration $($ConfigurationName)"
-}
-
-Write-Output ""

Tools/appveyor_publish_build.ps1

@@ -1,83 +0,0 @@
-if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
-    Write-Output "NOT running via Appveyor - Exiting"
-    Throw "NOT running via Appveyor - Exiting"
-}
-
-$appvDir = $Env:APPVEYOR_BUILD_FOLDER
-	
-$SIGCHECK="Tools\exes\sigcheck.exe"
-$SEVENZIP="Tools\7zip\7za.exe"
-
-Write-Output "Appveyor Build Dir: '$($appvDir)'"
-
-Write-Output "Decrypt Cert"
-& appveyor-tools\secure-file -decrypt "$($Env:cert_path).enc" -secret "$Env:cert_decrypt_pwd"
-
-if(-Not (Test-Path $Env:cert_path)) {
-		Write-Output "decrypt cert does not exist..."
-		Throw "Could not decrypt cert"
-}
-
-Write-Output "Restoring NuGets"
-& nuget restore
-
-
-Write-Output "Build Release Installer"
-& msbuild "$($appvDir)\mRemoteV1.sln" /nologo /t:Clean,Build /p:Configuration="Release Installer" /p:Platform=x86 /p:CertPath="$($Env:cert_path)" /p:CertPassword="$Env:cert_pwd" /m /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-
-Write-Output "Packaging debug symbols"
-   
-$version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\Release\mRemoteNG.exe"
-
-Write-Output "Version is $($version)"
-
-$zipFilePrefix = "mRemoteNG-symbols"
-
-
-$outputZipPath="Release\$zipFilePrefix-$($version).zip"
-
-Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
-Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
-$SymPath = (Join-Path -Path "mRemoteV1\bin\Release" -ChildPath "*.pdb")
-if(Test-Path "$SymPath") {
-	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath "$SymPath"
-} else {
-	Write-Output "No Debugging Symbols Found..."
-}
-    
-
-Write-Output "Build Release Portable"
-& msbuild "$($appvDir)\mRemoteV1.sln" /nologo /t:Clean,Build /p:Configuration="Release Portable" /p:Platform=x86 /p:CertPath="$($Env:cert_path)" /p:CertPassword="$Env:cert_pwd" /m /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-
-
-Write-Output "Packaging Release Portable ZIP"
-
-$version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\Release Portable\mRemoteNG.exe"
-
-Write-Output "Version is $($version)"
-
-$zipFilePrefix = "mRemoteNG-Portable-symbols"
-$outputZipPath="Release\$zipFilePrefix-$($version).zip"
-
-Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
-Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
-$SymPath = (Join-Path -Path "mRemoteV1\bin\Release Portable" -ChildPath "*.pdb")
-if(Test-Path "$SymPath") {
-	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath "$SymPath"
-} else {
-	Write-Output "No Debugging Symbols Found..."
-}
-
-$PortableZip="Release\mRemoteNG-Portable-$($version).zip"
-
-Remove-Item -Recurse "mRemoteV1\bin\package" -ErrorAction SilentlyContinue | Out-Null
-New-Item "mRemoteV1\bin\package" -ItemType  "directory" | Out-Null
-
-Copy-Item "mRemoteV1\Resources\PuTTYNG.exe" -Destination "mRemoteV1\bin\package"
-
-Copy-Item "mRemoteV1\bin\Release Portable\*" -Destination "mRemoteV1\bin\package" -Recurse  -Force 
-Copy-Item "*.txt" -Destination "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 ".\mRemoteV1\bin\package\*.*"

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

@@ -11,9 +11,7 @@ param (
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 Write-Output "Copying TILES folder to output"
 
-$sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteV1\Resources\Tiles' ) 
-$DestinationDir = $TargetDir 
-
-robocopy $sourceFiles $DestinationDir *.*
+$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_mremoteng.ps1

@@ -26,7 +26,7 @@ param (
 )
 
 Write-Output "+=================================================================+"
-Write-Output "|                  Beginning mRemoteV1 Post Build                 |"
+Write-Output "|                  Beginning mRemoteNG Post Build                 |"
 Write-Output "+=================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
@@ -42,7 +42,7 @@ Format-Table -AutoSize -Wrap -InputObject @{
 & "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\copy_themes.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\copy_tiles.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
-& "$PSScriptRoot\move_help_files.ps1" -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

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/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",

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_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,46 +0,0 @@
-version: 1.76.{build}
-pull_requests:
-  do_not_increment_build_number: true
-skip_tags: true
-skip_branch_with_pr: true
-image: Visual Studio 2017
-configuration:
-- Release
-- Release Portable
-- Release Installer
-platform: x86
-shallow_clone: true
-clone_depth: 1
-install:
-- ps: >-
-    date
-
-    mRemoteV1\Resources\CitrixReceiver.exe ENABLE_SSON="No" /silent /noreboot /EnableCEIP=false /AutoUpdateCheck=disabled /EnableTracing=false | out-null
-
-    date
-before_build:
-- cmd: >-
-    echo %TIME%
-
-    nuget restore
-
-    echo %TIME%
-build:
-  project: mRemoteV1.sln
-  parallel: true
-  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=\"Tools\\exes\\sigcheck.exe\"\n$SEVENZIP=\"Tools\\7zip\\7za.exe\"\n\nif ($ConfigurationName -eq \"Release Portable\") {\n    Write-Output \"Packaging Release Portable ZIP\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    $PortableZip=\"Release\\mRemoteNG-Portable-$($version).zip\"\n\n    Remove-Item -Recurse \"mRemoteV1\\bin\\package\" -ErrorAction SilentlyContinue | Out-Null\n    New-Item \"mRemoteV1\\bin\\package\" -ItemType  \"directory\" | Out-Null\n    \n    Copy-Item \"mRemoteV1\\Resources\\PuTTYNG.exe\" -Destination \"mRemoteV1\\bin\\package\"\n\n    Copy-Item \"mRemoteV1\\bin\\$ConfigurationName\\*\" -Destination \"mRemoteV1\\bin\\package\" -Recurse -Force -Exclude *.pdb\n    Copy-Item \"*.txt\" -Destination \"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 \".\\mRemoteV1\\bin\\package\\*.*\"\n}\nelse {\n    Write-Output \"We will not zip anything - this isnt a portable release build.\"\n}\n\nWrite-Output \"\"\nWrite-Output \"\"\n\nif ($ConfigurationName -match \"Release\" -And $ConfigurationName -ne \"Release Installer\") {\n    Write-Output \"Packaging debug symbols\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    if ($ConfigurationName -match \"Portable\") {\n        $zipFilePrefix = \"mRemoteNG-Portable-symbols\"\n    } else {\n        $zipFilePrefix = \"mRemoteNG-symbols\"\n    }\n\n    $outputZipPath=\"Release\\$zipFilePrefix-$($version).zip\"\n\n    Write-Output \"Creating debug symbols ZIP file $($outputZipPath)\"\n    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue\n    $SymPath = (Join-Path -Path mRemoteV1\\bin\\$($ConfigurationName) -ChildPath \"*.pdb\")\n    if(Test-Path \"$SymPath\") {\n    	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath \"$SymPath\"\n    } else {\n    	Write-Output \"No Debugging Symbols Found...\"\n    }\n    	\n}\nelse {\n    Write-Output \"We will not package debug symbols for this configuration $($ConfigurationName)\"\n}\n\nWrite-Output \"\""
-test:
-  assemblies:
-    only:
-    - mRemoteNGTests\bin\$(configuration)\mRemoteNGTests.dll
-artifacts:
-- path: Release\*.msi
-  name: mRemoteNG-installer.msi
-- path: Release\mRemoteNG-Portable-1.*.zip
-  name: mRemoteNG-portable.zip
-- path: Release\mRemoteNG-Portable-symbols*.zip
-  name: mRemoteNG-Portable-symbols.zip
-- path: Release\mRemoteNG-symbols*.zip
-  name: mRemoteNG-symbols.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-3.0.6.0" newVersion="3.0.6.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,108 +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="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
-  <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 />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </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.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.11.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" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
-  </Target>
-  <!-- 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.11.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.9.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.9.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.5" targetFramework="net46" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net46" />
-  <package id="NUnit.Runners" version="3.9.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
@@ -100,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

@@ -13,6 +13,15 @@ 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
 
@@ -41,4 +50,4 @@ 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
+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.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,24 +23,26 @@ 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);
 
             //About to pop up a message, let's not block it...
             FrmSplashScreen.getInstance().Close();
 
             var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName,
-                                                                Language.strCompatibilityProblemDetected, errorText, "",
+                                                                Language.CompatibilityProblemDetected, errorText, "",
                                                                 "",
-                                                                Language.strCheckboxDoNotShowThisMessageAgain,
+                                                                Language.CheckboxDoNotShowThisMessageAgain,
                                                                 ETaskDialogButtons.OkCancel, ESysIcons.Warning,
                                                                 ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked && ShouldIStayOrShouldIGo == DialogResult.OK)
@@ -55,21 +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)
@@ -89,11 +90,18 @@ namespace mRemoteNG.App
                 messageCollector.AddExceptionMessage("Error in CheckLenovoAutoScrollUtility", ex);
             }
 
-            if (proccesses.Length <= 0) return;
-            CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected,
-                                   string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected,
+            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.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok,
+                                   "", Language.CheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok,
                                    ESysIcons.Warning,
                                    ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked)

mRemoteNG/App/Export.cs

@@ -4,8 +4,8 @@ using System.Windows.Forms;
 using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.DataProviders;
 using mRemoteNG.Config.Serializers;
-using mRemoteNG.Config.Serializers.Csv;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -25,7 +25,7 @@ namespace mRemoteNG.App
             {
                 var saveFilter = new SaveFilter();
 
-                using (var exportForm = new ExportForm())
+                using (var exportForm = new FrmExport())
                 {
                     if (selectedNode?.GetTreeNodeType() == TreeNodeType.Container)
                         exportForm.SelectedFolder = selectedNode as ContainerInfo;
@@ -42,10 +42,10 @@ namespace mRemoteNG.App
                     ConnectionInfo exportTarget;
                     switch (exportForm.Scope)
                     {
-                        case ExportForm.ExportScope.SelectedFolder:
+                        case FrmExport.ExportScope.SelectedFolder:
                             exportTarget = exportForm.SelectedFolder;
                             break;
-                        case ExportForm.ExportScope.SelectedConnection:
+                        case FrmExport.ExportScope.SelectedConnection:
                             exportTarget = exportForm.SelectedConnection;
                             break;
                         default:

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));
                 }
             }

mRemoteNG/App/Info/ConnectionsFileInfo.cs

@@ -5,6 +5,6 @@
         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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -11,10 +11,10 @@ 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 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;
 

mRemoteNG/App/Info/UpdateChannelInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using mRemoteNG.Properties;
 
 // ReSharper disable InconsistentNaming
 

mRemoteNG/App/Initialization/CredsAndConsSetup.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using mRemoteNG.Config.Connections;
+using mRemoteNG.Properties;
 
 namespace mRemoteNG.App.Initialization
 {

mRemoteNG/App/Initialization/MessageCollectorSetup.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using mRemoteNG.Messages;
+using mRemoteNG.Messages.MessageFilteringOptions;
 using mRemoteNG.Messages.MessageWriters;
 using mRemoteNG.Messages.WriterDecorators;
 

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
 {
@@ -76,7 +77,7 @@ namespace mRemoteNG.App.Initialization
             var architecture = string.Empty;
             try
             {
-                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_Processor WHERE DeviceID=\'CPU0\'")
+                foreach (var o in new ManagementObjectSearcher("SELECT AddressWidth FROM Win32_Processor WHERE DeviceID=\'CPU0\'")
                     .Get())
                 {
                     var managementObject = (ManagementObject)o;
@@ -96,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);
         }

mRemoteNG/App/Logger.cs

@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using log4net;
 using log4net.Appender;
 using log4net.Config;
+using mRemoteNG.Properties;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 
@@ -24,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();
 
@@ -33,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)
@@ -44,7 +45,7 @@ namespace mRemoteNG.App
                 fileAppender.ActivateOptions();
             }
 
-            Log = LogManager.GetLogger("Logger");
+            Log = LogManager.GetLogger("mRemoteNG", "Logger");
         }
 
         private static string BuildLogFilePath()
@@ -58,7 +59,7 @@ namespace mRemoteNG.App
 
         private static string GetLogPathNormalEdition()
         {
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
                                 Application.ProductName);
         }
 

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.
@@ -27,21 +28,20 @@ namespace mRemoteNG.App
             CatchAllUnhandledExceptions();
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            FrmSplashScreen frmSplashScreen = FrmSplashScreen.getInstance();
+            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();
@@ -49,7 +49,7 @@ namespace mRemoteNG.App
             }
 
             StartApplication();
-            GC.KeepAlive(mutex);
+            GC.KeepAlive(_mutex);
         }
 
         private static void SwitchToCurrentInstance()
@@ -85,13 +85,22 @@ namespace mRemoteNG.App
 
         private static void ApplicationOnThreadException(object sender, ThreadExceptionEventArgs e)
         {
-            var window = new UnhandledExceptionWindow(e.Exception, false);
+            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)
         {
-            var window = new UnhandledExceptionWindow(e.ExceptionObject as Exception, e.IsTerminating);
+            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
 {
@@ -111,13 +113,13 @@ namespace mRemoteNG.App
 
                 if (Settings.Default.UseSQLServer)
                 {
-                    MessageCollector.AddExceptionMessage(Language.strLoadFromSqlFailed, ex);
-                    var commandButtons = string.Join("|", Language.strCommandTryAgain,
-                                                     Language.strCommandOpenConnectionFile,
-                                                     string.Format(Language.strCommandExitProgram,
+                    MessageCollector.AddExceptionMessage(Language.LoadFromSqlFailed, ex);
+                    var commandButtons = string.Join("|", Language._TryAgain,
+                                                     Language.CommandOpenConnectionFile,
+                                                     string.Format(Language.CommandExitProgram,
                                                                    Application.ProductName));
-                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.strLoadFromSqlFailed,
-                                               Language.strLoadFromSqlFailedContent,
+                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.LoadFromSqlFailed,
+                                               Language.LoadFromSqlFailedContent,
                                                MiscTools.GetExceptionMessageRecursive(ex), "", "",
                                                commandButtons, false, ESysIcons.Error, ESysIcons.Error);
                     switch (CTaskDialog.CommandButtonResult)
@@ -138,7 +140,7 @@ namespace mRemoteNG.App
                 if (ex is FileNotFoundException && !withDialog)
                 {
                     MessageCollector.AddExceptionMessage(
-                                                         string.Format(Language.strConnectionsFileCouldNotBeLoadedNew,
+                                                         string.Format(Language.ConnectionsFileCouldNotBeLoadedNew,
                                                                        connectionFileName), ex,
                                                          MessageClass.InformationMsg);
 
@@ -147,7 +149,7 @@ namespace mRemoteNG.App
                         Language.ConfigurationCreateNew,
                         Language.ConfigurationCustomPath,
                         Language.ConfigurationImportFile,
-                        Language.strMenuExit
+                        Language.Exit
                     };
 
                     var answered = false;
@@ -189,7 +191,7 @@ namespace mRemoteNG.App
                         {
                             MessageCollector.AddExceptionMessage(
                                                                  string
-                                                                     .Format(Language.strConnectionsFileCouldNotBeLoadedNew,
+                                                                     .Format(Language.ConnectionsFileCouldNotBeLoadedNew,
                                                                              connectionFileName), exc,
                                                                  MessageClass.InformationMsg);
                         }
@@ -199,7 +201,7 @@ namespace mRemoteNG.App
                 }
 
                 MessageCollector.AddExceptionStackTrace(
-                                                        string.Format(Language.strConnectionsFileCouldNotBeLoaded,
+                                                        string.Format(Language.ConnectionsFileCouldNotBeLoaded,
                                                                       connectionFileName), ex);
                 if (connectionFileName != ConnectionsService.GetStartupConnectionFileName())
                 {
@@ -208,7 +210,7 @@ namespace mRemoteNG.App
                 else
                 {
                     MessageBox.Show(FrmMain.Default,
-                                    string.Format(Language.strErrorStartupConnectionFileLoad, Environment.NewLine,
+                                    string.Format(Language.ErrorStartupConnectionFileLoad, Environment.NewLine,
                                                   Application.ProductName,
                                                   ConnectionsService.GetStartupConnectionFileName(),
                                                   MiscTools.GetExceptionMessageRecursive(ex)),

mRemoteNG/App/Shutdown.cs

@@ -3,6 +3,8 @@ 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;
 
@@ -41,7 +43,7 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strSettingsCouldNotBeSavedOrTrayDispose, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.SettingsCouldNotBeSavedOrTrayDispose, ex);
             }
         }
 

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;

mRemoteNG/App/SupportedCultures.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Runtime.Serialization;
+using mRemoteNG.Properties;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 

mRemoteNG/App/Update/AppUpdater.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net;
 using System.ComponentModel;
@@ -7,6 +7,7 @@ using System.Reflection;
 using mRemoteNG.App.Info;
 using mRemoteNG.Security.SymmetricEncryption;
 using System.Security.Cryptography;
+using mRemoteNG.Properties;
 #if !PORTABLE
 using mRemoteNG.Tools;
 
@@ -244,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);
                 }
             }
 

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,14 +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
@@ -39,11 +36,6 @@ 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();
@@ -89,13 +81,6 @@ namespace mRemoteNG.App
                             _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/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;
 

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,7 +45,7 @@ namespace mRemoteNG.Config.Connections
         {
             try
             {
-                _sqlConnector.Connect();
+                _dbConnector.Connect();
             }
             catch (Exception e)
             {
@@ -76,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"]);
@@ -114,7 +113,7 @@ namespace mRemoteNG.Config.Connections
         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);
         }
 
@@ -126,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

@@ -48,7 +48,7 @@ namespace mRemoteNG.Config.Connections
 
         private void SaveConnectionOnEdit(string propertyName = "")
         {
-            if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
+            if (!Properties.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
             if (FrmMain.Default.IsClosing)
                 return;

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,7 +17,7 @@ using mRemoteNG.Tree.Root;
 
 namespace mRemoteNG.Config.Connections
 {
-	public class SqlConnectionsLoader : IConnectionsLoader
+    public class SqlConnectionsLoader : IConnectionsLoader
     {
         private readonly IDeserializer<string, IEnumerable<LocalConnectionPropertiesModel>>
             _localConnectionPropertiesDeserializer;
@@ -38,7 +38,7 @@ namespace mRemoteNG.Config.Connections
 
         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);
@@ -93,7 +93,7 @@ namespace mRemoteNG.Config.Connections
                 });
         }
 
-        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;
@@ -59,23 +59,24 @@ namespace mRemoteNG.Config.Connections
                 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);
+                                                        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");
@@ -111,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;
@@ -132,19 +133,17 @@ 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(
-                                   "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES(\'" +
-                                   MiscTools.PrepareValueForDB(rootTreeNode.Name) + "\', 0, \'" + strProtected + "\'," +
-                                   ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) +
-                                   ")",
-                                   sqlDatabaseConnector.SqlConnection);
-                sqlQuery.ExecuteNonQuery();
+                dbQuery =
+                    databaseConnector.DbCommand(
+                        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES(\'" +
+                        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "\', 0, \'" + strProtected + "\'," +
+                        ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) + ")");
+                dbQuery.ExecuteNonQuery();
             }
             else
             {
@@ -153,33 +152,33 @@ namespace mRemoteNG.Config.Connections
             }
         }
 
-        private void UpdateConnectionsTable(RootNodeInfo rootTreeNode, SqlDatabaseConnector sqlDatabaseConnector)
+        private void UpdateConnectionsTable(RootNodeInfo rootTreeNode, IDatabaseConnector databaseConnector)
         {
+            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 dataProvider = new SqlDataProvider(sqlDatabaseConnector);
+            //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,7 +33,7 @@ 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,19 +31,16 @@ namespace mRemoteNG.Config.Connections
             try
             {
                 var cryptographyProvider = new CryptoProviderFactoryFromSettings().Build();
-                var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
-                                                                                 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);
+                var serializerFactory = new XmlConnectionSerializerFactory();
+                
+                var xmlConnectionsSerializer = serializerFactory.Build(
+                    cryptographyProvider,
+                    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);

mRemoteNG/Config/DataProviders/FileBackupCreator.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Config.DataProviders
 {
@@ -15,12 +16,12 @@ namespace mRemoteNG.Config.DataProviders
                     return;
 
                 var backupFileName =
-                    string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now);
+                    string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now);
                 File.Copy(fileName, backupFileName);
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strConnectionsFileBackupFailed, ex,
+                Runtime.MessageCollector.AddExceptionMessage(Language.ConnectionsFileBackupFailed, ex,
                                                              MessageClass.WarningMsg);
                 throw;
             }
@@ -38,7 +39,7 @@ namespace mRemoteNG.Config.DataProviders
 
         private bool FeatureIsTurnedOff()
         {
-            return mRemoteNG.Settings.Default.BackupFileKeepCount == 0;
+            return Properties.Settings.Default.BackupFileKeepCount == 0;
         }
     }
 }

mRemoteNG/Config/DataProviders/FileBackupPruner.cs

@@ -13,7 +13,7 @@ namespace mRemoteNG.Config.DataProviders
             if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName))
                 return;
 
-            var searchPattern = string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, "*");
+            var searchPattern = string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, "*");
             var files = Directory.GetFiles(directoryName, searchPattern);
 
             if (files.Length <= maxBackupsToKeep)

mRemoteNG/Config/DataProviders/SqlDataProvider.cs

@@ -0,0 +1,114 @@
+using System.Data;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Messages;
+using mRemoteNG.App;
+using MySql.Data.MySqlClient;
+using System.Data.SqlClient;
+
+namespace mRemoteNG.Config.DataProviders
+{
+    public class SqlDataProvider : IDataProvider<DataTable>
+    {
+        public IDatabaseConnector DatabaseConnector { get; }
+
+        public SqlDataProvider(IDatabaseConnector databaseConnector)
+        {
+            DatabaseConnector = databaseConnector;
+        }
+
+        public DataTable Load()
+        {
+            var dataTable = new DataTable();
+            var dbQuery = DatabaseConnector.DbCommand("SELECT * FROM tblCons ORDER BY PositionID ASC");
+            DatabaseConnector.AssociateItemToThisConnector(dbQuery);
+            if (!DatabaseConnector.IsConnected)
+                OpenConnection();
+            var dbDataReader = dbQuery.ExecuteReader(CommandBehavior.CloseConnection);
+
+            if (dbDataReader.HasRows)
+                dataTable.Load(dbDataReader);
+            dbDataReader.Close();
+            return dataTable;
+        }
+
+        public void Save(DataTable dataTable)
+        {
+            if (DbUserIsReadOnly())
+            {
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
+                                                    "Trying to save connections but the SQL read only checkbox is checked, aborting!");
+                return;
+            }
+
+            if (!DatabaseConnector.IsConnected)
+                OpenConnection();
+            if (DatabaseConnector.GetType() == typeof(MSSqlDatabaseConnector))
+            {
+                SqlConnection sqlConnection = (SqlConnection)DatabaseConnector.DbConnection();
+                using (SqlTransaction transaction = sqlConnection.BeginTransaction(System.Data.IsolationLevel.Serializable))
+                {
+                    using (SqlCommand sqlCommand = new SqlCommand())
+                    {
+                        sqlCommand.Connection = sqlConnection;
+                        sqlCommand.Transaction = transaction;
+                        sqlCommand.CommandText = "SELECT * FROM tblCons";
+                        using (SqlDataAdapter dataAdpater = new SqlDataAdapter())
+                        {
+                            dataAdpater.SelectCommand = sqlCommand;
+
+                            SqlCommandBuilder builder = new SqlCommandBuilder(dataAdpater);
+                            // Avoid optimistic concurrency, check if it is necessary.
+                            builder.ConflictOption = ConflictOption.OverwriteChanges;
+
+                            dataAdpater.UpdateCommand = builder.GetUpdateCommand();
+
+                            dataAdpater.DeleteCommand = builder.GetDeleteCommand();
+                            dataAdpater.InsertCommand = builder.GetInsertCommand();
+
+                            dataAdpater.Update(dataTable);
+                            transaction.Commit();
+                        }
+                    }
+                }
+
+            }
+            else if (DatabaseConnector.GetType() == typeof(MySqlDatabaseConnector))
+            {
+                var dbConnection = (MySqlConnection) DatabaseConnector.DbConnection();
+                using (MySqlTransaction transaction = dbConnection.BeginTransaction(System.Data.IsolationLevel.Serializable))
+                {
+                    using (MySqlCommand sqlCommand = new MySqlCommand())
+                    {
+                        sqlCommand.Connection = dbConnection;
+                        sqlCommand.Transaction = transaction;
+                        sqlCommand.CommandText = "SELECT * FROM tblCons";
+                        using (MySqlDataAdapter dataAdapter = new MySqlDataAdapter(sqlCommand))
+                        {
+                            dataAdapter.UpdateBatchSize = 1000;
+                            using (MySqlCommandBuilder cb = new MySqlCommandBuilder(dataAdapter))
+                            {
+                                dataAdapter.Update(dataTable);
+                                transaction.Commit();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        public void OpenConnection()
+        {
+            DatabaseConnector.Connect();
+        }
+
+        public void CloseConnection()
+        {
+            DatabaseConnector.Disconnect();
+        }
+
+        private bool DbUserIsReadOnly()
+        {
+            return Properties.Settings.Default.SQLReadOnly;
+        }
+    }
+}

mRemoteNG/Config/DatabaseConnectors/DatabaseConnectionTester.cs

@@ -7,18 +7,19 @@ namespace mRemoteNG.Config.DatabaseConnectors
     /// <summary>
     /// A helper class for testing database connectivity
     /// </summary>
-    public class SqlDatabaseConnectionTester
+    public class DatabaseConnectionTester
     {
-        public async Task<ConnectionTestResult> TestConnectivity(string server,
+        public async Task<ConnectionTestResult> TestConnectivity(string type,
+                                                                 string server,
                                                                  string database,
                                                                  string username,
                                                                  string password)
         {
-            using (var sqlConnector = new SqlDatabaseConnector(server, database, username, password))
+            using (var dbConnector = DatabaseConnectorFactory.DatabaseConnector(type, server, database, username, password))
             {
                 try
                 {
-                    await sqlConnector.ConnectAsync();
+                    await dbConnector.ConnectAsync();
                     return ConnectionTestResult.ConnectionSucceded;
                 }
                 catch (SqlException sqlException)

mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs

@@ -0,0 +1,32 @@
+using mRemoteNG.App;
+using mRemoteNG.Security.SymmetricEncryption;
+
+namespace mRemoteNG.Config.DatabaseConnectors
+{
+    public class DatabaseConnectorFactory
+    {
+        public static IDatabaseConnector DatabaseConnectorFromSettings()
+        {
+            var sqlType = Properties.Settings.Default.SQLServerType;
+            var sqlHost = Properties.Settings.Default.SQLHost;
+            var sqlCatalog = Properties.Settings.Default.SQLDatabaseName;
+            var sqlUsername = Properties.Settings.Default.SQLUser;
+            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
+            var sqlPassword = cryptographyProvider.Decrypt(Properties.Settings.Default.SQLPass, Runtime.EncryptionKey);
+
+            return DatabaseConnector(sqlType, sqlHost, sqlCatalog, sqlUsername, sqlPassword);
+        }
+
+        public static IDatabaseConnector DatabaseConnector(string type, string server, string database, string username, string password)
+        {
+            switch (type)
+            {
+                case "mysql":
+                    return new MySqlDatabaseConnector(server, database, username, password);
+                case "mssql":
+                default:
+                    return new MSSqlDatabaseConnector(server, database, username, password);
+            }
+        }
+    }
+}

mRemoteNG/Config/DatabaseConnectors/IDatabaseConnector.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Data.Common;
+using System.Threading.Tasks;
+
+namespace mRemoteNG.Config.DatabaseConnectors
+{
+    public interface IDatabaseConnector : IDisposable
+    {
+        DbConnection DbConnection();
+        DbCommand DbCommand(string dbCommand);
+        bool IsConnected { get; }
+        void Connect();
+        Task ConnectAsync();
+        void Disconnect();
+        void AssociateItemToThisConnector(DbCommand dbCommand);
+    }
+}