added SharedLibraryNG project

added optional but helpful winscp arguments

.github/CONTRIBUTING.md

@@ -1,24 +0,0 @@
-**Hello, and welcome to the mRemoteNG project!**
-
-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!
-There are many ways that you can help improve mRemoteNG, even if you don't know how to program:
-
-- add documentation or "how-to" articles on the Wiki
-- answer support questions on the forum
-- add or improve a translation
-- submit a pull request for a bug or feature ticket
-
-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 security@mremoteng.org instead.
-
-You'll find all information on our GitHub workflow in our [Wiki](https://github.com/mRemoteNG/mRemoteNG/wiki), or you can use these links:
-
-- [Branches](https://github.com/mRemoteNG/mRemoteNG/wiki/Branches)
-- [Bug Repots](https://github.com/mRemoteNG/mRemoteNG/wiki/Bug-Reports)
-- [Feature Requests](https://github.com/mRemoteNG/mRemoteNG/wiki/Feature-Requests)
-- [Pull Requests](https://github.com/mRemoteNG/mRemoteNG/wiki/Pull-Requests)
-
-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.
-Even if you don't know C# you can heck out the issues that we've labeled with [`Documentation`](https://github.com/mRemoteNG/mRemoteNG/labels/Documentation).

.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,33 +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? -->
-<!--- Uncomment the line(s) that apply(s) to you pull request -->
-<!--- - 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) -->
-<!--- - Updated translation -->
-
-## Checklist:
-<!--- Go over all the following points. All of them must apply to your pull request to be merged. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have read the **CONTRIBUTING** document.
-- [ ] My code follows the code style of this project.
-- [ ] All Tests within VisualStudio are passing
-- [ ] This pull request does not target the master branch.
-- [ ] I have updated the changelog file accordingly, if necessary.
-- [ ] I have updated the documentation accordingly, if necessary.

CHANGELOG.md

@@ -5,14 +5,31 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 ### Added
+- #1427: Fix RDP local desktop scale not taking effect on remote
+- #1770: Added missing RDP performance settings
+- #1332: Added option to hide menu strip container
 - #545: Option to minimize to system tray on closing
+- #420: SSH tunneling implemented
+- #319: Override quick connect username when using user@domain
 - #283: Support for native PowerShell remoting as new protocol
+- #1850: Minify config xml
 ### Changed
-- #1460: Updated GeckoFX to v60
+- #1777: Cleaned up VisualStudio project structure
+- #1767: Turned about window into a simple popup form
+- #1766: Converted components check page into options page
+- #1690: Replaced GeckoFX (Firefox) with CefSharp (Chromium)
+- #1325: Language resource files cleanup
 ### Fixed
+- #1783: Added missing inheritance properties to SQL scripts
+- #1773: Connection issue with mysql - Missing fields in 
+- #1756: Cannot type any character on MultiSSH toolbar 
+- #1720: Show configuration file name in title of password prompt form
+- #1713: Sound redirection does not work if Clipboard redirection is set to No
+- #1632: 1.77.1 breaks RDP drive and sound redirection
 - #1610: Menu bar changes to english when cancelling options form
 - #1595: Unhandled exception when trying to browse through non existent multi ssh history with keyboard key strokes
 - #1589: Update SQL tables instead of rewriting them
+- #1465: REGRESSION: Smart Cards redirection to Remote Desktop not working
 - #1337: Unhandled exception after closing mRemoteNG
 - #359: Making a VNC connection to an unreachable host causes the application to not respond for 20-30 seconds
 

CREDITS.md

@@ -1,38 +1,39 @@
 # Contributors
+
 ## Current mRemoteNG dev team
-David Sparer (http://github.com/sparerd)  
-Sean Kaim (http://github.com/kmscode)  
-Faryan Rezagholi (http://github.com/farosch)  
 
-Thanks for the awesome new website!  
-Bennett Blodinger (http://github.com/benwa)
+[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)  
+[Joe Cefoli](http://github.com/jcefoli)  
+[countchappy](http://github.com/countchappy)  
 Tony Lambert  
-Julien Roncaglia (http://github.com/vbfox)  
-http://github.com/peterchenadded  
-Brandon Wulf (http://github.com/mrwulf)  
-Pedro Rodrigues (http://github.com/pedro2555)  
-http://github.com/dekelMP  
-Bruce (http://github.com/brucetp)  
-Camilo Alvarez (http://github.com/jotatsu)  
-http://github.com/DamianBis  
-http://github.com/pfjason  
-http://github.com/sirLoaf  
-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)  
-http://github.com/MitchellBot
-Filippo Ferrazini (http://github.com/Filippo125)
+[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)  
+[Hayato Iriumi](http://github.com/hiriumi)  
 Jason Barbier  
 Wiktor Beryt  
 Lionel Caignec  
@@ -42,109 +43,85 @@ Tom Hiller
 Apisitt Rattana  
 Andreas Rehm  
 David Vidmar  
-http://github.com/Brandhor  
-Dimitrij (http://github.com/Kvarkas)  
+[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)  
+[Sebastien Thieury](http://github.com/SebThieu)  
 Riza Emet  
-Lukas Plachy (http://github.com/rheingold)  
+[Lukas Plachy](http://github.com/rheingold)  
 Gyuha Shin  
-Stefan (http://github.com/polluks)  
-http://github.com/emazv72  
-Vladimir Semenov (http://github.com/sli-pro)  
-Marco Sousa (http://github.com/marcomsousa)  
-http://github.com/wwj402  
-http://github.com/Fyers  
-http://github.com/pablomh  
-Damian Szczepanik (http://github.com/damianszczepanik)  
-Mant1kor (http://github.com/Mant1kor)
+[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  
+# Included Source Code
+
+**[Command Line Arguments Parser](http://www.codeproject.com/KB/recipes/command_line.aspx)**  
 Copyright © 2002 Richard Lopes  
-MIT License  
-http://www.codeproject.com/KB/recipes/command_line.aspx
-
-FilteredPropertyGrid  
-Copyright © 2006 Azuria  
-http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
-
-InputBox  
-Copyright © 2016 Jan Slama  
-http://www.csharp-examples.net/inputbox/
-
-IP TextBox  
-Copyright © 2005 mawnkay  
-http://www.codeproject.com/Articles/11576/IP-TextBox
-
-PortableSettingsProvider   	
-Copyright © 2014 crdx  
-https://github.com/crdx/PortableSettingsProvider
-
-
-## Included Components
-ADTree  
-Copyright © 2004 Marc Merritt  
-Copyright © 2008 Felix Deimel  
-http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
-
-DockPanel Suite  
-Copyright © 2018 @roken and @lextm (formerly Weifen Luo)  
-MIT License  
-https://github.com/dockpanelsuite/dockpanelsuite
-
-GeckoFX   
-Copyright © 2016 Tom Hindle  
-Mozilla Public License  
-https://bitbucket.org/geckofx/
-
-log4net  
-Copyright © 2001-2015 The Apache Software Foundation  
-Apache License Version 2.0  
-http://logging.apache.org/log4net/
-
-Magic Library  
-Copyright © 2002-2003 Crownwood Consulting, Ltd.  
-Freely redistributable with attribution  
-http://www.dotnetmagic.com/magic_download.html
-
-PuTTY  
-Copyright © 1997-2017 Simon Tatham  
-MIT License  
-http://www.chiark.greenend.org.uk/~sgtatham/putty/
-
-Silk Icon Set  
-Copyright © 2005-2008 FAMFAMFAM  
-Creative Commons Attribution 2.5 License  
-http://www.famfamfam.com/
-
-SSH.NET  
-Copyright © 2016  
-MIT License  
-https://github.com/sshnet/SSH.NET
-
-VncSharp  
-Copyright © 2004-2009 David Humphrey  
-GNU General Public License (GPL) Version 2  
-https://github.com/humphd/VncSharp [Archived]
-
-ObjectListView  
-Copyright © 2006-2016 Phillip Piper  
-GNU General Public License (GPL) Version 3  
-https://sourceforge.net/projects/objectlistview/
-
-Markdig  
-Copyright © 2016-2019 Alexandre Mutel  
-BSD 2-Clause "Simplified"  
-https://github.com/lunet-io/markdig
-
-ConsoleControl
-Copyright © 2015 Dave Kerr
 MIT License
-https://github.com/dwmkerr/consolecontrol
+
+**[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.md" KeyPath="yes" />
-      </Component>
-      <Component Id="C.Credits" Guid="*">
-        <File Id="CreditsFile" Name="Credits.txt" Source="$(var.SolutionDir)CREDITS.md" 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.md" 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

@@ -1,63 +0,0 @@
-#!groovy​
-node('windows') {
-	def jobDir = pwd()
-	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
-	def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
-	def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe"
-	def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe"
-	def reportGeneratorPath = "${jobDir}\\packages\\ReportGenerator.3.0.2\\tools\\ReportGenerator.exe"
-	def testResultFilePrefix = "TestResult"
-	def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml"
-	def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml"
-	def testResultFileAcceptance = "${testResultFilePrefix}_AcceptanceTests.xml"
-	def coverageReport = "code_coverage_report.xml"
-	def codeCoverageHtml = "CodeCoverageReport.html"
-	
-	stage ('Checkout Branch') {
-		checkout scm
-		bat "del /Q \"${jobDir}\\${testResultFilePrefix}*.xml\""
-	}
-
-	stage ('Restore NuGet Packages') {
-		def nugetPath = "C:\\nuget.exe"
-		bat "${nugetPath} restore ${solutionFilePath}"
-	}
-
-	stage ('Build mRemoteNG (Normal)') {
-		bat "\"${msBuild}\" /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
-	}
-
-	stage ('Build mRemoteNG (Portable)') {
-		bat "\"${msBuild}\" /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
-	}
-
-	stage ('Run Unit Tests (Normal, w/coverage)') {
-		try {
-			bat "\"${openCoverPath}\" -register:user -target:\"${nunitConsolePath}\" -targetargs:\"\"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86\" -output:\"${coverageReport}\""
-		}
-		catch (ex) {
-			nunit testResultsPattern: "${testResultFilePrefix}*.xml"
-			throw ex
-		}
-	}
-	
-	stage ('Run Unit Tests (Portable)') {
-		try {
-			bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\debug portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86"
-		}
-		catch (ex) {
-			nunit testResultsPattern: "${testResultFilePrefix}*.xml"
-			throw ex
-		}
-	}
-	
-	stage ('Run Acceptance Tests') {
-		try {
-			bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNG.Specs\\bin\\debug\\mRemoteNG.Specs.dll\" --result=${testResultFileAcceptance} --x86"
-		}
-		catch (ex) {
-			nunit testResultsPattern: "${testResultFilePrefix}*.xml"
-			throw ex
-		}
-	}
-}

Jenkinsfile_publish.groovy

@@ -1,71 +0,0 @@
-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.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"
-    def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml"
-    def coverageReport = "code_coverage_report.xml"
-
-	
-	stage ('Clean output dir') {
-		bat script: "rmdir /S /Q \"${jobDir}\\Release\" 2>nul", returnStatus: true
-	}
-
-	stage ('Checkout Branch') {
-    	checkout([
-    	    $class: 'GitSCM',
-    	    branches: [[name: '*/${TargetBranch}']],
-            doGenerateSubmoduleConfigurations: false, 
-            extensions: [],
-            submoduleCfg: [], 
-            userRemoteConfigs: [[
-                credentialsId: '9c3fbff4-5b90-402f-a298-00e607fcec87', 
-                url: 'https://github.com/mRemoteNG/mRemoteNG.git'
-            ]]
-        ])
-	}
-
-	stage ('Restore NuGet Packages') {
-    	def nugetPath = "C:\\nuget.exe"
-    	bat "${nugetPath} restore ${solutionFilePath}"
-	}
-
-    withCredentials([file(credentialsId: '9b674d57-6792-48e3-984a-4d1bab2abb64', variable: 'CODE_SIGNING_CERT')]) {
-        withCredentials([usernamePassword(credentialsId: '05b7449b-05c0-490f-8661-236242526e62', passwordVariable: 'MRNG_CERT_PASSWORD', usernameVariable: 'NO_USERNAME')]) {
-            stage ('Build mRemoteNG (Normal - MSI)') {
-                bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Installer\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
-                archiveArtifacts artifacts: "Release\\*.msi", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
-            }
-        
-            stage ('Build mRemoteNG (Portable)') {
-                bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Portable\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\""
-                archiveArtifacts artifacts: "Release\\*.zip", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true
-            }
-        }
-    }
-	
-    stage ('Run Unit Tests (Normal - MSI)') {
-        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86"
-    }
-    
-    stage ('Run Unit Tests (Portable)') {
-        bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86"
-    }
-
-    stage ('Generate UpdateCheck Files') {
-        bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\create_upg_chk_files.ps1\" -TagName \"${env.TagName}\" -UpdateChannel \"${env.UpdateChannel}\""
-        archiveArtifacts artifacts: "Release\\*.txt", caseSensitive: false, onlyIfSuccessful: true
-    }
-	
-    stage ('Publish to GitHub') {
-        withCredentials([string(credentialsId: '5443a369-dbe8-42d3-b4e8-04d0b4e9039a', variable: 'GH_AUTH_TOKEN')]) {
-            def releaseFolder = "${jobDir}\\Release"
-            // because batch files suck at handling newline characters, we have to convert to base64 in groovy and back to text in powershell
-            def base64Description = env.ReleaseDescription.bytes.encodeBase64().toString()
-            bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ReleaseFolderPath \"${releaseFolder}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded"
-        }
-    }
-}

README.MD

@@ -1,49 +1,170 @@
-# Welcome to the mRemoteNG project!
+**NOTICE: This project currently transited to a new maintainer. 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)
-[![Documentation Status](https://readthedocs.org/projects/mremoteng/badge/?version=latest)](https://mremoteng.readthedocs.io/en/latest/?badge=latest)
+<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.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) |
-
-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) |
+| Nightly build | [![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.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) |
 
 ## 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
 
-mRemoteNG is supported on Windows 7 or later. Before installing make sure you fullfill all the [minimum requirements](https://mremoteng.readthedocs.io/en/latest/installation/minimum_requirements.html).
+### Supported Operating Systems
 
-mRemoteNG is available as a redistributable msi package, and can be downloaded from the following locations:
+- [Windows 11](https://en.wikipedia.org/wiki/Windows_11)
+- [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.
+
+### 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)
 
+### 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.
+* [mRemoteNGOpenVPN](https://github.com/T3los/mRemoteNGOpenVPN) A script that can be embedded as an external tool to control OpenVPN.
+
 ## 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.
@@ -52,6 +173,9 @@ If you find mRemoteNG useful and would like to contribute, it would be greatly a
 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) 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>

SharedLibraryNG/HotkeyControl.cs

@@ -0,0 +1,331 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+//
+// Hotkey selection control, written by serenity@exscape.org, 2006-08-03
+// Please mail me if you find a bug.
+//
+
+namespace SharedLibraryNG
+{
+    /// <summary>
+    /// A simple control that allows the user to select pretty much any valid hotkey combination
+    /// </summary>
+    public class HotkeyControl : TextBox
+    {
+	    private const string KeySeparator = " + ";
+
+        // These variables store the current hotkey and modifier(s)
+        private Keys _keyCode = Keys.None;
+        private Keys _modifiers = Keys.None;
+
+        // ArrayLists used to enforce the use of proper modifiers.
+        // Shift+A isn't a valid hotkey, for instance, as it would screw up when the user is typing.
+        private readonly ArrayList _needNonShiftModifier;
+        private readonly ArrayList _needNonAltGrModifier;
+
+        private readonly ContextMenu _emptyContextMenu = new ContextMenu();
+
+        /// <summary>
+        /// Used to make sure that there is no right-click menu available
+        /// </summary>
+        public override ContextMenu ContextMenu
+        {
+            get
+            {
+                return _emptyContextMenu;
+            }
+			// ReSharper disable once ValueParameterNotUsed
+			set
+            {
+                base.ContextMenu = _emptyContextMenu;
+            }
+        }
+
+        /// <summary>
+        /// Forces the control to be non-multiline
+        /// </summary>
+        public override bool Multiline
+        {
+            get
+            {
+                return base.Multiline;
+            }
+			// ReSharper disable once ValueParameterNotUsed
+            set
+            {
+                // Ignore what the user wants; force Multiline to false
+                base.Multiline = false;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new HotkeyControl
+        /// </summary>
+        public HotkeyControl()
+        {
+            // Handle events that occurs when keys are pressed
+            KeyUp += HotkeyControl_KeyUp;
+
+            // Fill the ArrayLists that contain all invalid hotkey combinations
+            _needNonShiftModifier = new ArrayList();
+            _needNonAltGrModifier = new ArrayList();
+            PopulateModifierLists();
+        }
+
+		protected override void OnCreateControl()
+		{
+			base.OnCreateControl();
+
+			ContextMenu = _emptyContextMenu; // Disable right-clicking
+			Multiline = false;
+			Text = "None";
+		}
+
+        /// <summary>
+        /// Populates the ArrayLists specifying disallowed hotkeys
+        /// such as Shift+A, Ctrl+Alt+4 (would produce a dollar sign) etc
+        /// </summary>
+        private void PopulateModifierLists()
+        {
+            // Shift + 0 - 9, A - Z
+            for (var k = Keys.D0; k <= Keys.Z; k++)
+                _needNonShiftModifier.Add((int)k);
+
+            // Shift + Numpad keys
+            for (var k = Keys.NumPad0; k <= Keys.NumPad9; k++)
+                _needNonShiftModifier.Add((int)k);
+
+            // Shift + Misc (,;<./ etc)
+            for (var k = Keys.Oem1; k <= Keys.OemBackslash; k++)
+                _needNonShiftModifier.Add((int)k);
+
+            // Misc keys that we can't loop through
+            _needNonShiftModifier.Add((int)Keys.Insert);
+            _needNonShiftModifier.Add((int)Keys.Help);
+            _needNonShiftModifier.Add((int)Keys.Multiply);
+            _needNonShiftModifier.Add((int)Keys.Add);
+            _needNonShiftModifier.Add((int)Keys.Subtract);
+            _needNonShiftModifier.Add((int)Keys.Divide);
+            _needNonShiftModifier.Add((int)Keys.Decimal);
+            _needNonShiftModifier.Add((int)Keys.Return);
+            _needNonShiftModifier.Add((int)Keys.Escape);
+            _needNonShiftModifier.Add((int)Keys.NumLock);
+            _needNonShiftModifier.Add((int)Keys.Scroll);
+            _needNonShiftModifier.Add((int)Keys.Pause);
+
+            // Ctrl+Alt + 0 - 9
+            for (var k = Keys.D0; k <= Keys.D9; k++)
+                _needNonAltGrModifier.Add((int)k);
+        }
+
+        /// <summary>
+        /// Fires when all keys are released. If the current hotkey isn't valid, reset it.
+        /// Otherwise, do nothing and keep the text and hotkey as it was.
+        /// </summary>
+        void HotkeyControl_KeyUp(object sender, KeyEventArgs e)
+        {
+			if (_keyCode == Keys.None && ModifierKeys == Keys.None) ResetHotkey();
+        }
+
+        /// <summary>
+        /// Handles some misc keys, such as Ctrl+Delete and Shift+Insert
+        /// </summary>
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+			var keyCode = keyData & Keys.KeyCode;
+			var modifiers = keyData & Keys.Modifiers;
+
+			if (keyData == Keys.Back || keyData == Keys.Delete)
+            {
+                ResetHotkey();
+                return true;
+            }
+
+			_keyCode = keyCode;
+			_modifiers = modifiers;
+			Redraw();
+
+			return true;
+        }
+
+        /// <summary>
+        /// Clears the current hotkey and resets the TextBox
+        /// </summary>
+        public void ResetHotkey()
+        {
+            _keyCode = Keys.None;
+            _modifiers = Keys.None;
+			Text = "None";
+        }
+
+        /// <summary>
+        /// Used to get/set the hotkey (e.g. Keys.A)
+        /// </summary>
+        public Keys KeyCode
+        {
+            get
+            {
+                return _keyCode;
+            }
+            set
+            {
+                _keyCode = value;
+                Redraw(false);
+            }
+        }
+
+        /// <summary>
+        /// Used to get/set the modifier keys (e.g. Keys.Alt | Keys.Control)
+        /// </summary>
+        public Keys HotkeyModifiers
+        {
+            get
+            {
+                return _modifiers;
+            }
+            set
+            {
+                _modifiers = value;
+                Redraw(false);
+            }
+        }
+
+	    /// <summary>
+        /// Redraws the TextBox when necessary.
+        /// </summary>
+        /// <param name="validate">Specifies whether this function was called by the Hotkey/HotkeyModifiers properties or by the user.</param>
+        private void Redraw(bool validate = true)
+        {
+            // Only validate input if it comes from the user
+            if (validate)
+            {
+                // No modifier or shift only, AND a hotkey that needs another modifier
+	            if ((_modifiers == Keys.Shift || _modifiers == Keys.None) &&
+	                _needNonShiftModifier.Contains((int) _keyCode))
+	            {
+		            if (_modifiers == Keys.None)
+		            {
+			            // Set Ctrl+Alt as the modifier unless Ctrl+Alt+<key> won't work...
+			            if (_needNonAltGrModifier.Contains((int) _keyCode) == false)
+				            _modifiers = Keys.Alt | Keys.Control;
+			            else // ... in that case, use Shift+Alt instead.
+				            _modifiers = Keys.Alt | Keys.Shift;
+		            }
+		            else
+		            {
+			            // User pressed Shift and an invalid key (e.g. a letter or a number),
+			            // that needs another set of modifier keys
+			            _keyCode = Keys.None;
+			            Text = _modifiers + " + Invalid Key";
+			            return;
+		            }
+	            }
+	            // Check all Ctrl+Alt keys
+	            if ((_modifiers == (Keys.Alt | Keys.Control)) &&
+	                _needNonAltGrModifier.Contains((int) _keyCode))
+	            {
+		            // Ctrl+Alt+4 etc won't work; reset hotkey and tell the user
+		            _keyCode = Keys.None;
+		            Text = _modifiers + " + Invalid Key";
+		            return;
+	            }
+            }
+
+			// Don't allow modifiers keys for _keyCode
+			if (_keyCode == Keys.ShiftKey ||
+				_keyCode == Keys.LShiftKey ||
+				_keyCode == Keys.RShiftKey ||
+				_keyCode == Keys.ControlKey ||
+				_keyCode == Keys.LControlKey ||
+				_keyCode == Keys.RControlKey ||
+				_keyCode == Keys.Menu ||
+				_keyCode == Keys.LMenu ||
+				_keyCode == Keys.RMenu ||
+				_keyCode == Keys.LWin ||
+				_keyCode == Keys.RWin)
+				_keyCode = Keys.None;
+
+			if (_modifiers == Keys.None)
+            {
+                if (_keyCode == Keys.None)
+                {
+                    ResetHotkey();
+                    return;
+                }
+
+                // We get here if we've got a hotkey that is valid without a modifier,
+                // like F1-F12, Media-keys etc.
+                Text = _keyCode.ToString();
+                return;
+            }
+
+			Text = string.Join(KeySeparator, new[] { KeysToString(_modifiers), KeysToString(_keyCode) });
+        }
+
+	    public static string KeysToString(Keys keys)
+	    {
+			if (keys == Keys.None) return "None";
+
+		    var modifiers = (keys & Keys.Modifiers);
+		    var keyCode = (keys & Keys.KeyCode);
+
+		    var strings = new List<string>();
+
+			if (modifiers != 0)
+			{
+				var modifierStrings = new List<string>(modifiers.ToString().Replace(", ", ",").Split(','));
+				modifierStrings.Sort(new KeyModifierComparer());
+				strings.AddRange(modifierStrings);
+			}
+
+			if (keyCode != 0)
+			{
+				var keyString = keyCode.ToString();
+				var keyHashtable = new Dictionary<string, string>
+					{
+						{"Next", "PageDown"},
+						{"Oemcomma", ","},
+						{"OemMinus", "-"},
+						{"OemOpenBrackets", "["},
+						{"OemPeriod", "."},
+						{"Oemplus", "="},
+						{"OemQuestion", "/"},
+						{"Oemtilde", "`"},
+						{"D0", "0"},
+						{"D1", "1"},
+						{"D2", "2"},
+						{"D3", "3"},
+						{"D4", "4"},
+						{"D5", "5"},
+						{"D6", "6"},
+						{"D7", "7"},
+						{"D8", "8"},
+						{"D9", "9"},
+					};
+				if (keyHashtable.ContainsKey(keyString)) keyString = keyHashtable[keyString];
+				strings.Add(keyString);
+			}
+
+			return string.Join(KeySeparator, strings.ToArray());
+	    }
+
+	    private class KeyModifierComparer : IComparer<string>
+	    {
+		    private static readonly List<string> ModifierOrder = new List<string>
+			    {
+				    "control",
+				    "alt",
+				    "shift",
+			    };
+
+			public int Compare(string x, string y)
+			{
+				var xIndex = ModifierOrder.IndexOf(x.ToLowerInvariant());
+				var yIndex = ModifierOrder.IndexOf(y.ToLowerInvariant());
+				return xIndex - yIndex;
+			}
+		}
+    }
+}

SharedLibraryNG/KeyboardHook.cs

@@ -0,0 +1,258 @@
+//
+// Based on code from Stephen Toub's MSDN blog at
+// http://blogs.msdn.com/b/toub/archive/2006/05/03/589423.aspx
+//
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+
+namespace SharedLibraryNG
+{
+    public class KeyboardHook
+    {
+        // ReSharper disable InconsistentNaming
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool PostMessage(IntPtr hWnd, Int32 Msg, IntPtr wParam, HookKeyMsgData lParam);
+        // ReSharper restore InconsistentNaming
+
+        [Flags]
+        public enum ModifierKeys
+        {
+            None = 0x0000,
+            Shift = 0x0001,
+            LeftShift = 0x002,
+            RightShift = 0x004,
+            Control = 0x0008,
+            LeftControl = 0x010,
+            RightControl = 0x20,
+            Alt = 0x0040,
+            LeftAlt = 0x0080,
+            RightAlt = 0x0100,
+            Win = 0x0200,
+            LeftWin = 0x0400,
+            RightWin = 0x0800,
+        }
+
+        protected class KeyNotificationEntry
+			: IEquatable<KeyNotificationEntry>
+        {
+            public IntPtr WindowHandle;
+            public Int32 KeyCode;
+            public ModifierKeys ModifierKeys;
+            public Boolean Block;
+
+            public bool Equals(KeyNotificationEntry obj)
+            {
+                return (WindowHandle == obj.WindowHandle &&
+                        KeyCode == obj.KeyCode &&
+                        ModifierKeys == obj.ModifierKeys &&
+                        Block == obj.Block);
+            }
+        }
+
+        public const string HookKeyMsgName = "HOOKKEYMSG-{56BE0940-34DA-11E1-B308-C6714824019B}";
+	    private static Int32 _hookKeyMsg;
+        public static Int32 HookKeyMsg
+        {
+            get
+            {
+	            if (_hookKeyMsg == 0)
+	            {
+					_hookKeyMsg = Win32.RegisterWindowMessage(HookKeyMsgName).ToInt32();
+					if (_hookKeyMsg == 0)
+						throw new Win32Exception(Marshal.GetLastWin32Error());
+				}
+	            return _hookKeyMsg;
+            }
+        }
+
+        // this is a custom structure that will be passed to
+        // the requested hWnd via a WM_APP_HOOKKEYMSG message
+        [StructLayout(LayoutKind.Sequential)]
+        public class HookKeyMsgData
+        {
+            public Int32 KeyCode;
+            public ModifierKeys ModifierKeys;
+            public Boolean WasBlocked;
+        }
+
+        private static int _referenceCount;
+        private static IntPtr _hook;
+        private static readonly Win32.LowLevelKeyboardProcDelegate LowLevelKeyboardProcStaticDelegate = LowLevelKeyboardProc;
+        private static readonly List<KeyNotificationEntry> NotificationEntries = new List<KeyNotificationEntry>();
+        
+        public KeyboardHook()
+        {
+            _referenceCount++;
+            SetHook();
+        }
+
+        ~KeyboardHook()
+        {
+            _referenceCount--;
+            if (_referenceCount < 1) UnsetHook();
+        }
+
+        private static void SetHook()
+        {
+            if (_hook != IntPtr.Zero) return;
+
+            var curProcess = Process.GetCurrentProcess();
+            var curModule = curProcess.MainModule;
+
+            var hook = Win32.SetWindowsHookEx(Win32.WH_KEYBOARD_LL, LowLevelKeyboardProcStaticDelegate, Win32.GetModuleHandle(curModule.ModuleName), 0);
+            if (hook == IntPtr.Zero)
+                throw new Win32Exception(Marshal.GetLastWin32Error());
+
+            _hook = hook;
+        }
+
+        private static void UnsetHook()
+        {
+            if (_hook == IntPtr.Zero) return;
+
+            Win32.UnhookWindowsHookEx(_hook);
+            _hook = IntPtr.Zero;
+        }
+
+        private static IntPtr LowLevelKeyboardProc(Int32 nCode, IntPtr wParam, Win32.KBDLLHOOKSTRUCT lParam)
+        {
+            var wParamInt = wParam.ToInt32();
+            var result = 0;
+
+            if (nCode == Win32.HC_ACTION)
+            {
+                switch (wParamInt)
+                {
+                    case Win32.WM_KEYDOWN:
+                    case Win32.WM_SYSKEYDOWN:
+                    case Win32.WM_KEYUP:
+                    case Win32.WM_SYSKEYUP:
+                        result = OnKey(wParamInt, lParam);
+                        break;
+                }
+            }
+
+            if (result != 0) return new IntPtr(result);
+
+            return Win32.CallNextHookEx(_hook, nCode, wParam, lParam);
+        }
+
+        private static int OnKey(Int32 msg, Win32.KBDLLHOOKSTRUCT key)
+        {
+            var result = 0;
+
+            foreach (var notificationEntry in NotificationEntries)
+                if (GetFocusWindow() == notificationEntry.WindowHandle && notificationEntry.KeyCode == key.vkCode)
+                {
+                    var modifierKeys = GetModifierKeyState();
+					if (!ModifierKeysMatch(notificationEntry.ModifierKeys, modifierKeys)) continue;
+
+                    var wParam = new IntPtr(msg);
+                    var lParam = new HookKeyMsgData
+                    {
+                        KeyCode = key.vkCode,
+                        ModifierKeys = modifierKeys,
+                        WasBlocked = notificationEntry.Block,
+                    };
+
+                    if (!PostMessage(notificationEntry.WindowHandle, HookKeyMsg, wParam, lParam))
+                        throw new Win32Exception(Marshal.GetLastWin32Error());
+
+                    if (notificationEntry.Block) result = 1;
+                }
+
+            return result;
+        }
+
+        private static IntPtr GetFocusWindow()
+        {
+            var guiThreadInfo = new Win32.GUITHREADINFO();
+            if (!Win32.GetGUIThreadInfo(0, guiThreadInfo))
+                throw new Win32Exception(Marshal.GetLastWin32Error());
+			return Win32.GetAncestor(guiThreadInfo.hwndFocus, Win32.GA_ROOT);
+        }
+
+        protected static Dictionary<Int32, ModifierKeys> ModifierKeyTable = new Dictionary<Int32, ModifierKeys>
+        {
+            { Win32.VK_SHIFT, ModifierKeys.Shift },
+            { Win32.VK_LSHIFT, ModifierKeys.LeftShift },
+            { Win32.VK_RSHIFT, ModifierKeys.RightShift },
+            { Win32.VK_CONTROL, ModifierKeys.Control },
+            { Win32.VK_LCONTROL, ModifierKeys.LeftControl },
+            { Win32.VK_RCONTROL, ModifierKeys.RightControl },
+            { Win32.VK_MENU, ModifierKeys.Alt },
+            { Win32.VK_LMENU, ModifierKeys.LeftAlt },
+            { Win32.VK_RMENU, ModifierKeys.RightAlt },
+            { Win32.VK_LWIN, ModifierKeys.LeftWin },
+            { Win32.VK_RWIN, ModifierKeys.RightWin },
+        };
+
+        public static ModifierKeys GetModifierKeyState()
+        {
+            var modifierKeyState = ModifierKeys.None;
+
+            foreach (KeyValuePair<Int32, ModifierKeys> pair in ModifierKeyTable)
+            {
+                if ((Win32.GetAsyncKeyState(pair.Key) & Win32.KEYSTATE_PRESSED) != 0) modifierKeyState |= pair.Value;
+            }
+
+	        if ((modifierKeyState & ModifierKeys.LeftWin) != 0) modifierKeyState |= ModifierKeys.Win;
+			if ((modifierKeyState & ModifierKeys.RightWin) != 0) modifierKeyState |= ModifierKeys.Win;
+
+            return modifierKeyState;
+        }
+
+		public static Boolean ModifierKeysMatch(ModifierKeys requestedKeys, ModifierKeys pressedKeys)
+		{
+			if ((requestedKeys & ModifierKeys.Shift) != 0) pressedKeys &= ~(ModifierKeys.LeftShift | ModifierKeys.RightShift);
+			if ((requestedKeys & ModifierKeys.Control) != 0) pressedKeys &= ~(ModifierKeys.LeftControl | ModifierKeys.RightControl);
+			if ((requestedKeys & ModifierKeys.Alt) != 0) pressedKeys &= ~(ModifierKeys.LeftAlt | ModifierKeys.RightAlt);
+			if ((requestedKeys & ModifierKeys.Win) != 0) pressedKeys &= ~(ModifierKeys.LeftWin | ModifierKeys.RightWin);
+			return requestedKeys == pressedKeys;
+		}
+
+        public static void RequestKeyNotification(IntPtr windowHandle, Int32 keyCode, Boolean block)
+        {
+            RequestKeyNotification(windowHandle, keyCode, ModifierKeys.None, block);
+        }
+
+        public static void RequestKeyNotification(IntPtr windowHandle, Int32 keyCode, ModifierKeys modifierKeys = ModifierKeys.None, Boolean block = false)
+        {
+            var newNotificationEntry = new KeyNotificationEntry
+            {
+                WindowHandle = windowHandle,
+                KeyCode = keyCode,
+                ModifierKeys = modifierKeys,
+                Block = block,
+            };
+
+            foreach (var notificationEntry in NotificationEntries)
+                if (notificationEntry == newNotificationEntry) return;
+
+            NotificationEntries.Add(newNotificationEntry);
+        }
+
+		public static void CancelKeyNotification(IntPtr windowHandle, Int32 keyCode, Boolean block)
+		{
+			CancelKeyNotification(windowHandle, keyCode, ModifierKeys.None, block);
+		}
+
+		public static void CancelKeyNotification(IntPtr windowHandle, Int32 keyCode, ModifierKeys modifierKeys = ModifierKeys.None, Boolean block = false)
+		{
+			var notificationEntry = new KeyNotificationEntry
+			{
+				WindowHandle = windowHandle,
+				KeyCode = keyCode,
+				ModifierKeys = modifierKeys,
+				Block = block,
+			};
+
+			NotificationEntries.Remove(notificationEntry);
+		}
+    }
+}

SharedLibraryNG/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SharedLibraryNG")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SharedLibraryNG")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f4470853-f933-4203-9d2a-b3c731e225c7")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

SharedLibraryNG/SharedLibraryNG.csproj

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0F615504-5F30-4CF2-8341-1DE7FEC95A23}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SharedLibraryNG</RootNamespace>
+    <AssemblyName>SharedLibraryNG</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </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="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="HotkeyControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="KeyboardHook.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Win32.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

SharedLibraryNG/Win32.cs

@@ -0,0 +1,171 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace SharedLibraryNG
+{
+    // ReSharper disable InconsistentNaming
+    public static class Win32
+    {
+        #region Functions
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr SetWindowsHookEx(int idHook, LowLevelKeyboardProcDelegate lpfn, IntPtr hMod, Int32 dwThreadId);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool UnhookWindowsHookEx(IntPtr hhk);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, KBDLLHOOKSTRUCT lParam);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr GetModuleHandle(string lpModuleName);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr RegisterWindowMessage(string lpString);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetGUIThreadInfo(Int32 idThread, GUITHREADINFO lpgui);
+
+		[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+		public static extern IntPtr GetAncestor(IntPtr hwnd, UInt32 gaFlags);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern Int16 GetAsyncKeyState(Int32 vKey);
+
+        #endregion
+
+        #region Delegates
+
+        public delegate IntPtr LowLevelKeyboardProcDelegate(Int32 nCode, IntPtr wParam, KBDLLHOOKSTRUCT lParam);
+
+        #endregion
+
+        #region Structures
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class KBDLLHOOKSTRUCT
+        {
+            public Int32 vkCode;
+            public Int32 scanCode;
+            public Int32 flags;
+            public Int32 time;
+            public IntPtr dwExtraInfo;
+        };
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class GUITHREADINFO
+        {
+            public GUITHREADINFO()
+            {
+                cbSize = Convert.ToInt32(Marshal.SizeOf(this));
+            }
+
+            public Int32 cbSize;
+            public Int32 flags;
+            public IntPtr hwndActive;
+            public IntPtr hwndFocus;
+            public IntPtr hwndCapture;
+            public IntPtr hwndMenuOwner;
+            public IntPtr hwndMoveSize;
+            public IntPtr hwndCaret;
+            public RECT rcCaret;
+        }
+
+        #endregion
+
+        #region Constants
+
+		// GetAncestor
+	    public const int GA_ROOT = 2;
+
+        // SetWindowsHookEx
+        public const int WH_KEYBOARD_LL = 13;
+
+        // LowLevelKeyboardProcDelegate
+        public const int HC_ACTION = 0;
+
+        // SendMessage
+        public const int WM_KEYDOWN = 0x0100;
+        public const int WM_KEYUP = 0x0101;
+        public const int WM_SYSKEYDOWN = 0x0104;
+        public const int WM_SYSKEYUP = 0x0105;
+
+        // GetAsyncKeyState
+        public const int KEYSTATE_PRESSED = 0x8000;
+
+        #region Virtual Keys
+        public const int VK_CANCEL = 0x0003;
+        public const int VK_BACK = 0x0008;
+        public const int VK_TAB = 0x0009;
+        public const int VK_CLEAR = 0x000C;
+        public const int VK_RETURN = 0x000D;
+        public const int VK_PAUSE = 0x0013;
+        public const int VK_ESCAPE = 0x001B;
+        public const int VK_SNAPSHOT = 0x002C;
+        public const int VK_INSERT = 0x002D;
+        public const int VK_DELETE = 0x002E;
+        public const int VK_HOME = 0x0024;
+        public const int VK_END = 0x0023;
+        public const int VK_PRIOR = 0x0021;
+        public const int VK_NEXT = 0x0022;
+        public const int VK_LEFT = 0x0025;
+        public const int VK_UP = 0x0026;
+        public const int VK_RIGHT = 0x0027;
+        public const int VK_DOWN = 0x0028;
+        public const int VK_SELECT = 0x0029;
+        public const int VK_PRINT = 0x002A;
+        public const int VK_EXECUTE = 0x002B;
+        public const int VK_HELP = 0x002F;
+        public const int VK_LWIN = 0x005B;
+        public const int VK_RWIN = 0x005C;
+        public const int VK_APPS = 0x005D;
+        public const int VK_F1 = 0x0070;
+        public const int VK_F2 = 0x0071;
+        public const int VK_F3 = 0x0072;
+        public const int VK_F4 = 0x0073;
+        public const int VK_F5 = 0x0074;
+        public const int VK_F6 = 0x0075;
+        public const int VK_F7 = 0x0076;
+        public const int VK_F8 = 0x0077;
+        public const int VK_F9 = 0x0078;
+        public const int VK_F10 = 0x0079;
+        public const int VK_F11 = 0x007A;
+        public const int VK_F12 = 0x007B;
+        public const int VK_SHIFT = 0x0010;
+        public const int VK_LSHIFT = 0x00A0;
+        public const int VK_RSHIFT = 0x00A1;
+        public const int VK_CONTROL = 0x0011;
+        public const int VK_LCONTROL = 0x00A2;
+        public const int VK_RCONTROL = 0x00A3;
+        public const int VK_MENU = 0x0012;
+        public const int VK_LMENU = 0x00A4;
+        public const int VK_RMENU = 0x00A5;
+
+        public const int VK_OEM_1 = 0x00BA;
+        public const int VK_OEM_2 = 0x00BF;
+        public const int VK_OEM_3 = 0x00C0;
+        public const int VK_OEM_4 = 0x00DB;
+        public const int VK_OEM_5 = 0x00DC;
+        public const int VK_OEM_6 = 0x00DD;
+        public const int VK_OEM_7 = 0x00DE;
+        public const int VK_OEM_8 = 0x00DF;
+        public const int VK_OEM_102 = 0x00E2;
+
+        #endregion
+
+        #endregion
+
+        // ReSharper restore InconsistentNaming
+    }
+}

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

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

@@ -13,11 +13,21 @@ 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 "mremoteV1\Documentation"
+$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/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)"
 

mRemoteNG.Specs/mRemoteNG.Specs.csproj

@@ -1,136 +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\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.props" Condition="Exists('..\packages\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.props')" />
-  <Import Project="..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.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.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="BoDi, Version=1.4.1.0, Culture=neutral, PublicKeyToken=ff7cd5ea2744b496, processorArchitecture=MSIL">
-      <HintPath>..\packages\BoDi.1.4.1\lib\net45\BoDi.dll</HintPath>
-    </Reference>
-    <Reference Include="Gherkin, Version=6.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
-      <HintPath>..\packages\Gherkin.6.0.0\lib\net45\Gherkin.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <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=3.0.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.3.0.225\lib\net45\TechTalk.SpecFlow.dll</HintPath>
-    </Reference>
-    <Reference Include="TechTalk.SpecFlow.NUnit.SpecFlowPlugin, Version=3.0.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.NUnit.3.0.225\lib\net45\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.dll</HintPath>
-    </Reference>
-    <Reference Include="Utf8Json, Version=1.3.7.0, Culture=neutral, PublicKeyToken=8a73d3ba7e392e27, processorArchitecture=MSIL">
-      <HintPath>..\packages\Utf8Json.1.3.7\lib\net45\Utf8Json.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.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.targets'))" />
-  </Target>
-  <Import Project="..\packages\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.targets" Condition="Exists('..\packages\SpecFlow.NUnit.3.0.225\build\SpecFlow.NUnit.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

mRemoteNG.Specs/packages.config

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BoDi" version="1.4.1" targetFramework="net46" />
-  <package id="Gherkin" version="6.0.0" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net46" />
-  <package id="NUnit" version="3.12.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.10.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.10.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.7" targetFramework="net472" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net46" />
-  <package id="NUnit.Runners" version="3.10.0" targetFramework="net46" />
-  <package id="NUnit3TestAdapter" version="3.15.1" targetFramework="net472" />
-  <package id="SpecFlow" version="3.0.225" targetFramework="net472" />
-  <package id="SpecFlow.NUnit" version="3.0.225" targetFramework="net472" />
-  <package id="SpecFlow.NUnit.Runners" version="3.0.225" targetFramework="net472" />
-  <package id="System.Reflection.Emit" version="4.6.0" targetFramework="net472" />
-  <package id="System.Reflection.Emit.Lightweight" version="4.6.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net46" requireReinstallation="true" />
-  <package id="Utf8Json" version="1.3.7" targetFramework="net46" requireReinstallation="true" />
-</packages>

mRemoteNG.sln

@@ -3,20 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # 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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedLibraryNG", "SharedLibraryNG\SharedLibraryNG.csproj", "{0F615504-5F30-4CF2-8341-1DE7FEC95A23}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -118,6 +120,26 @@ Global
 		{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
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug Portable|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug Portable|Any CPU.Build.0 = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug Portable|x86.ActiveCfg = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug Portable|x86.Build.0 = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Debug|x86.Build.0 = Debug|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Installer|Any CPU.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Installer|Any CPU.Build.0 = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Installer|x86.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Installer|x86.Build.0 = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Portable|Any CPU.Build.0 = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Portable|x86.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release Portable|x86.Build.0 = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release|x86.ActiveCfg = Release|Any CPU
+		{0F615504-5F30-4CF2-8341-1DE7FEC95A23}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

mRemoteNG/App/CompatibilityChecker.cs

@@ -4,6 +4,8 @@ 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;
 
@@ -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)
@@ -86,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.7;
+        public static readonly double ConnectionFileVersion = 2.8;
     }
 }

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
 {
@@ -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

@@ -2,13 +2,14 @@
 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.
@@ -34,14 +35,13 @@ namespace mRemoteNG.App
 
         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()
@@ -90,7 +90,7 @@ namespace mRemoteNG.App
 
             if (FrmMain.Default.IsDisposed) return;
             
-            var window = new UnhandledExceptionWindow(e.Exception, false);
+            var window = new FrmUnhandledException(e.Exception, false);
             window.ShowDialog(FrmMain.Default);
             
         }
@@ -100,7 +100,7 @@ namespace mRemoteNG.App
             if (!FrmSplashScreen.getInstance().IsDisposed)
                 FrmSplashScreen.getInstance().Close();
 
-            var window = new UnhandledExceptionWindow(e.ExceptionObject as Exception, e.IsTerminating);
+            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,7 +1,7 @@
 using System;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Csv;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv;
 using mRemoteNG.Security;
 using mRemoteNG.Tree;
 

mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs

@@ -1,13 +1,12 @@
-using mRemoteNG.App;
-using mRemoteNG.Config.Connections.Multiuser;
-using mRemoteNG.Config.DatabaseConnectors;
-using mRemoteNG.Messages;
-using System;
+using System;
 using System.Data;
 using System.Data.Common;
 using System.Threading;
+using mRemoteNG.App;
+using mRemoteNG.Config.DatabaseConnectors;
+using mRemoteNG.Messages;
 
-namespace mRemoteNG.Config.Connections
+namespace mRemoteNG.Config.Connections.Multiuser
 {
     public class SqlConnectionsUpdateChecker : IConnectionsUpdateChecker
     {

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;

mRemoteNG/Config/Connections/SqlConnectionsSaver.cs

@@ -7,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;
@@ -68,7 +69,7 @@ namespace mRemoteNG.Config.Connections
                 if (!databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion))
                 {
                     Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                        Language.strErrorConnectionListSaveFailed);
+                                                        Language.ErrorConnectionListSaveFailed);
                     return;
                 }
 
@@ -177,7 +178,7 @@ namespace mRemoteNG.Config.Connections
 
         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,7 +2,7 @@
 using System.Linq;
 using mRemoteNG.App;
 using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
@@ -37,7 +37,7 @@ namespace mRemoteNG.Config.Connections
                     cryptographyProvider,
                     connectionTreeModel,
                     _saveFilter,
-                    mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile);
+                    Properties.Settings.Default.EncryptCompleteConnectionsFile);
 
                 var rootNode = connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First();
                 var xml = xmlConnectionsSerializer.Serialize(rootNode);

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

@@ -108,7 +108,7 @@ namespace mRemoteNG.Config.DataProviders
 
         private bool DbUserIsReadOnly()
         {
-            return mRemoteNG.Settings.Default.SQLReadOnly;
+            return Properties.Settings.Default.SQLReadOnly;
         }
     }
 }

mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs

@@ -7,12 +7,12 @@ namespace mRemoteNG.Config.DatabaseConnectors
     {
         public static IDatabaseConnector DatabaseConnectorFromSettings()
         {
-            var sqlType = mRemoteNG.Settings.Default.SQLServerType;
-            var sqlHost = mRemoteNG.Settings.Default.SQLHost;
-            var sqlCatalog = mRemoteNG.Settings.Default.SQLDatabaseName;
-            var sqlUsername = mRemoteNG.Settings.Default.SQLUser;
+            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(mRemoteNG.Settings.Default.SQLPass, Runtime.EncryptionKey);
+            var sqlPassword = cryptographyProvider.Decrypt(Properties.Settings.Default.SQLPass, Runtime.EncryptionKey);
 
             return DatabaseConnector(sqlType, sqlHost, sqlCatalog, sqlUsername, sqlPassword);
         }

mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs

@@ -26,10 +26,7 @@ namespace mRemoteNG.Config.DatabaseConnectors
             return new SqlCommand(dbCommand, (SqlConnection) _dbConnection);
         }
 
-        public bool IsConnected
-        {
-            get { return (_dbConnection.State == ConnectionState.Open); }
-        }
+        public bool IsConnected => (_dbConnection.State == ConnectionState.Open);
 
         public MSSqlDatabaseConnector(string sqlServer, string catalog, string username, string password)
         {

mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs

@@ -27,10 +27,7 @@ namespace mRemoteNG.Config.DatabaseConnectors
             return new MySqlCommand(dbCommand, (MySqlConnection) _dbConnection);
         }
 
-        public bool IsConnected
-        {
-            get { return (_dbConnection.State == ConnectionState.Open); }
-        }
+        public bool IsConnected => (_dbConnection.State == ConnectionState.Open);
 
         public MySqlDatabaseConnector(string host, string database, string username, string password)
         {