Merge branch 'develop' into bug/ssh_focus

# Conflicts:
#	mRemoteV1/UI/Forms/frmMain.cs

.github/CONTRIBUTING.md

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

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

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

.readthedocs.yaml

@@ -1,14 +0,0 @@
-# .readthedocs.yaml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-   configuration: mRemoteNGDocumentation/conf.py
-
-# Optionally build your docs in additional formats such as PDF
-formats:
-   - pdf

CHANGELOG.md

@@ -5,80 +5,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 ### Added
-- #2086: Replace WebClient with async HttpClient for updater.
-- #1850: Minify config xml
-- #1770: Added missing RDP performance settings
-- #1516: added API to access credential vault (Thycotic Secret Server) by specifying SSAPI:ID as username
-- #1476: Configurable backups. Can now edit/set backup frequency, backup path, and max number of backup files.
-- #1427: Fix RDP local desktop scale not taking effect on remote
-- #1332: Added option to hide menu strip container
-- #870: Added option to push inheritance settings to child nodes recursively
-- #545: Option to minimize to system tray on closing
-- #503: SSH Execute a single command after login
-- #420: SSH tunneling implemented
-- #327: Added Alternative Shell for RDP settings
-- #319: Override quick connect username when using user@domain
-- #283: Support for native PowerShell remoting as new protocol
-- #xxx: Add external connector to retrieve ip address from Amazon EC2 Instance IDs
-### Changed
-- #2102: Extended the field RenderingEngine from 10 chars to 16
-- #2022: Replaced CefSharp with WebView2
-- #2014: Revised icons
-- #2013: Removed components check
-- #2011: Removed screenshot manager
-- #2010: Redesigned menus
-- #2005: Removed in-app documentation
-- #1777: Cleaned up VisualStudio project structure
-- #1767: Turned about window into a simple popup form
-- #1690: Replaced GeckoFX (Firefox) with CefSharp (Chromium)
-- #1325: Language resource files cleanup
-- #xxxx: Secret Server connector via new field "API User ID" instead of SSAPI: prefix
-### Fixed
-- #2098: Fix failed BinaryFileTest
-- #2097: Fix failed tests related to mRemoteNGTests.UI.Window.ConfigWindowTests
-- #2096: Corrected encryption code of LegacyRijndaelCryptographyProvider
-- #2089: Fixed the exception thrown by menu buttons "Documentation" and "Website"
-- #2087: Fixed application crash, when the update file is launched from the application
-- #2079: Fixed theme files not being copied to output directory
-- #2012: Updated PuTTYNG to v0.76
-- #1884: Allow setting Port when using MSSQL
-- #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 canceling 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
-- #1363: Don't show "Disk Usage" button in installer
-- #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
-- #618: Do not break the Windows Clipboard Chain when exiting.
-
-## [1.77.1] - 2019-09-02
-### Added
 - #1512: Added option to close panel from right click menu
 - #1434: Revised sort button in connection tree to be able to sort in both orders
 - #1400: Added file download handling to HTTP(S) connections using Gecko
 - #1385: Added option to start mRemoteNG minimized
 - #826: Allow selecting RDP version to use when connecting
 ### Changed
-- #1544: Improved Polish translations
-- #1518: Inheritance is no longer automatically enabled when importing nodes from Active Directory
 - #1468: Improved mRemoteNG startup time
 - #1443: Chinese (simplified) translation improvements
 - #1437: Norwegian translation improvements
-- #1378: Hyperlinks embedded within mRemoteNG now open in the system default browser
 - #1239: Increased default key derivation function (KDF) iterations from 1000 to 10000
 - #718: Moved port property from 'protocol' to 'connection' section
 - Moved most RDP enums outside of the RDP protocol class. Scripts which reference these enums will need to be updated.
-- Removed the "Automatically get session info" from the advanced options screen since it is no longer used.
 ### Fixed
-- #1505: About screen now better follows theme colors
-- #1493: Updated database setup scripts for MSSQL and MySQL
-- #1470: The "Favorite" setting is now properly saved in the local connection settings file (not saved in database)
 - #1447: Exception occurs when resetting layout
 - #1439: Searching in hosts tree loses first keystroke
 - #1428: Fixed a rare error when checking for FIPS

COPYING.TXT

@@ -278,3 +278,62 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

CREDITS.md

@@ -0,0 +1,142 @@
+# Contributors
+## Current mRemoteNG dev team
+David Sparer (github.com/sparerd)  
+Sean Kaim (github.com/kmscode)  
+Faryan Rezagholi (github.com/farosch)  
+
+Thanks for the awesome new website!  
+Bennett Blodinger (github.com/benwa)
+
+Joe Cefoli (github.com/jcefoli)  
+countchappy (github.com/countchappy)  
+Tony Lambert  
+Julien Roncaglia (github.com/vbfox)  
+github.com/peterchenadded  
+Brandon Wulf (github.com/mrwulf)  
+Pedro Rodrigues (github.com/pedro2555)  
+github.com/dekelMP  
+Bruce (github.com/brucetp)  
+Camilo Alvarez (github.com/jotatsu)  
+github.com/DamianBis  
+github.com/pfjason  
+github.com/sirLoaf  
+github.com/Fyers  
+Vladimir Semenov (github.com/sli-pro)  
+Stephan (github.com/st-schuler)  
+Aleksey Reytsman (github.com/areytsman)  
+Cristian Abelleira (github.com/CrAbelleira)  
+github.com/MitchellBot  
+
+## Past Contributors
+Felix Deimel - mRemote original developer  
+Riley McArdle - mRemoteNG original developer  
+
+Hayato Iriumi (github.com/hiriumi)  
+Jason Barbier  
+Wiktor Beryt  
+Lionel Caignec  
+Ruben d'Arco  
+Holger Henke  
+Tom Hiller  
+Apisitt Rattana  
+Andreas Rehm  
+David Vidmar  
+github.com/Brandhor  
+Dimitrij (github.com/Kvarkas)  
+
+## Translators
+Eugenio "Ryo567" Martínez  
+Mathieu Pape  
+Emanuel Silva  
+Robert Siwiec  
+Hayato Iriumi  
+Sebastien Thieury (github.com/SebThieu)  
+Riza Emet  
+Lukas Plachy (github.com/rheingold)  
+Gyuha Shin  
+Stefan (github.com/polluks)  
+github.com/emazv72  
+Vladimir Semenov (github.com/sli-pro)  
+Marco Sousa (github.com/marcomsousa)  
+github.com/wwj402  
+github.com/Fyers  
+github.com/pablomh  
+
+## Included Source Code
+Command Line Arguments Parser  
+Copyright © 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
+
+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

ExternalConnectors/AWS/AWSConnectionForm.Designer.cs

@@ -1,180 +0,0 @@
-namespace ExternalConnectors.AWS
-{
-    partial class AWSConnectionForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tbAccesKeyID = new System.Windows.Forms.TextBox();
-            this.tbAccesKey = new System.Windows.Forms.TextBox();
-            this.btnOK = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tbAccesKeyID
-            // 
-            this.tbAccesKeyID.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbAccesKeyID.Location = new System.Drawing.Point(152, 4);
-            this.tbAccesKeyID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tbAccesKeyID.Name = "tbAccesKeyID";
-            this.tbAccesKeyID.Size = new System.Drawing.Size(490, 23);
-            this.tbAccesKeyID.TabIndex = 0;
-            // 
-            // tbAccesKey
-            // 
-            this.tbAccesKey.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbAccesKey.Location = new System.Drawing.Point(152, 43);
-            this.tbAccesKey.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tbAccesKey.Name = "tbAccesKey";
-            this.tbAccesKey.Size = new System.Drawing.Size(490, 23);
-            this.tbAccesKey.TabIndex = 2;
-            // 
-            // btnOK
-            // 
-            this.btnOK.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.btnOK.Location = new System.Drawing.Point(219, 12);
-            this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(88, 26);
-            this.btnOK.TabIndex = 10;
-            this.btnOK.Text = "OK";
-            this.btnOK.UseVisualStyleBackColor = true;
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(338, 12);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(88, 26);
-            this.btnCancel.TabIndex = 11;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22.92994F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 77.07006F));
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.tbAccesKeyID, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.tbAccesKey, 1, 1);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(646, 102);
-            this.tableLayoutPanel1.TabIndex = 12;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Location = new System.Drawing.Point(4, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(140, 39);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Access Key ID";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(4, 39);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(140, 39);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "Access Key";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.ColumnCount = 5;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93F));
-            this.tableLayoutPanel2.Controls.Add(this.btnOK, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.btnCancel, 3, 0);
-            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 112);
-            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(646, 50);
-            this.tableLayoutPanel2.TabIndex = 13;
-            // 
-            // AWSConnectionForm
-            // 
-            this.AcceptButton = this.btnOK;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(646, 162);
-            this.Controls.Add(this.tableLayoutPanel2);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Name = "AWSConnectionForm";
-            this.Text = "AWS EC2 API Login Data";
-            this.Activated += new System.EventHandler(this.AWSConnectionForm_Activated);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        public System.Windows.Forms.TextBox tbAccesKeyID;
-        public System.Windows.Forms.TextBox tbAccesKey;
-        private System.Windows.Forms.Button btnOK;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-    }
-}

ExternalConnectors/AWS/AWSConnectionForm.cs

@@ -1,16 +0,0 @@
-namespace ExternalConnectors.AWS
-{
-    public partial class AWSConnectionForm : Form
-    {
-        public AWSConnectionForm()
-        {
-            InitializeComponent();
-
-        }
-
-        private void AWSConnectionForm_Activated(object sender, EventArgs e)
-        {
-            tbAccesKeyID.Focus();
-        }
-    }
-}

ExternalConnectors/AWS/AWSConnectionForm.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ExternalConnectors/AWS/EC2FetchDataService.cs

@@ -1,119 +0,0 @@
-using Amazon;
-using Amazon.EC2;
-using Amazon.EC2.Model;
-using Microsoft.Win32;
-
-namespace ExternalConnectors.AWS
-{
-    public class EC2FetchDataService
-    {
-        private static DateTime lastFetch;
-        private static List<InstanceInfo>? lastData;
-
-        // input must be in format "AWSAPI:instanceid" where instanceid is the ec2 instance id, e.g. i-066f750a76c97583d
-        public static async Task<string> GetEC2InstanceDataAsync(string input, string region)
-        {
-            // get secret id
-            if (!input.StartsWith("AWSAPI:"))
-                throw new Exception("calling this function requires AWSAPI: input");
-            string InstanceID = input[7..];
-
-            // init connection credentials, display popup if necessary
-            AWSConnectionData.Init();
-            var alldata = await GetEC2IPDataAsync(region);
-            var found = alldata.Where(x => x.InstanceId == InstanceID).SingleOrDefault();
-            return (found == null) ? "" : found.PublicIP;
-        }
-
-        private static async Task<List<InstanceInfo>> GetEC2IPDataAsync(string region)
-        {
-            // caching
-            TimeSpan timeSpan = DateTime.Now - lastFetch;
-            if (timeSpan.TotalMinutes < 1 && lastData != null)
-                return lastData;
-
-            //AWSConfigs.AWSRegion = AWSConnectionData.region;
-            AWSConfigs.AWSRegion = region;
-            string awsAccessKeyId = AWSConnectionData.awsKeyID;
-            string awsSecretAccessKey = AWSConnectionData.awsKey;
-
-            var _client = new AmazonEC2Client(awsAccessKeyId, awsSecretAccessKey, RegionEndpoint.EUCentral1);
-            bool done = false;
-
-            List<InstanceInfo> instanceList = new();
-            var request = new DescribeInstancesRequest();
-            while (!done)
-            {
-                DescribeInstancesResponse response = await _client.DescribeInstancesAsync(request);
-
-                foreach (var reservation in response.Reservations)
-                {
-                    foreach (var instance in reservation.Instances)
-                    {
-                        string vmname = "";
-                        foreach (var tag in instance.Tags)
-                        {
-                            if (tag.Key == "Name")
-                            {
-                                vmname = tag.Value;
-                            }
-                        }
-                        InstanceInfo inf = new(instance, vmname);
-                        instanceList.Add(inf);
-                    }
-                }
-
-                request.NextToken = response.NextToken;
-
-                if (response.NextToken == null)
-                {
-                    done = true;
-                }
-            }
-
-            lastData = instanceList.OrderBy(x => x.Name).ToList();
-            lastFetch = DateTime.Now;
-            return lastData;
-        }
-
-
-        public static class AWSConnectionData
-        {
-            private static readonly RegistryKey key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\mRemoteAWSInterface");
-
-            public static string awsKeyID = "";
-            public static string awsKey = "";
-            //public static string _region = "eu-central-1";
-
-            public static void Init()
-            {
-                if (awsKey != "")
-                    return;
-                // display gui and ask for data
-                AWSConnectionForm f = new();
-                f.tbAccesKeyID.Text = "" + key.GetValue("KeyID");
-                f.tbAccesKey.Text = "" + key.GetValue("Key");
-                //f.tbRegion.Text = "" + key.GetValue("Region");
-                //if (f.tbRegion.Text == null || f.tbRegion.Text.Length < 2)
-                //    f.tbRegion.Text = region;
-                _ = f.ShowDialog();
-
-                if (f.DialogResult != DialogResult.OK)
-                    return;
-
-                // store values to memory
-                awsKeyID = f.tbAccesKeyID.Text;
-                awsKey = f.tbAccesKey.Text;
-                //region = f.tbRegion.Text;
-
-
-                // write values to registry
-                key.SetValue("KeyID", awsKeyID);
-                key.SetValue("Key", awsKey);
-                //key.SetValue("Region", region);
-                key.Close();
-            }
-        }
-
-    }
-}

ExternalConnectors/AWS/InstanceInfo.cs

@@ -1,34 +0,0 @@
-using Amazon.EC2.Model;
-using System;
-
-namespace ExternalConnectors.AWS
-{
-    public class InstanceInfo
-    {
-        public string InstanceId { get; }
-        public string Name { get; }
-        public string Status { get; }
-        public string PublicIP { get; }
-        public string PrivateIP { get; }
-        public InstanceInfo(Instance instance, string name)
-        {
-            InstanceId = instance.InstanceId;
-            Name = name;
-
-            switch(instance.State.Code)
-            {
-                case 0: Status = "Pending"; break;
-                case 16: Status = "Running"; break;
-                case 32: Status = "Shutdown"; break;
-                case 48: Status = "Terminated"; break;
-                case 64: Status = "Stopping"; break;
-                case 80: Status = "Stopped"; break;
-                default: Status = "Unknown"; break;
-            };
-
-            PublicIP = instance.PublicIpAddress ?? "";
-            PrivateIP = instance.PrivateIpAddress ?? "";
-
-        }
-    }
-}

ExternalConnectors/ExternalConnectors.csproj

@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <OutputType>Library</OutputType>
-    <UseWindowsForms>True</UseWindowsForms>
-    <Platforms>x64</Platforms>
-    <Configurations>Debug;Release;Debug Portable;Release Portable</Configurations>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AWSSDK.Core" Version="3.7.5.13" />
-    <PackageReference Include="AWSSDK.EC2" Version="3.7.54" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="AWS\AWSConnectionForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="TSS\SSConnectionForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-  </ItemGroup>
-
-</Project>

ExternalConnectors/TSS/SSConnectionForm.Designer.cs

@@ -1,256 +0,0 @@
-namespace ExternalConnectors.TSS
-{
-    partial class SSConnectionForm
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tbSSURL = new System.Windows.Forms.TextBox();
-            this.tbUsername = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.tbPassword = new System.Windows.Forms.TextBox();
-            this.btnOK = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.cbUseSSO = new System.Windows.Forms.CheckBox();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
-            this.label4 = new System.Windows.Forms.Label();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tbSSURL
-            // 
-            this.tbSSURL.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbSSURL.Location = new System.Drawing.Point(260, 4);
-            this.tbSSURL.Margin = new System.Windows.Forms.Padding(4);
-            this.tbSSURL.Name = "tbSSURL";
-            this.tbSSURL.Size = new System.Drawing.Size(536, 23);
-            this.tbSSURL.TabIndex = 0;
-            // 
-            // tbUsername
-            // 
-            this.tbUsername.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbUsername.Location = new System.Drawing.Point(260, 35);
-            this.tbUsername.Margin = new System.Windows.Forms.Padding(4);
-            this.tbUsername.Name = "tbUsername";
-            this.tbUsername.Size = new System.Drawing.Size(536, 23);
-            this.tbUsername.TabIndex = 2;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(4, 62);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(248, 23);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "Password";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // tbPassword
-            // 
-            this.tbPassword.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tbPassword.Location = new System.Drawing.Point(260, 66);
-            this.tbPassword.Margin = new System.Windows.Forms.Padding(4);
-            this.tbPassword.Name = "tbPassword";
-            this.tbPassword.Size = new System.Drawing.Size(536, 23);
-            this.tbPassword.TabIndex = 4;
-            this.tbPassword.UseSystemPasswordChar = true;
-            // 
-            // btnOK
-            // 
-            this.btnOK.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.btnOK.Location = new System.Drawing.Point(296, 12);
-            this.btnOK.Margin = new System.Windows.Forms.Padding(4);
-            this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(88, 26);
-            this.btnOK.TabIndex = 10;
-            this.btnOK.Text = "OK";
-            this.btnOK.UseVisualStyleBackColor = true;
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(415, 12);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(4);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(88, 26);
-            this.btnCancel.TabIndex = 11;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 2;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.06997F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.93003F));
-            this.tableLayoutPanel1.Controls.Add(this.label5, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.tbSSURL, 1, 0);
-            this.tableLayoutPanel1.Controls.Add(this.tbUsername, 1, 1);
-            this.tableLayoutPanel1.Controls.Add(this.tbPassword, 1, 2);
-            this.tableLayoutPanel1.Controls.Add(this.cbUseSSO, 0, 3);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 4;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(800, 108);
-            this.tableLayoutPanel1.TabIndex = 12;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label5.Location = new System.Drawing.Point(260, 85);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(536, 23);
-            this.label5.TabIndex = 15;
-            this.label5.Text = "For SSO to work, additional IIS configuration is required!";
-            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Location = new System.Drawing.Point(4, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(248, 31);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Secret Server URL";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(4, 31);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(248, 31);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "DOMAIN\\Username";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // cbUseSSO
-            // 
-            this.cbUseSSO.AutoSize = true;
-            this.cbUseSSO.Location = new System.Drawing.Point(4, 89);
-            this.cbUseSSO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 0);
-            this.cbUseSSO.Name = "cbUseSSO";
-            this.cbUseSSO.Size = new System.Drawing.Size(69, 19);
-            this.cbUseSSO.TabIndex = 14;
-            this.cbUseSSO.Text = "Use SSO";
-            this.cbUseSSO.UseVisualStyleBackColor = true;
-            this.cbUseSSO.CheckedChanged += new System.EventHandler(this.cbUseSSO_CheckedChanged);
-            // 
-            // tableLayoutPanel2
-            // 
-            this.tableLayoutPanel2.ColumnCount = 5;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 23F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 93F));
-            this.tableLayoutPanel2.Controls.Add(this.btnOK, 1, 0);
-            this.tableLayoutPanel2.Controls.Add(this.btnCancel, 3, 0);
-            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 148);
-            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-            this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(800, 50);
-            this.tableLayoutPanel2.TabIndex = 13;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(0, 108);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(341, 15);
-            this.label4.TabIndex = 14;
-            this.label4.Text = "URL is the base URL, like https://cred.domain.local/SecretServer";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // SSConnectionForm
-            // 
-            this.AcceptButton = this.btnOK;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 198);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.tableLayoutPanel2);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Margin = new System.Windows.Forms.Padding(4);
-            this.Name = "SSConnectionForm";
-            this.Text = "Secret Server API Login Data";
-            this.Activated += new System.EventHandler(this.SSConnectionForm_Activated);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.tableLayoutPanel2.ResumeLayout(false);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-        private System.Windows.Forms.Label label3;
-
-        public System.Windows.Forms.TextBox tbSSURL;
-        public System.Windows.Forms.TextBox tbUsername;
-        public System.Windows.Forms.TextBox tbPassword;
-        private System.Windows.Forms.Button btnOK;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        public System.Windows.Forms.CheckBox cbUseSSO;
-        private System.Windows.Forms.Label label4;
-        private Label label5;
-    }
-}

ExternalConnectors/TSS/SSConnectionForm.cs

@@ -1,30 +0,0 @@
-namespace ExternalConnectors.TSS
-{
-    public partial class SSConnectionForm : Form
-    {
-        public SSConnectionForm()
-        {
-            InitializeComponent();
-        }
-
-        private void SSConnectionForm_Activated(object sender, EventArgs e)
-        {
-            SetVisibility();
-            if (cbUseSSO.Checked)
-                btnOK.Focus();
-            else
-                tbPassword.Focus();
-        }
-
-        private void cbUseSSO_CheckedChanged(object sender, EventArgs e)
-        {
-            SetVisibility();
-        }
-        private void SetVisibility()
-        {
-            bool ch = cbUseSSO.Checked;
-            tbPassword.Enabled = !ch;
-            tbUsername.Enabled = !ch;
-        }
-    }
-}

ExternalConnectors/TSS/SSConnectionForm.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ExternalConnectors/TSS/SecretServerAuthentication.cs

@@ -1,364 +0,0 @@
-//----------------------
-// <auto-generated>
-//     Generated using the NSwag toolchain v13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0)) (http://NSwag.org)
-// </auto-generated>
-//----------------------
-
-#pragma warning disable 108 // Disable "CS0108 '{derivedDto}.ToJson()' hides inherited member '{dtoBase}.ToJson()'. Use the new keyword if hiding was intended."
-#pragma warning disable 114 // Disable "CS0114 '{derivedDto}.RaisePropertyChanged(String)' hides inherited member 'dtoBase.RaisePropertyChanged(String)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword."
-#pragma warning disable 472 // Disable "CS0472 The result of the expression is always 'false' since a value of type 'Int32' is never equal to 'null' of type 'Int32?'
-#pragma warning disable 1573 // Disable "CS1573 Parameter '...' has no matching param tag in the XML comment for ...
-#pragma warning disable 1591 // Disable "CS1591 Missing XML comment for publicly visible type or member ..."
-#pragma warning disable 8073 // Disable "CS8073 The result of the expression is always 'false' since a value of type 'T' is never equal to 'null' of type 'T?'"
-#pragma warning disable 3016 // Disable "CS3016 Arrays as attribute arguments is not CLS-compliant"
-
-namespace SecretServerAuthentication.TSS
-{
-    using System = global::System;
-
-    [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")]
-    public partial class OAuth2ServiceClient
-    {
-        private string _baseUrl = "";
-        private System.Net.Http.HttpClient _httpClient;
-        private System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings;
-
-        public OAuth2ServiceClient(string baseUrl, System.Net.Http.HttpClient httpClient)
-        {
-            BaseUrl = baseUrl;
-            _httpClient = httpClient;
-            _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings);
-        }
-
-        private Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings()
-        {
-            var settings = new Newtonsoft.Json.JsonSerializerSettings();
-            UpdateJsonSerializerSettings(settings);
-            return settings;
-        }
-
-        public string BaseUrl
-        {
-            get { return _baseUrl; }
-            set { _baseUrl = value; }
-        }
-
-        protected Newtonsoft.Json.JsonSerializerSettings JsonSerializerSettings { get { return _settings.Value; } }
-
-        partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings);
-
-
-        partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url);
-        partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder);
-        partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response);
-        /// <summary>Retrieve or Refresh Access Token</summary>
-        /// <param name="grant_type">Authentication grant type.  Use 'password' when authenticating, and 'refresh_token' when refreshing a token.</param>
-        /// <param name="username">Secret Server authentication username.  Required when authenticating.</param>
-        /// <param name="password">Secret Server authentication password.  Required when authenticating.</param>
-        /// <param name="refresh_token">The refresh token.  Required when refreshing a token.</param>
-        /// <returns>Successful retrieval of an access token</returns>
-        /// <exception cref="ApiException">A server side error occurred.</exception>
-        public System.Threading.Tasks.Task<TokenResponse> AuthorizeAsync(Grant_type grant_type, string username, string password, string refresh_token)
-        {
-            return AuthorizeAsync(grant_type, username, password, refresh_token, System.Threading.CancellationToken.None);
-        }
-
-        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <summary>Retrieve or Refresh Access Token</summary>
-        /// <param name="grant_type">Authentication grant type.  Use 'password' when authenticating, and 'refresh_token' when refreshing a token.</param>
-        /// <param name="username">Secret Server authentication username.  Required when authenticating.</param>
-        /// <param name="password">Secret Server authentication password.  Required when authenticating.</param>
-        /// <param name="refresh_token">The refresh token.  Required when refreshing a token.</param>
-        /// <returns>Successful retrieval of an access token</returns>
-        /// <exception cref="ApiException">A server side error occurred.</exception>
-        public async System.Threading.Tasks.Task<TokenResponse> AuthorizeAsync(Grant_type grant_type, string username, string password, string refresh_token, System.Threading.CancellationToken cancellationToken)
-        {
-            var urlBuilder_ = new System.Text.StringBuilder();
-            urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/oauth2/token");
-
-            var client_ = _httpClient;
-            var disposeClient_ = false;
-            try
-            {
-                using (var request_ = new System.Net.Http.HttpRequestMessage())
-                {
-                    var keyValues_ = new System.Collections.Generic.List<System.Collections.Generic.KeyValuePair<string, string>>();
-                    if (grant_type == null)
-                        throw new System.ArgumentNullException("grant_type");
-                    else
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("grant_type", ConvertToString(grant_type, System.Globalization.CultureInfo.InvariantCulture)));
-                    if (username != null)
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("username", ConvertToString(username, System.Globalization.CultureInfo.InvariantCulture)));
-                    if (password != null)
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("password", ConvertToString(password, System.Globalization.CultureInfo.InvariantCulture)));
-                    if (refresh_token != null)
-                        keyValues_.Add(new System.Collections.Generic.KeyValuePair<string, string>("refresh_token", ConvertToString(refresh_token, System.Globalization.CultureInfo.InvariantCulture)));
-                    request_.Content = new System.Net.Http.FormUrlEncodedContent(keyValues_);
-                    request_.Method = new System.Net.Http.HttpMethod("POST");
-                    request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
-
-                    PrepareRequest(client_, request_, urlBuilder_);
-
-                    var url_ = urlBuilder_.ToString();
-                    request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute);
-
-                    PrepareRequest(client_, request_, url_);
-
-                    var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-                    var disposeResponse_ = true;
-                    try
-                    {
-                        var headers_ = System.Linq.Enumerable.ToDictionary(response_.Headers, h_ => h_.Key, h_ => h_.Value);
-                        if (response_.Content != null && response_.Content.Headers != null)
-                        {
-                            foreach (var item_ in response_.Content.Headers)
-                                headers_[item_.Key] = item_.Value;
-                        }
-
-                        ProcessResponse(client_, response_);
-
-                        var status_ = (int)response_.StatusCode;
-                        if (status_ == 200)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<TokenResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-                            return objectResponse_.Object;
-                        }
-                        else
-                        if (status_ == 400)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<TokenErrorResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-                            throw new ApiException<TokenErrorResponse>("An error occurred", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
-                        }
-                        else
-                        {
-                            var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false);
-                            throw new ApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null);
-                        }
-                    }
-                    finally
-                    {
-                        if (disposeResponse_)
-                            response_.Dispose();
-                    }
-                }
-            }
-            finally
-            {
-                if (disposeClient_)
-                    client_.Dispose();
-            }
-        }
-
-        protected struct ObjectResponseResult<T>
-        {
-            public ObjectResponseResult(T responseObject, string responseText)
-            {
-                this.Object = responseObject;
-                this.Text = responseText;
-            }
-
-            public T Object { get; }
-
-            public string Text { get; }
-        }
-
-        public bool ReadResponseAsString { get; set; }
-
-        protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> ReadObjectResponseAsync<T>(System.Net.Http.HttpResponseMessage response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Threading.CancellationToken cancellationToken)
-        {
-            if (response == null || response.Content == null)
-            {
-                return new ObjectResponseResult<T>(default(T), string.Empty);
-            }
-
-            if (ReadResponseAsString)
-            {
-                var responseText = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    var typedBody = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(responseText, JsonSerializerSettings);
-                    return new ObjectResponseResult<T>(typedBody, responseText);
-                }
-                catch (Newtonsoft.Json.JsonException exception)
-                {
-                    var message = "Could not deserialize the response body string as " + typeof(T).FullName + ".";
-                    throw new ApiException(message, (int)response.StatusCode, responseText, headers, exception);
-                }
-            }
-            else
-            {
-                try
-                {
-                    using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                    using (var streamReader = new System.IO.StreamReader(responseStream))
-                    using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader))
-                    {
-                        var serializer = Newtonsoft.Json.JsonSerializer.Create(JsonSerializerSettings);
-                        var typedBody = serializer.Deserialize<T>(jsonTextReader);
-                        return new ObjectResponseResult<T>(typedBody, string.Empty);
-                    }
-                }
-                catch (Newtonsoft.Json.JsonException exception)
-                {
-                    var message = "Could not deserialize the response body stream as " + typeof(T).FullName + ".";
-                    throw new ApiException(message, (int)response.StatusCode, string.Empty, headers, exception);
-                }
-            }
-        }
-
-        private string ConvertToString(object value, System.Globalization.CultureInfo cultureInfo)
-        {
-            if (value == null)
-            {
-                return "";
-            }
-
-            if (value is System.Enum)
-            {
-                var name = System.Enum.GetName(value.GetType(), value);
-                if (name != null)
-                {
-                    var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name);
-                    if (field != null)
-                    {
-                        var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field, typeof(System.Runtime.Serialization.EnumMemberAttribute))
-                            as System.Runtime.Serialization.EnumMemberAttribute;
-                        if (attribute != null)
-                        {
-                            return attribute.Value != null ? attribute.Value : name;
-                        }
-                    }
-
-                    var converted = System.Convert.ToString(System.Convert.ChangeType(value, System.Enum.GetUnderlyingType(value.GetType()), cultureInfo));
-                    return converted == null ? string.Empty : converted;
-                }
-            }
-            else if (value is bool)
-            {
-                return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant();
-            }
-            else if (value is byte[])
-            {
-                return System.Convert.ToBase64String((byte[])value);
-            }
-            else if (value.GetType().IsArray)
-            {
-                var array = System.Linq.Enumerable.OfType<object>((System.Array)value);
-                return string.Join(",", System.Linq.Enumerable.Select(array, o => ConvertToString(o, cultureInfo)));
-            }
-
-            var result = System.Convert.ToString(value, cultureInfo);
-            return result == null ? "" : result;
-        }
-    }
-
-    /// <summary>API access token response</summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public partial class TokenResponse
-    {
-        /// <summary>Authentication token</summary>
-        [Newtonsoft.Json.JsonProperty("access_token", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-        public string Access_token { get; set; }
-
-        /// <summary>Authentication token type</summary>
-        [Newtonsoft.Json.JsonProperty("token_type", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-        [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-        public TokenResponseToken_type Token_type { get; set; }
-
-        /// <summary>Authentication token expiration time, in seconds</summary>
-        [Newtonsoft.Json.JsonProperty("expires_in", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-        public string Expires_in { get; set; }
-
-        /// <summary>Refresh token.  This is only provided when the server is set to allow refresh tokens for web services and when the session timeout duration is not set to Unlimited.</summary>
-        [Newtonsoft.Json.JsonProperty("refresh_token", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public string Refresh_token { get; set; }
-
-
-    }
-
-    /// <summary>API access token error response</summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public partial class TokenErrorResponse
-    {
-        /// <summary>Authentication token</summary>
-        [Newtonsoft.Json.JsonProperty("message", Required = Newtonsoft.Json.Required.Always)]
-        [System.ComponentModel.DataAnnotations.Required(AllowEmptyStrings = true)]
-        public string Message { get; set; }
-
-
-    }
-
-    /// <summary>Authentication grant type.  Use 'password' when authenticating, and 'refresh_token' when refreshing a token.</summary>
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public enum Grant_type
-    {
-        [System.Runtime.Serialization.EnumMember(Value = @"password")]
-        Password = 0,
-
-        [System.Runtime.Serialization.EnumMember(Value = @"refresh_token")]
-        Refresh_token = 1,
-
-    }
-
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.5.2.0 (Newtonsoft.Json v11.0.0.0)")]
-    public enum TokenResponseToken_type
-    {
-        [System.Runtime.Serialization.EnumMember(Value = @"bearer")]
-        Bearer = 0,
-
-    }
-
-    [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")]
-    public partial class ApiException : System.Exception
-    {
-        public int StatusCode { get; private set; }
-
-        public string Response { get; private set; }
-
-        public System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> Headers { get; private set; }
-
-        public ApiException(string message, int statusCode, string response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, System.Exception innerException)
-            : base(message + "\n\nStatus: " + statusCode + "\nResponse: \n" + ((response == null) ? "(null)" : response.Substring(0, response.Length >= 512 ? 512 : response.Length)), innerException)
-        {
-            StatusCode = statusCode;
-            Response = response;
-            Headers = headers;
-        }
-
-        public override string ToString()
-        {
-            return string.Format("HTTP Response: \n\n{0}\n\n{1}", Response, base.ToString());
-        }
-    }
-
-    [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.14.8.0 (NJsonSchema v10.5.2.0 (Newtonsoft.Json v11.0.0.0))")]
-    public partial class ApiException<TResult> : ApiException
-    {
-        public TResult Result { get; private set; }
-
-        public ApiException(string message, int statusCode, string response, System.Collections.Generic.IReadOnlyDictionary<string, System.Collections.Generic.IEnumerable<string>> headers, TResult result, System.Exception innerException)
-            : base(message, statusCode, response, headers, innerException)
-        {
-            Result = result;
-        }
-    }
-
-}
-
-#pragma warning restore 1591
-#pragma warning restore 1573
-#pragma warning restore 472
-#pragma warning restore 114
-#pragma warning restore 108
-#pragma warning restore 3016

ExternalConnectors/TSS/SecretServerInterface.cs

@@ -1,184 +0,0 @@
-using Microsoft.Win32;
-using SecretServerAuthentication.TSS;
-using SecretServerRestClient.TSS;
-
-namespace ExternalConnectors.TSS
-{
-    public class SecretServerInterface
-    {
-        private static class SSConnectionData
-        {
-            public static string ssUsername = "";
-            public static string ssPassword = "";
-            public static string ssUrl = "";
-            public static bool ssSSO = false;
-
-            public static bool initdone = false;
-
-            public static void Init()
-            {
-                if (ssPassword != "" || initdone == true)
-                    return;
-
-                RegistryKey key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\mRemoteSSInterface");
-                try
-                {
-                    // display gui and ask for data
-                    SSConnectionForm f = new SSConnectionForm();
-                    string? un = key.GetValue("Username") as string;
-                    f.tbUsername.Text = un ?? "";
-
-                    string? url = key.GetValue("URL") as string;
-                    if (url == null || !url.Contains("://"))
-                        url = "https://cred.domain.local/SecretServer";
-                    f.tbSSURL.Text = url;
-
-                    var b = key.GetValue("SSO");
-                    if (b == null || (string)b != "True")
-                        ssSSO = false;
-                    else
-                    {
-                        ssSSO = true;
-                        initdone = true;
-                    }
-                    f.cbUseSSO.Checked = ssSSO;
-
-                    // show dialog
-                    while(true)
-                    {
-                        _ = f.ShowDialog();
-
-                        if (f.DialogResult != DialogResult.OK)
-                            return;
-
-                        // store values to memory
-                        ssUsername = f.tbUsername.Text;
-                        ssPassword = f.tbPassword.Text;
-                        ssUrl = f.tbSSURL.Text;
-                        ssSSO = f.cbUseSSO.Checked;
-
-                        // check connection first
-                        try
-                        {
-                            if (TestCredentials() == true)
-                                break;
-                        }
-                        catch (Exception)
-                        {
-                            MessageBox.Show("TestCredentials failed - please check your credentials");
-                        }
-                    }
-
-
-                    // write values to registry
-                    key.SetValue("Username", ssUsername);
-                    key.SetValue("URL", ssUrl);
-                    key.SetValue("SSO", ssSSO);
-                }
-                catch (Exception)
-                {
-                    throw;
-                }
-                finally
-                {
-                    key.Close();
-                }
-
-            }
-        }
-
-        private static bool TestCredentials()
-        {
-            string authUsername = SSConnectionData.ssUsername;
-            string authPassword = SSConnectionData.ssPassword;
-            string baseURL = SSConnectionData.ssUrl;
-
-            if (SSConnectionData.ssSSO)
-            {
-                // checking creds doesn't really make sense here, as we can't modify them anyway if something is wrong
-                return true;
-            }
-            else
-            {
-                using (var httpClient = new HttpClient())
-                {
-                    // Authenticate:
-                    var tokenClient = new OAuth2ServiceClient(baseURL, httpClient);
-                    // call below will throw an exception if the creds are invalid
-                    var token = tokenClient.AuthorizeAsync(Grant_type.Password, authUsername, authPassword, null).Result;
-                    // here we can be sure the creds are ok - return success state
-                    return true;
-                }
-            }
-        }
-
-        private static void FetchSecret(int secretID, out string secretUsername, out string secretPassword, out string secretDomain)
-        {
-            string authUsername = SSConnectionData.ssUsername;
-            string authPassword = SSConnectionData.ssPassword;
-            string baseURL = SSConnectionData.ssUrl;
-
-            SecretModel secret;
-            if (SSConnectionData.ssSSO)
-            {
-                // REQUIRES IIS CONFIG! https://docs.thycotic.com/ss/11.0.0/api-scripting/webservice-iwa-powershell
-                var handler = new HttpClientHandler() { UseDefaultCredentials = true };
-                using (var httpClient = new HttpClient(handler))
-                {
-                    // Call REST API:
-                    var client = new SecretsServiceClient($"{baseURL}/winauthwebservices/api", httpClient);
-                    secret = client.GetSecretAsync(false, true, secretID, null).Result;
-                }
-            }
-            else
-            {
-                using (var httpClient = new HttpClient())
-                {
-                    // Authenticate:
-                    var tokenClient = new OAuth2ServiceClient(baseURL, httpClient);
-                    var token = tokenClient.AuthorizeAsync(Grant_type.Password, authUsername, authPassword, null).Result;
-                    var tokenResult = token.Access_token;
-
-                    // Set credentials (token):
-                    httpClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", tokenResult);
-
-                    // Call REST API:
-                    var client = new SecretsServiceClient($"{baseURL}/api", httpClient);
-                    secret = client.GetSecretAsync(false, true, secretID, null).Result;
-                }
-            }
-
-            // clear return variables
-            secretDomain = "";
-            secretUsername = "";
-            secretPassword = "";
-
-            // parse data and extract what we need
-            foreach (var item in secret.Items)
-            {
-                if (item.FieldName.ToLower().Equals("domain"))
-                    secretDomain = item.ItemValue;
-                else if (item.FieldName.ToLower().Equals("username"))
-                    secretUsername = item.ItemValue;
-                else if (item.FieldName.ToLower().Equals("password"))
-                    secretPassword = item.ItemValue;
-            }
-
-        }
-
-        // input must be in form "SSAPI:xxxx" where xxx is the secret id to fetch
-        public static void FetchSecretFromServer(string input, out string username, out string password, out string domain)
-        {
-            // get secret id
-            if (!input.StartsWith("SSAPI:"))
-                throw new Exception("calling this function requires SSAPI: input");
-            int secretID = Int32.Parse(input.Substring(6));
-
-            // init connection credentials, display popup if necessary
-            SSConnectionData.Init();
-
-            // get the secret
-            FetchSecret(secretID, out username, out password, out domain);
-        }
-    }
-}

InstallerProjects/CustomActions/CustomActions.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,60 +10,32 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CustomActions</RootNamespace>
     <AssemblyName>CustomActions</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
     <TargetFrameworkProfile />
   </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>
+  </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>
   <PropertyGroup>
     <StartupObject>
     </StartupObject>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Portable|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug Portable\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Portable|x64'">
-    <OutputPath>bin\x64\Release Portable\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Installer|x64'">
-    <OutputPath>bin\x64\Release Installer\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Management" />

InstallerProjects/CustomActions/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

InstallerProjects/Installer/Fragments/MainExeFragment.wxs

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment>
+    <Component Id="C.MainExe" Directory="INSTALLDIR" Guid="*">
+      <File Id="MainExeFile" Source="$(var.SolutionDir)mRemoteV1\bin\$(var.Configuration)\mRemoteNG.exe" />
+    </Component>
+	</Fragment>
+</Wix>

InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs

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

InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs

@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Fragment>
     <DirectoryRef Id="INSTALLDIR">
-      <Component Id="C.PuttyNGFile" Guid="86bc1cf4-4c51-40a1-a9fe-cf9669bb883a">
+      <Component Id="C.PuttyNGFile" Guid="*">
         <File Id="PuttyNGFile" Name="PuTTYNG.exe" Source="$(var.HarvestPath)\PuTTYNG.exe" KeyPath="yes" />
       </Component>
     </DirectoryRef>

InstallerProjects/Installer/Fragments/RegistryEntriesFragment.wxs

@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<Fragment>
     <DirectoryRef Id="TARGETDIR">
-      <Component Id="C.RegistryEntries" Guid="888643e4-4c52-45d3-801a-0d0d71c737fe">
+      <Component Id="C.RegistryEntries" Guid="*">
         <RegistryKey Root="HKLM" Key="Software\mRemoteNG">
           <RegistryValue Type="string" Name="InstallDir" Value="[INSTALLDIR]" KeyPath="yes" />
         </RegistryKey>

InstallerProjects/Installer/Includes/Config.wxi

@@ -26,5 +26,9 @@
     <?define ProductNameWithPlatform = "$(var.ProductName) (64 bit)" ?>
     <?define Win64 = "yes" ?>
     <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+  <?else ?>
+    <?define ProductNameWithPlatform = "$(var.ProductName)" ?>
+    <?define Win64 = "no" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
   <?endif ?>
 </Include>

InstallerProjects/Installer/Installer.wixproj

@@ -0,0 +1,138 @@
+<?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)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>f0168b9f-6815-40df-ba53-46cee7683b68</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>mRemoteNG-Installer</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug Portable' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug Portable;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release Portable' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release Portable;</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="CustomActions\CheckForInstalledWindowsUpdates.wxs" />
+    <Compile Include="CustomActions\SaveInstallLocation.wxs" />
+    <Compile Include="CustomActions\UninstallLegacyVersions.wxs" />
+    <Compile Include="Fragments\FilesFragment.wxs" />
+    <Compile Include="Fragments\DirectoriesFragment.wxs" />
+    <Compile Include="Fragments\MainExeFragment.wxs" />
+    <Compile Include="Fragments\MiscTextFilesFragment.wxs" />
+    <Compile Include="Fragments\PuTTYNGFragment.wxs" />
+    <Compile Include="Fragments\RegistryEntriesFragment.wxs" />
+    <Compile Include="Fragments\ShortcutFragment.wxs" />
+    <Compile Include="mRemoteNGV1.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Filters\Harvest_Filter.xslt" />
+    <Content Include="Includes\Config.wxi" />
+    <Content Include="Resources\AppIcon.ico" />
+    <Content Include="Resources\Installer_Header.png" />
+    <Content Include="Resources\Installer_Side.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="CustomActions" />
+    <Folder Include="CustomDialogs" />
+    <Folder Include="Fragments" />
+    <Folder Include="Includes" />
+    <Folder Include="Localizations" />
+    <Folder Include="Filters" />
+    <Folder Include="bin" />
+    <Folder Include="Resources" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localizations\en-US.wxl" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\mRemoteV1\mRemoteV1.csproj">
+      <Name>mRemoteV1</Name>
+      <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>APPLICATIONROOTDIRECTORY</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+    -->
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <LinkerAdditionalOptions>
+    </LinkerAdditionalOptions>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+    <Cultures>en-US</Cultures>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <Cultures>en-US</Cultures>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|x86' ">
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>REM Clean the TargetDir
+rmdir /S /Q "$(TargetDir)"
+
+echo $(ConfigurationName) &gt; buildenv.tmp
+
+REM Harvest bin directory of the mRemoteV1 project
+"$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -nologo -dr INSTALLDIR -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt"
+
+REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
+"$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>:: When passing paths to powershell scripts, check if the path ends with a backslash "\"
+:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.
+
+powershell -noprofile -command "sleep 2"
+
+set /p buildenv=&lt;buildenv.tmp
+
+:: Manual builds, set the cert password and uncomment below.
+:: IF "%25APPVEYOR_BUILD_FOLDER"=="" ( set cert_pwd=  )
+
+:: Call the post build powershell script
+powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_installer.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "%25cd%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe"</PostBuildEvent>
+  </PropertyGroup>
+</Project>

InstallerProjects/Installer/Localizations/en-US.wxl

@@ -19,7 +19,7 @@
   <!-- Features and install options -->
   <String Id="Feature_Complete">Complete</String>
   <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
-  <String Id="Feature_StartMenuShortcut">Start Menu Shortcut</String>
+  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
   
   <!-- GUI Page Text -->
   <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch mRemoteNG now</String>

InstallerProjects/Installer/Resources/License.rtf

@@ -47,5 +47,36 @@
 {\pard \ql \f0 \sa180 \li360 \fi0 \f1         NO WARRANTY\par}
 {\pard \ql \f0 \sa180 \li360 \fi-360 11.\tx360\tab BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par}
 {\pard \ql \f0 \sa180 \li360 \fi-360 12.\tx360\tab IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par}
-{\pard \ql \f0 \sa180 \li360 \fi0 \f1      END OF TERMS AND CONDITIONS\sa180\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 \f1      END OF TERMS AND CONDITIONS\line
+\line
+How to Apply These Terms to Your New Programs\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 <one line to give the program's name and a brief idea of what it does.>\line
+Copyright (C) <year>  <name of author>\line
+\line
+This program is free software; you can redistribute it and/or modify\line
+it under the terms of the GNU General Public License as published by\line
+the Free Software Foundation; either version 2 of the License, or\line
+(at your option) any later version.\line
+\line
+This program is distributed in the hope that it will be useful,\line
+but WITHOUT ANY WARRANTY; without even the implied warranty of\line
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\line
+GNU General Public License for more details.\line
+\line
+You should have received a copy of the GNU General Public License along\line
+with this program; if not, write to the Free Software Foundation, Inc.,\line
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also add information on how to contact you by electronic and paper mail.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Gnomovision version 69, Copyright (C) year name of author\line
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\line
+This is free software, and you are welcome to redistribute it\line
+under certain conditions; type `show c' for details.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The hypothetical commands {\f1 show w' and}show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than {\f1 show w' and}show c'; they could even be mouse-clicks or menu items--whatever suits your program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 , 1 April 1989 Ty Coon, President of Vice\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.\par}
 }

InstallerProjects/Installer/Resources/Pandoc/COPYING.rtf

@@ -0,0 +1,85 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}}
+{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
+\widowctrl\hyphauto
+
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 GNU GENERAL PUBLIC LICENSE\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Version 2, June 1991\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Copyright (C) 1989, 1991 Free Software Foundation, Inc.\line 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs32 Preamble\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software\u8211-to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation\u8217's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also, for each author\u8217's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors\u8217' reputations.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone\u8217's free use or not licensed at all.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The precise terms and conditions for copying, distribution and modification follow.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs32 GNU GENERAL PUBLIC LICENSE\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 0.\tx360\tab This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The \u8220"Program\u8221", below, refers to any such program or work, and a \u8220"work based on the Program\u8221" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term \u8220"modification\u8221".) Each licensee is addressed as \u8220"you\u8221".\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 1.\tx360\tab You may copy and distribute verbatim copies of the Program\u8217's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 2.\tx360\tab You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 a)\tx360\tab You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 b)\tx360\tab You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 c)\tx360\tab If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\sa180\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 3.\tx360\tab You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 a)\tx360\tab Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 b)\tx360\tab Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 c)\tx360\tab Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\sa180\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 4.\tx360\tab You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 5.\tx360\tab You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 6.\tx360\tab Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients\u8217' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 7.\tx360\tab If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 8.\tx360\tab If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 9.\tx360\tab The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and \u8220"any later version\u8221", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 10.\tx360\tab If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 NO WARRANTY\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 11.\tx360\tab BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \u8220"AS IS\u8221" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 12.\tx360\tab IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 END OF TERMS AND CONDITIONS\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs32 How to Apply These Terms to Your New Programs\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the \u8220"copyright\u8221" line and a pointer to where the full notice is found.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 <one line to give the program's name and a brief idea of what it does.>\line
+Copyright (C) <year>  <name of author>\line
+\line
+This program is free software; you can redistribute it and/or modify\line
+it under the terms of the GNU General Public License as published by\line
+the Free Software Foundation; either version 2 of the License, or\line
+(at your option) any later version.\line
+\line
+This program is distributed in the hope that it will be useful,\line
+but WITHOUT ANY WARRANTY; without even the implied warranty of\line
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\line
+GNU General Public License for more details.\line
+\line
+You should have received a copy of the GNU General Public License\line
+along with this program; if not, write to the Free Software\line
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also add information on how to contact you by electronic and paper mail.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Gnomovision version 69, Copyright (C) year  name of author\line
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\line
+This is free software, and you are welcome to redistribute it\line
+under certain conditions; type `show c' for details.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The hypothetical commands {\f1 show w' and}show c\u8217' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than {\f1 show w' and}show c\u8217'; they could even be mouse-clicks or menu items\u8211-whatever suits your program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You should also get your employer (if you work as a programmer) or your school, if any, to sign a \u8220"copyright disclaimer\u8221" for the program, if necessary. Here is a sample; alter the names:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Yoyodyne, Inc., hereby disclaims all copyright interest in the program\line
+`Gnomovision' (which makes passes at compilers) written by James Hacker.\line
+\line
+<signature of Ty Coon>, 1 April 1989\line
+Ty Coon, President of Vice\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.\par}
+}

InstallerProjects/Installer/Resources/Pandoc/COPYRIGHT.txt

@@ -0,0 +1,108 @@
+Pandoc
+Copyright (C) 2006-2016 John MacFarlane <jgm at berkeley dot edu>
+
+This code is released under the [GPL], version 2 or later:
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+The GNU General Public License is available in the file COPYING in
+the source distribution.  On Debian systems, the complete text of the
+GPL can be found in `/usr/share/common-licenses/GPL`.
+
+[GPL]: http://www.gnu.org/copyleft/gpl.html
+
+Pandoc's complete source code is available from the [Pandoc home page].
+
+[Pandoc home page]: http://pandoc.org
+
+Pandoc includes some code from other authors.  The copyright and license
+statements for these sources are included below.  All are GPL-compatible
+licenses.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Writers/Texinfo.hs
+Copyright (C) 2008-2015 John MacFarlane and Peter Wang
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Writers/OpenDocument.hs
+Copyright (C) 2008-2015 Andrea Rossato and John MacFarlane
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Writers/Org.hs
+Copyright (C) 2010-2015 Puneeth Chaganti and John MacFarlane
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Readers/Textile.hs
+Copyright (C) 2010-2015 Paul Rivier and John MacFarlane
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Readers/Org.hs
+tests/Tests/Readers/Org.hs
+Copyright (C) 2014-2015 Albert Krewinkel
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+data/LaTeXMathML.js
+Adapted by Jeff Knisely and Douglas Woodall from
+ASCIIMathML.js v. 1.4.7
+Copyright (C) 2005 Peter Jipsen
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+data/MathMLinHTML.js
+Copyright (C) 2004 Peter Jipsen http://www.chapman.edu/~jipsen
+
+Released under the GNU General Public License version 2 or later.
+
+------------------------------------------------------------------------
+The dzslides template contains javascript and CSS from Paul Rouget's
+dzslides template.
+http://github.com/paulrouget/dzslides
+
+Released under the Do What the Fuck You Want To Public License.
+
+------------------------------------------------------------------------
+Pandoc embeds a lua interpreter (via hslua).
+
+Copyright © 1994–2015 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

InstallerProjects/Installer/mRemoteNGV1.wxs

@@ -9,7 +9,7 @@
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="!(loc.Upgrade_NewerVersionInstalled)" Schedule="afterInstallExecute" />
     <MediaTemplate EmbedCab="yes" />
-    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)mRemoteNGInstaller\CustomActions\bin\x64\$(var.Configuration)\CustomActions.CA.dll" />
+    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)InstallerProjects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
     <Property Id="MsiLogging" Value="v" />
     <Property Id="ARPPRODUCTICON" Value="AppIcon.ico" />
     <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
@@ -70,27 +70,32 @@
     <Condition Message="!(loc.Install_RDP80Requirement)">
       <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND (MINIMUM_RDP_VERSION_INSTALLED = 1))]]>
     </Condition>
-
-    <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="expand" Level="1">
-      <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
-      <ComponentRef Id="C.MainExe" Primary="yes" />
-      <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
-      <ComponentRef Id="C.RegistryEntries" Primary="yes" />
-       <Feature Id="F.PuttyNG" Title="PuTTYNG" Absent="allow" AllowAdvertise="no" Level="1">
-         <ComponentRef Id="C.PuttyNGFile" Primary="yes" />
-        </Feature>
-    </Feature>
-
-    <Feature Id="F.DesktopShortcut" Title="!(loc.Feature_DesktopShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
-      <ComponentRef Id="C.DesktopShortcut" Primary="yes" />
-    </Feature>
-
-    <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
-      <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
-    </Feature>
     
+    
+
+    <Feature Id="F.Complete" Title="!(loc.Feature_Complete)" Display="expand" AllowAdvertise="no" Level="1">
+      <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Level="1">
+        <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
+        <ComponentRef Id="C.MainExe" Primary="yes" />
+        <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
+        <ComponentRef Id="C.RegistryEntries" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.PuttyNG" Title="PuTTYNG" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.PuttyNGFile" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.DesktopShortcut" Title="!(loc.Feature_DesktopShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.DesktopShortcut" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
+      </Feature>
+    </Feature>
+
     <UI>
-      <UIRef Id="My_WixUI_FeatureTree"/>
+      <UIRef Id="WixUI_FeatureTree"/>
       <UIRef Id="WixUI_ErrorProgressText" />
       <Publish Dialog="ExitDialog"
         Control="Finish"

Jenkinsfile

@@ -0,0 +1,63 @@
+#!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

@@ -0,0 +1,71 @@
+node('windows') {
+	def jobDir = pwd()
+	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
+    def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
+    def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe"
+    def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe"
+    def testResultFilePrefix = "TestResult"
+    def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml"
+    def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml"
+    def coverageReport = "code_coverage_report.xml"
+
+	
+	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,134 +1,49 @@
-**NOTICE: This project currently transited to a new maintainer. Development help would be greatly appreciated.**
+# Welcome to the mRemoteNG project!
 
-<br/><br/>
-<p align="center">
-  <img width="450" src="https://github.com/mRemoteNG/mRemoteNG/blob/develop/mRemoteNGProjectFiles/Header_dark.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>
+[![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)
 
-<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>
+[![Github Releases](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/total.svg?style=flat-square)](https://github.com/mRemoteNG/mRemoteNG/releases/)
 
-<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>  
-</p>
-<p align="center">
-  <a href="https://www.paypal.com/paypalme/mremoteng">
-    <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>
+[![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://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>
-
----
-
-| Channel | Build Status | Downloads |
+| Update Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
-| Stable | ![Build status](https://ci.appveyor.com/api/projects/status/rqwxjxldail7btcf?svg=true) | [![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) |
-| Preview | ![Build status](https://ci.appveyor.com/api/projects/status/rqwxjxldail7btcf/branch/preview?svg=true) | [![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 status](https://ci.appveyor.com/api/projects/status/rqwxjxldail7btcf/branch/develop?svg=true) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/2022.01.07-1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/2022.01.07-1.77.2-nb) |
+| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
+| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
+| Development | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
+
+mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
 
 ## Features
 
-The following protocols are supported:
+mRemoteNG is a fork of mRemote: an open source, tabbed, multi-protocol, remote connections manager. mRemoteNG adds bug fixes and new features to mRemote.
 
-* RDP (Remote Desktop Protocol)
+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)
 * 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 [Documentation](https://mremoteng.readthedocs.io/en/latest/).
+For a detailed feature list and general usage support, refer to the [User Manual](https://github.com/mRemoteNG/mRemoteNG/wiki/User-Manual).
 
 ## Installation
 
-### Supported Operating Systems
+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).
 
-- [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 2022](https://en.wikipedia.org/wiki/Windows_Server_2022)
-- [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)
-
-#### 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 - 2022](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
-* [Microsoft .NET 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
-* 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:
+mRemoteNG is available as a redistributable msi 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 [/qn] C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value] [/lv* <log path>]`
-
-| Argument/Property | Value | Description |
-|-|-|-|
-| /qn | `Silent Installation` | Will run the installer silently in the background. |
-| /lv* | `Silent Installation` | Will write a logfile to the specified location. (For paths that contain spaces, enclose the path in double quotes) |
-| INSTALLDIR | `folder path` | Allows you to set the installation directory from the command line. (For paths that contain spaces, enclose the path in double quotes) |
-| 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. |
-
-## 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.
@@ -137,9 +52,6 @@ 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
 
-</br>
-<p align="center">
-  <img alt="Developed with ReSharper" src="https://github.com/mRemoteNG/mRemoteNG/blob/develop/mRemoteNGProjectFiles/icon_ReSharper.png">
-</p>
+[![Developed with ReSharper](https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/.github/icon_ReSharper.png)](https://www.jetbrains.com/resharper/)

Tools/7zip/License.txt

@@ -0,0 +1,31 @@
+      7-Zip Extra
+      ~~~~~~~~~~~
+      License for use and distribution
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+      Copyright (C) 1999-2018 Igor Pavlov.
+
+      7-Zip Extra files are under the GNU LGPL license.
+
+      
+      Notes: 
+        You can use 7-Zip Extra on any computer, including a computer in a commercial 
+        organization. You don't need to register or pay for 7-Zip.
+
+
+      GNU LGPL information
+      --------------------
+
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public
+        License as published by the Free Software Foundation; either
+        version 2.1 of the License, or (at your option) any later version.
+
+        This library is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+        Lesser General Public License for more details.
+
+        You can receive a copy of the GNU Lesser General Public License from 
+        http://www.gnu.org/
+

Tools/7zip/history.txt

@@ -0,0 +1,96 @@
+7-Zip Extra history
+-------------------
+
+This file contains only information about changes related to that package exclusively.
+The full history of changes is listed in history.txt in main 7-Zip program.
+
+
+18.05          2018-04-30
+-------------------------
+- The speed for LZMA/LZMA2 compressing was increased 
+    by 8% for fastest/fast compression levels and 
+    by 3% for normal/maximum compression levels.
+
+
+18.03 beta     2018-03-04
+-------------------------
+- The speed for single-thread LZMA/LZMA2 decoding
+  was increased  by 30% in x64 version and by 3% in x86 version.
+- 7-Zip now can use multi-threading for 7z/LZMA2 decoding,
+  if there are multiple independent data chunks in LZMA2 stream.
+
+
+9.35 beta           2014-12-07
+------------------------------
+  - SFX modules were moved to LZMA SDK package.
+
+
+9.34 alpha          2014-06-22
+------------------------------
+  - Minimum supported system now is Windows 2000 for EXE and DLL files.
+  - all EXE and DLL files use msvcrt.dll.
+  - 7zr.exe now support AES encryption.
+
+
+9.18                2010-11-02
+------------------------------
+  - New small SFX module for installers.
+
+
+9.17                2010-10-04
+------------------------------
+  - New 7-Zip plugin for FAR Manager x64.
+
+
+9.10                2009-12-30
+------------------------------
+  - 7-Zip for installers now supports LZMA2.
+
+
+9.09                2009-12-12
+------------------------------
+  - LZMA2 compression method support.
+  - Some bugs were fixed.
+
+
+4.65                2009-02-03
+------------------------------
+  - Some bugs were fixed.
+
+
+4.38 beta           2006-04-13
+------------------------------
+  - SFX for installers now supports new properties in config file:
+    Progress, Directory, ExecuteFile, ExecuteParameters.
+
+
+4.34 beta           2006-02-27
+------------------------------
+  - ISetProperties::SetProperties:
+      it's possible to specify desirable number of CPU threads: 
+           PROPVARIANT: name=L"mt", vt = VT_UI4, ulVal = NumberOfThreads
+      If "mt" is not defined, 7za.dll will check number of processors in system to set 
+      number of desirable threads. 
+      Now 7za.dll can use:
+        2 threads for LZMA compressing
+        N threads for BZip2 compressing
+        4 threads for BZip2 decompressing
+      Other codecs use only one thread. 
+      Note: 7za.dll can use additional "small" threads with low CPU load.
+  - It's possible to call ISetProperties::SetProperties to specify "mt" property for decoder.
+
+
+4.33 beta           2006-02-05
+------------------------------
+  - Compressing speed and Memory requirements were increased.
+    Default dictionary size was increased: Fastest: 64 KB, Fast: 1 MB, 
+    Normal: 4 MB, Max: 16 MB, Ultra: 64 MB.
+  - 7z/LZMA now can use only these match finders: HC4, BT2, BT3, BT4
+
+
+4.27                2005-09-21
+------------------------------
+ - Some GUIDs/interfaces were changed.
+   IStream.h:
+     ISequentialInStream::Read now works as old ReadPart
+     ISequentialOutStream::Write now works as old WritePart

Tools/7zip/readme.txt

@@ -0,0 +1,124 @@
+7-Zip Extra 18.05
+-----------------
+
+7-Zip Extra is package of extra modules of 7-Zip. 
+
+7-Zip Copyright (C) 1999-2018 Igor Pavlov.
+
+7-Zip is free software. Read License.txt for more information about license.
+
+Source code of binaries can be found at:
+  http://www.7-zip.org/
+
+This package contains the following files:
+
+7za.exe     - standalone console version of 7-Zip with reduced formats support.
+7za.dll     - library for working with 7z archives
+7zxa.dll    - library for extracting from 7z archives
+License.txt - license information
+readme.txt  - this file
+
+Far\        - plugin for Far Manager
+x64\        - binaries for x64
+
+
+All 32-bit binaries can work in:
+  Windows 2000 / 2003 / 2008 / XP / Vista / 7 / 8 / 10
+  and  in any Windows x64 version with WoW64 support.
+All x64 binaries can work in any Windows x64 version. 
+
+All binaries use msvcrt.dll.
+
+7za.exe 
+-------
+
+7za.exe - is a standalone console version of 7-Zip with reduced formats support.
+
+  Extra: 7za.exe             : support for only some formats of 7-Zip.
+  7-Zip: 7z.exe with 7z.dll  : support for all formats of 7-Zip.
+
+7za.exe and 7z.exe from 7-Zip have same command line interface.
+7za.exe doesn't use external DLL files.
+
+You can read Help File (7-zip.chm) from 7-Zip package for description 
+of all commands and switches for 7za.exe and 7z.exe.
+
+7za.exe features:
+
+  - High compression ratio in 7z format
+  - Supported formats:
+      - Packing / unpacking: 7z, xz, ZIP, GZIP, BZIP2 and TAR 
+      - Unpacking only: Z, lzma, CAB.
+  - Highest compression ratio for ZIP and GZIP formats.
+  - Fast compression and decompression
+  - Strong AES-256 encryption in 7z and ZIP formats.
+
+Note: LZMA SDK contains 7zr.exe - more reduced version of 7za.exe.
+But you can use 7zr.exe as "public domain" code.
+
+
+
+DLL files
+---------
+
+7za.dll and 7zxa.dll are reduced versions of 7z.dll from 7-Zip.
+7za.dll and 7zxa.dll support only 7z format.
+Note: 7z.dll is main DLL file that works with all archive types in 7-Zip.
+
+7za.dll and 7zxa.dll support the following decoding methods:
+    - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES, BZip2, Deflate.
+
+7za.dll also supports 7z encoding with the following encoding methods:
+    - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES.
+
+7za.dll and 7zxa.dll work via COM interfaces.
+But these DLLs don't use standard COM interfaces for objects creating.
+
+Look also example code that calls DLL functions (in source code of 7-Zip):
+ 
+ 7zip\UI\Client7z
+
+Another example of binary that uses these interface is 7-Zip itself.
+The following binaries from 7-Zip use 7z.dll:
+  - 7z.exe (console version)
+  - 7zG.exe (GUI version)
+  - 7zFM.exe (7-Zip File Manager)
+
+Note: The source code of LZMA SDK also contains the code for similar DLLs
+(DLLs without BZip2, Deflate support). And these files from LZMA SDK can be 
+used as "public domain" code. If you use LZMA SDK files, you don't need to 
+follow GNU LGPL rules, if you want to change the code.
+
+
+
+
+License FAQ
+-----------
+
+Can I use the EXE or DLL files from 7-Zip in a commercial application?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Yes, but you are required to specify in documentation for your application:
+  (1) that you used parts of the 7-Zip program, 
+  (2) that 7-Zip is licensed under the GNU LGPL license and 
+  (3) you must give a link to www.7-zip.org, where the source code can be found.
+
+
+Can I use the source code of 7-Zip in a commercial application?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Since 7-Zip is licensed under the GNU LGPL you must follow the rules of that license. 
+In brief, it means that any LGPL'ed code must remain licensed under the LGPL. 
+For instance, you can change the code from 7-Zip or write a wrapper for some 
+code from 7-Zip and compile it into a DLL; but, the source code of that DLL 
+(including your modifications / additions / wrapper) must be licensed under 
+the LGPL or GPL. 
+Any other code in your application can be licensed as you wish. This scheme allows 
+users and developers to change LGPL'ed code and recompile that DLL. That is the 
+idea of free software. Read more here: http://www.gnu.org/. 
+
+
+
+Note: You can look also LZMA SDK, which is available under a more liberal license.
+
+
+---
+End of document

Tools/appveyor_after_build.ps1

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

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

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

@@ -0,0 +1,15 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+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
+
+Write-Output ""

Tools/copy_release_installer.ps1

@@ -0,0 +1,21 @@
+param (
+    [string]
+    $SourcePath,
+
+    [string]
+    $DestinationDir
+)
+
+Write-Host $SourcePath
+Write-Host $DestinationDir
+
+if (!(Test-Path -Path $DestinationDir))
+{
+    New-Item -Path $DestinationDir -ItemType "directory"
+}
+
+$sourceFiles = Get-ChildItem -Path $SourcePath -Recurse | ?{$_.Extension -match "exe|msi"}
+foreach ($item in $sourceFiles)
+{
+    Copy-Item -Path $item.FullName -Destination $DestinationDir -Force
+}

Tools/copy_themes.ps1

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

Tools/copy_tiles.ps1

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

Tools/old/BUILD.CMD

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

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

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

Tools/postbuild_installer.ps1

@@ -25,9 +25,9 @@ param (
     $ExcludeFromSigning
 )
 
-Write-Output "+===========================================================================================+"
-Write-Output "|                          Beginning mRemoteNG Installer Post Build                         |"
-Write-Output "+===========================================================================================+"
+Write-Output "+=================================================================+"
+Write-Output "|             Beginning mRemoteNG Installer Post Build            |"
+Write-Output "+=================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
     "TargetDir" = $TargetDir
@@ -40,4 +40,5 @@ Format-Table -AutoSize -Wrap -InputObject @{
 
 & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
 & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
-& "$PSScriptRoot\rename_and_copy_installer.ps1" -SolutionDir $SolutionDir
+& "$PSScriptRoot\rename_installer_with_version.ps1" -SolutionDir $SolutionDir
+& "$PSScriptRoot\copy_release_installer.ps1" -SourcePath $TargetDir -DestinationDir (Join-Path -Path $SolutionDir -ChildPath "Release")

Tools/postbuild_mremotev1.ps1

@@ -25,9 +25,9 @@ param (
     $ExcludeFromSigning
 )
 
-Write-Output "+===========================================================================================+"
-Write-Output "|                               Beginning mRemoteNG Post Build                              |"
-Write-Output "+===========================================================================================+"
+Write-Output "+=================================================================+"
+Write-Output "|                  Beginning mRemoteV1 Post Build                 |"
+Write-Output "+=================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
     "TargetDir" = $TargetDir
@@ -37,25 +37,16 @@ Format-Table -AutoSize -Wrap -InputObject @{
     "ExcludeFromSigning" = $ExcludeFromSigning
 }
 
-# Move dlls resurses into folder
-#Remove-Item -Path "$TargetDir\libs" -Recurse -ErrorAction Ignore
-#New-Item -ItemType "directory" -Force -Path $TargetDir -Name "libs"
-#Move-Item -Path "$TargetDir\*.dll" -Destination "$TargetDir\libs" -force
 
 
-###
-
-# Move lang resurses into folder
-#Remove-Item -Path "$TargetDir\languages" -Recurse -ErrorAction Ignore
-#New-Item -ItemType "directory" -Force -Path $TargetDir -Name "languages"
-#"cs-CZ,de,el,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk,tr-TR,zh-CN,zh-TW,fi-FI".Split(",") | ForEach {
-#    Move-Item -Path "$TargetDir\$_" -Destination "$TargetDir\languages" -force
-# }
-###
-
+& "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
+& "$PSScriptRoot\copy_themes.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
+& "$PSScriptRoot\copy_tiles.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
+& "$PSScriptRoot\sphinx_docs.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
 & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
-& "$PSScriptRoot\zip_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\zip_symbols.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/rename_and_copy_installer.ps1

@@ -1,13 +0,0 @@
-param (
-    [string]
-    $SolutionDir
-)
-
-
-$targetVersionedFile = "$SolutionDir\mRemoteNG\bin\x64\Release\mRemoteNG.exe"
-$version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
-$src = $SolutionDir + "mRemoteNGInstaller\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
-$dst = $SolutionDir + "mRemoteNG\bin\x64\Release\mRemoteNG-Installer-" + $version + ".msi"
-
-# Copy file
-Copy-Item $src -Destination $dst -Force

Tools/rename_installer_with_version.ps1

@@ -0,0 +1,29 @@
+param (
+    [string]
+    $SolutionDir
+)
+
+$renameTarget = $SolutionDir + "InstallerProjects\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
+
+Write-Host $SolutionDir
+Write-Host $renameTarget
+
+$targetVersionedFile = "$SolutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
+$version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
+
+
+$renameTargetFileObject = Get-Item -Path $renameTarget -ErrorAction SilentlyContinue
+if ($renameTargetFileObject)
+{
+    # Build the new file name
+    $oldFileName = $renameTargetFileObject.Name
+    $newFileName = $oldFileName -replace "$("\"+$renameTargetFileObject.Extension)",$("-"+$version+$renameTargetFileObject.Extension)
+    Write-Host $oldFileName
+    Write-Host $newFileName
+
+    # Delete any items that already exist with the new name (effectively an overwrite)
+    Remove-Item -Path "$($renameTargetFileObject.Directory.FullName)\$newFileName" -ErrorAction SilentlyContinue
+
+    # Rename file
+    Rename-Item -Path $renameTarget -NewName $newFileName -ErrorAction SilentlyContinue
+}

Tools/sphinx_docs.ps1

@@ -0,0 +1,23 @@
+param (	
+	[string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+	
+	[string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+Write-Output "Building HTML-Documentation with Sphinx"
+
+$path_HelpFilesDir = Join-Path -Path $TargetDir -ChildPath "Help"
+$path_SphinxSourceDir = Join-Path -Path $SolutionDir -ChildPath "mremoteV1\Documentation"
+# Remove stale Help files, if they exist
+if (Test-Path -Path $path_HelpFilesDir) {
+    Remove-Item -Path $path_HelpFilesDir -Recurse -Force
+}
+sphinx-build $path_SphinxSourceDir $path_HelpFilesDir
+
+Write-Output ""

Tools/tidy_files_for_release.ps1

@@ -7,15 +7,15 @@ param (
     [Parameter(Mandatory=$true)]
     $ConfigurationName
 )
-Write-Output ""
+
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 
 # Remove unnecessary files from Release versions
-if ($ConfigurationName -match "Release") 
-{
+if ($ConfigurationName -match "Release") {
+    Write-Output "Removing unnecessary files from Release versions"
+
     $test = Join-Path -Path $TargetDir -ChildPath "app.publish"
-    if (Test-Path  $test -PathType Container) 
-	{
+    if (Test-Path  $test -PathType Container) {
         Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
     }
 
@@ -29,18 +29,10 @@ if ($ConfigurationName -match "Release")
     ) -Exclude @(
         "mRemoteNG.VisualElementsManifest.xml"
 	)
-	if ($filesToDelete) 
-	{ 
-		Write-Output "Unnecessary files are detected and will be removed" 
-		Remove-Item -Path $filesToDelete.FullName
-		Write-Output $filesToDelete.FullName
-	} else 
-	{
-		Write-Output "  No unnecessary files are detected"
-	}
+    Remove-Item -Path $filesToDelete.FullName
+    Write-Output $filesToDelete.FullName
 }
-else 
-{
+else {
     Write-Output "We will not remove anything - this is not a release build."
 }
 

Tools/verify_binary_signatures.ps1

@@ -20,7 +20,6 @@ param (
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 
-
 #  validate release versions and if the certificate value was passed
 if ($ConfigurationName -match "Release" -And ($CertificatePath)) {
 	

Tools/zip_files.ps1

@@ -1,83 +0,0 @@
-param (
-    [string]
-    [Parameter(Mandatory=$true)]
-    $SolutionDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $TargetDir,
-
-    [string]
-    [Parameter(Mandatory=$true)]
-    $ConfigurationName
-)
-
-Write-Output ""
-Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-$ConfigurationName = $ConfigurationName.Trim()
-Write-Output "Config Name (trimmed): '$($ConfigurationName)'"
-$exe = Join-Path -Path $TargetDir -ChildPath $TargetFileName
-$Version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($exe).FileVersion
-Write-Output "Version is $($version)"
-
-# Fix for AppVeyor
-if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) {
-    if(!(test-path "Release")) {
-        New-Item -ItemType Directory -Force -Path "Release" | Out-Null
-    }
-}
-
-# Package debug symbols zip file
-if ($ConfigurationName -match "Release") {
-    Write-Output "Packaging debug symbols"
-
-    if ($ConfigurationName -match "Portable") {
-        $zipFilePrefix = "mRemoteNG-Portable-symbols"
-    } else {
-        $zipFilePrefix = "mRemoteNG-symbols"
-    }
-
-    $debugFile = Join-Path -Path $TargetDir -ChildPath "mRemoteNG.pdb"
-
-    # AppVeyor build
-    if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) {
-        $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\$zipFilePrefix-$($version).zip"
-        7z a $outputZipPath $debugFile
-    }
-    # Local build
-    else {
-		if (!(Test-Path -Path $debugFile -PathType Leaf))
-		{
-			$outputZipPath = "$($SolutionDir)Release\$zipFilePrefix-$($version).zip"
-			Compress-Archive $debugFile $outputZipPath -Force
-		} else {
-			write-host "File do not exist:" $debugFile", nothing to compress"
-		}
-    }
-
-    Remove-Item $debugFile
-}
-
-# Package portable release zip file
-if ($ConfigurationName -eq "Release Portable") {
-    Write-Output "Packaging portable ZIP file"
-
-    # AppVeyor build
-    if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) {
-        $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\mRemoteNG-Portable-$($version).zip"
-        7z a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath $TargetDir\*
-    }
-    # Local build
-    else {
-		if ($Source)
-		{
-			$outputZipPath="$($SolutionDir)\Release\mRemoteNG-Portable-$($version).zip"
-			Compress-Archive $Source $outputZipPath -Force
-		} else {
-			write-host "File do not exist:" $Source", nothing to compress"
-		}
-    }
-}
-
-Write-Output ""

Tools/zip_portable_files.ps1

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

Tools/zip_symbols.ps1

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

mRemoteNG.Specs/App.config

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
+  
+</configuration>

mRemoteNG.Specs/Features/CredentialRepository.feature.cs

@@ -1,23 +1,24 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//      This code was generated by SpecFlow (https://www.specflow.org/).
-//      SpecFlow Version:3.9.0.0
-//      SpecFlow Generator Version:3.9.0.0
+//      This code was generated by SpecFlow (http://www.specflow.org/).
+//      SpecFlow Version:2.2.0.0
+//      SpecFlow Generator Version:2.2.0.0
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 #region Designer generated code
+
+using NUnit.Framework;
+
 #pragma warning disable
-namespace mRemoteNGSpecs.Features
+namespace mRemoteNG.Specs.Features
 {
     using TechTalk.SpecFlow;
-    using System;
-    using System.Linq;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.9.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "2.2.0.0")]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [NUnit.Framework.TestFixtureAttribute()]
     [NUnit.Framework.DescriptionAttribute("CredentialRepository")]
@@ -26,8 +27,6 @@ namespace mRemoteNGSpecs.Features
         
         private TechTalk.SpecFlow.ITestRunner testRunner;
         
-        private string[] _featureTags = ((string[])(null));
-        
 #line 1 "CredentialRepository.feature"
 #line hidden
         
@@ -35,7 +34,7 @@ namespace mRemoteNGSpecs.Features
         public virtual void FeatureSetup()
         {
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
-            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "CredentialRepository", "\tAs a user with several environments\r\n\tI would like to load multiple credential r" +
+            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "CredentialRepository", "\tAs a user with several environments\r\n\tI would like to load multiple credential r" +
                     "epositories\r\n\tIn order to keep credentials separate", ProgrammingLanguage.CSharp, ((string[])(null)));
             testRunner.OnFeatureStart(featureInfo);
         }
@@ -53,18 +52,12 @@ namespace mRemoteNGSpecs.Features
         }
         
         [NUnit.Framework.TearDownAttribute()]
-        public virtual void TestTearDown()
+        public virtual void ScenarioTearDown()
         {
             testRunner.OnScenarioEnd();
         }
         
-        public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
-        {
-            testRunner.OnScenarioInitialize(scenarioInfo);
-            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<NUnit.Framework.TestContext>(NUnit.Framework.TestContext.CurrentContext);
-        }
-        
-        public virtual void ScenarioStart()
+        public virtual void ScenarioSetup(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
             testRunner.OnScenarioStart();
         }
@@ -77,137 +70,66 @@ namespace mRemoteNGSpecs.Features
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Load credential repository")]
         [NUnit.Framework.CategoryAttribute("credentials")]
+        [Ignore("Cred Repo not implmented currently.")]
         public virtual void LoadCredentialRepository()
         {
-            string[] tagsOfScenario = new string[] {
-                    "credentials"};
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Load credential repository", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Load credential repository", "", new string[] {
+                        "credentials"});
 #line 7
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                this.ScenarioStart();
+this.ScenarioSetup(scenarioInfo);
 #line 8
  testRunner.Given("I have a credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line hidden
 #line 9
  testRunner.And("the credential repository is unloaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line hidden
 #line 10
  testRunner.When("I click load", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line hidden
 #line 11
  testRunner.Then("the credential repository is loaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-            }
             this.ScenarioCleanup();
         }
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Add credential record")]
+        [Ignore("Cred Repo not implmented currently.")]
         public virtual void AddCredentialRecord()
         {
-            string[] tagsOfScenario = ((string[])(null));
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add credential record", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add credential record", "", ((string[])(null)));
 #line 13
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                this.ScenarioStart();
+this.ScenarioSetup(scenarioInfo);
 #line 14
  testRunner.Given("I have a credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line hidden
 #line 15
  testRunner.And("The credential repository is loaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line hidden
 #line 16
  testRunner.And("The repository has 0 credentials", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line hidden
 #line 17
  testRunner.When("I click add credential", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line hidden
 #line 18
  testRunner.Then("the repository has 1 credentials", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-            }
             this.ScenarioCleanup();
         }
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Unload credential repository")]
+        [Ignore("Cred Repo not implmented currently.")]
         public virtual void UnloadCredentialRepository()
         {
-            string[] tagsOfScenario = ((string[])(null));
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Unload credential repository", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Unload credential repository", "", ((string[])(null)));
 #line 20
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                this.ScenarioStart();
+this.ScenarioSetup(scenarioInfo);
 #line 21
  testRunner.Given("I have a credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line hidden
 #line 22
  testRunner.And("The credential repository is loaded", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line hidden
 #line 23
  testRunner.And("The repository has 1 credentials", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line hidden
 #line 24
  testRunner.When("I click unload", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line hidden
 #line 25
  testRunner.Then("the credentials in the repository will no longer be available", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-            }
             this.ScenarioCleanup();
         }
     }

mRemoteNG.Specs/Features/CredentialRepositoryList.feature.cs

@@ -1,33 +1,33 @@
 // ------------------------------------------------------------------------------
 //  <auto-generated>
-//      This code was generated by SpecFlow (https://www.specflow.org/).
-//      SpecFlow Version:3.9.0.0
-//      SpecFlow Generator Version:3.9.0.0
+//      This code was generated by SpecFlow (http://www.specflow.org/).
+//      SpecFlow Version:2.2.0.0
+//      SpecFlow Generator Version:2.2.0.0
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
 //  </auto-generated>
 // ------------------------------------------------------------------------------
 #region Designer generated code
+
+using NUnit.Framework;
+
 #pragma warning disable
-namespace mRemoteNGSpecs.Features
+namespace mRemoteNG.Specs.Features
 {
     using TechTalk.SpecFlow;
-    using System;
-    using System.Linq;
     
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.9.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "2.2.0.0")]
     [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [NUnit.Framework.TestFixtureAttribute()]
     [NUnit.Framework.DescriptionAttribute("CredentialRepositoryList")]
+    [Ignore("Cred Repo not implmented currently.")]
     public partial class CredentialRepositoryListFeature
     {
         
         private TechTalk.SpecFlow.ITestRunner testRunner;
         
-        private string[] _featureTags = ((string[])(null));
-        
 #line 1 "CredentialRepositoryList.feature"
 #line hidden
         
@@ -35,7 +35,7 @@ namespace mRemoteNGSpecs.Features
         public virtual void FeatureSetup()
         {
             testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
-            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "CredentialRepositoryList", "\tAs a user with several environments\r\n\tI would like to load multiple credential r" +
+            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "CredentialRepositoryList", "\tAs a user with several environments\r\n\tI would like to load multiple credential r" +
                     "epositories\r\n\tIn order to keep credentials separate", ProgrammingLanguage.CSharp, ((string[])(null)));
             testRunner.OnFeatureStart(featureInfo);
         }
@@ -53,18 +53,12 @@ namespace mRemoteNGSpecs.Features
         }
         
         [NUnit.Framework.TearDownAttribute()]
-        public virtual void TestTearDown()
+        public virtual void ScenarioTearDown()
         {
             testRunner.OnScenarioEnd();
         }
         
-        public virtual void ScenarioInitialize(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
-        {
-            testRunner.OnScenarioInitialize(scenarioInfo);
-            testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs<NUnit.Framework.TestContext>(NUnit.Framework.TestContext.CurrentContext);
-        }
-        
-        public virtual void ScenarioStart()
+        public virtual void ScenarioSetup(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
         {
             testRunner.OnScenarioStart();
         }
@@ -77,88 +71,42 @@ namespace mRemoteNGSpecs.Features
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Add a new credential repository")]
         [NUnit.Framework.CategoryAttribute("credentials")]
+        [Ignore("Cred Repo not implmented currently.")]
         public virtual void AddANewCredentialRepository()
         {
-            string[] tagsOfScenario = new string[] {
-                    "credentials"};
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add a new credential repository", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Add a new credential repository", "", new string[] {
+                        "credentials"});
 #line 7
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                this.ScenarioStart();
+this.ScenarioSetup(scenarioInfo);
 #line 8
  testRunner.Given("I have a credential repository list", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line hidden
 #line 9
  testRunner.And("It has 0 repositories set up", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line hidden
 #line 10
  testRunner.When("I press add and complete the creation wizard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line hidden
 #line 11
  testRunner.Then("I will have 1 credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-            }
             this.ScenarioCleanup();
         }
         
         [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Remove a credential repository")]
+        [Ignore("Cred Repo not implmented currently.")]
         public virtual void RemoveACredentialRepository()
         {
-            string[] tagsOfScenario = ((string[])(null));
-            System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary();
-            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Remove a credential repository", null, tagsOfScenario, argumentsOfScenario, this._featureTags);
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Remove a credential repository", "", ((string[])(null)));
 #line 13
-this.ScenarioInitialize(scenarioInfo);
-#line hidden
-            bool isScenarioIgnored = default(bool);
-            bool isFeatureIgnored = default(bool);
-            if ((tagsOfScenario != null))
-            {
-                isScenarioIgnored = tagsOfScenario.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((this._featureTags != null))
-            {
-                isFeatureIgnored = this._featureTags.Where(__entry => __entry != null).Where(__entry => String.Equals(__entry, "ignore", StringComparison.CurrentCultureIgnoreCase)).Any();
-            }
-            if ((isScenarioIgnored || isFeatureIgnored))
-            {
-                testRunner.SkipScenario();
-            }
-            else
-            {
-                this.ScenarioStart();
+this.ScenarioSetup(scenarioInfo);
 #line 14
  testRunner.Given("I have a credential repository list", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line hidden
 #line 15
  testRunner.And("It has 2 repositories set up", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
-#line hidden
 #line 16
  testRunner.When("I remove the first repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line hidden
 #line 17
  testRunner.Then("I will have 1 credential repository", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line hidden
-            }
             this.ScenarioCleanup();
         }
     }

mRemoteNG.Specs/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("mRemoteNG.Specs")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("mRemoteNG.Specs")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[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("16aa21e2-d6b7-427d-ab7d-aa8c611b724e")]
+
+// 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")]

mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs

@@ -1,10 +1,10 @@
 using System.Linq;
 using mRemoteNG.Credential.Repositories;
-using mRemoteNGSpecs.Utilities;
+using mRemoteNG.Specs.Utilities;
 using NUnit.Framework;
 using TechTalk.SpecFlow;
 
-namespace mRemoteNGSpecs.StepDefinitions
+namespace mRemoteNG.Specs.StepDefinitions
 {
     [Binding]
     public class CredentialRepositoryListSteps
@@ -17,7 +17,7 @@ namespace mRemoteNGSpecs.StepDefinitions
         {
             _credentialRepositoryList = new CredentialRepositoryList();
         }
-
+        
         [Given(@"It has (.*) repositories set up")]
         public void GivenItHasRepositoriesSetUp(int numberOfCredentialRepos)
         {
@@ -45,4 +45,4 @@ namespace mRemoteNGSpecs.StepDefinitions
             Assert.That(_credentialRepositoryList.CredentialProviders.Count(), Is.EqualTo(expectedCredRepoCount));
         }
     }
-}
+}

mRemoteNG.Specs/StepDefinitions/CredentialRepositorySteps.cs

@@ -1,11 +1,11 @@
 using System.Security;
 using mRemoteNG.Credential;
 using mRemoteNG.Security;
-using mRemoteNGSpecs.Utilities;
+using mRemoteNG.Specs.Utilities;
 using NUnit.Framework;
 using TechTalk.SpecFlow;
 
-namespace mRemoteNGSpecs.StepDefinitions
+namespace mRemoteNG.Specs.StepDefinitions
 {
     [Binding]
     public class CredentialRepositorySteps
@@ -16,7 +16,7 @@ namespace mRemoteNGSpecs.StepDefinitions
         [Given(@"I have a credential repository")]
         public void GivenIHaveACredentialRepository()
         {
-            var utilityFactory = new XmlCredentialRepoBuilder { EncryptionKey = _key };
+            var utilityFactory = new XmlCredentialRepoBuilder {EncryptionKey = _key};
             _credentialRepository = utilityFactory.BuildXmlCredentialRepo();
         }
 
@@ -70,11 +70,11 @@ namespace mRemoteNGSpecs.StepDefinitions
         {
             _credentialRepository.UnloadCredentials();
         }
-
+        
         [Then(@"the credentials in the repository will no longer be available")]
         public void ThenTheCredentialsInTheRepositoryWillNoLongerBeAvailable()
         {
             Assert.That(_credentialRepository.CredentialRecords, Is.Empty);
         }
     }
-}
+}

mRemoteNG.Specs/Utilities/CredRepoXmlFileBuilder.cs

@@ -0,0 +1,12 @@
+namespace mRemoteNG.Specs.Utilities
+{
+    public class CredRepoXmlFileBuilder
+    {
+        public string Build(string authHeader)
+        {
+            return "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                    $"<Credentials EncryptionEngine=\"AES\" BlockCipherMode=\"GCM\" KdfIterations=\"1000\" Auth=\"{authHeader}\" SchemaVersion=\"1.0\">" +
+                    "</Credentials>";
+        }
+    }
+}

mRemoteNG.Specs/Utilities/XmlCredentialRepoBuilder.cs

@@ -7,7 +7,7 @@ using mRemoteNG.Credential.Repositories;
 using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 
-namespace mRemoteNGSpecs.Utilities
+namespace mRemoteNG.Specs.Utilities
 {
     public class XmlCredentialRepoBuilder
     {

mRemoteNG.Specs/mRemoteNG.Specs.csproj

@@ -0,0 +1,136 @@
+<?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.224\build\SpecFlow.NUnit.props" Condition="Exists('..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.props')" />
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>mRemoteNG.Specs</RootNamespace>
+    <AssemblyName>mRemoteNG.Specs</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|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.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\portable-net45+win8+wp8+wpa81\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.224\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.224\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\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
+    <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\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.targets'))" />
+  </Target>
+  <Import Project="..\packages\SpecFlow.NUnit.3.0.224\build\SpecFlow.NUnit.targets" Condition="Exists('..\packages\SpecFlow.NUnit.3.0.224\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

@@ -0,0 +1,25 @@
+<?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.6" targetFramework="net46" />
+  <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.13.0" targetFramework="net46" />
+  <package id="SpecFlow" version="3.0.224" targetFramework="net46" />
+  <package id="SpecFlow.NUnit" version="3.0.224" targetFramework="net46" />
+  <package id="SpecFlow.NUnit.Runners" version="3.0.224" targetFramework="net46" />
+  <package id="System.Reflection.Emit" version="4.3.0" targetFramework="net46" />
+  <package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net46" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net46" />
+  <package id="Utf8Json" version="1.3.7" targetFramework="net46" />
+</packages>

mRemoteNG.sln

@@ -1,87 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31912.275
-MinimumVisualStudioVersion = 14.0.25420.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mRemoteNGInstaller", "mRemoteNGInstaller", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomActions", "mRemoteNGInstaller\CustomActions\CustomActions.csproj", "{5423D985-CB48-4344-B47F-E8C6D60C8B04}"
-EndProject
-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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExternalConnectors", "ExternalConnectors\ExternalConnectors.csproj", "{A56A2029-79B8-492A-ABE5-D2BFE05801BD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Portable|x64 = Debug Portable|x64
-		Debug|x64 = Debug|x64
-		Release Installer|x64 = Release Installer|x64
-		Release Portable|x64 = Release Portable|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.Build.0 = Debug Portable|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.ActiveCfg = Debug|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.Build.0 = Debug|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.ActiveCfg = Release|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.Build.0 = Release|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.ActiveCfg = Release Portable|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.Build.0 = Release Portable|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.ActiveCfg = Release|x64
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.Build.0 = Release|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.ActiveCfg = Debug|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.ActiveCfg = Release|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.ActiveCfg = Release Portable|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.Build.0 = Release Portable|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.ActiveCfg = Release|x64
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.Build.0 = Release|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.ActiveCfg = Release|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.Build.0 = Release|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.ActiveCfg = Release Portable|x64
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.ActiveCfg = Release|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.Build.0 = Release|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.ActiveCfg = Release Portable|x64
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.ActiveCfg = Debug|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.ActiveCfg = Release|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.ActiveCfg = Release Portable|x64
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug Portable|x64.Build.0 = Debug Portable|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug|x64.ActiveCfg = Debug|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Debug|x64.Build.0 = Debug|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release Installer|x64.ActiveCfg = Release|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release Installer|x64.Build.0 = Release|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release Portable|x64.ActiveCfg = Release Portable|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release Portable|x64.Build.0 = Release Portable|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release|x64.ActiveCfg = Release|x64
-		{A56A2029-79B8-492A-ABE5-D2BFE05801BD}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04} = {4FE795BE-646E-4F1B-BAD0-A68EA26394DD}
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68} = {4FE795BE-646E-4F1B-BAD0-A68EA26394DD}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5D390A0C-2FC4-4908-B86E-7E4DEF5916EC}
-	EndGlobalSection
-EndGlobal

mRemoteNG/App/NativeMethods.cs

@@ -1,552 +0,0 @@
-using System;
-using System.Drawing;
-using System.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
-using System.Text;
-
-#pragma warning disable 649
-#pragma warning disable 169
-
-namespace mRemoteNG.App
-{
-    public static class NativeMethods
-    {
-        #region Functions
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool AppendMenu(IntPtr hMenu, int uFlags, IntPtr uIDNewItem, string lpNewItem);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr CreatePopupMenu();
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr FindWindowEx(IntPtr parentHandle,
-                                                   IntPtr childAfter,
-                                                   string lclassName,
-                                                   string windowTitle);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr GetForegroundWindow();
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool InsertMenu(IntPtr hMenu,
-                                               int uPosition,
-                                               int uFlags,
-                                               IntPtr uIDNewItem,
-                                               string lpNewItem);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern int IsIconic(IntPtr hWnd);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool MoveWindow(IntPtr hWnd, int x, int y, int cx, int cy, bool repaint);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, StringBuilder lParam);
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
-        internal static extern IntPtr SendMessage(IntPtr hWnd, uint msg, IntPtr wParam, string lParam);
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
-        internal static extern IntPtr SendMessage([In] IntPtr hWnd,
-                                                  [In] uint msg,
-                                                  [Out] StringBuilder wParam,
-                                                  [In] IntPtr lParam);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer);
-
-        [DllImport("User32.dll", CharSet = CharSet.Auto)]
-        internal static extern bool ChangeClipboardChain(
-            IntPtr hWndRemove,  // handle to window to remove
-            IntPtr hWndNewNext  // handle to next window
-        );
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool SetForegroundWindow(IntPtr hWnd);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern bool SetMenuItemBitmaps(IntPtr hMenu,
-                                                       int uPosition,
-                                                       int uFlags,
-                                                       IntPtr hBitmapUnchecked,
-                                                       IntPtr hBitmapChecked);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern long SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern int ShowWindow(IntPtr hWnd, int nCmdShow);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern IntPtr WindowFromPoint(Point point);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
-
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        internal static extern int GetDlgCtrlID(IntPtr hwndCtl);
-
-        [DllImport("user32", ExactSpelling = true, CharSet = CharSet.Ansi, SetLastError = true)]
-        internal static extern bool GetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
-
-        [DllImport("user32", ExactSpelling = true, CharSet = CharSet.Ansi, SetLastError = true)]
-        internal static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
-
-        [DllImport("kernel32", SetLastError = true)]
-        internal static extern bool CloseHandle(IntPtr handle);
-
-        #endregion
-
-        #region Structures
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct WINDOWPOS
-        {
-            public IntPtr hwnd;
-            public IntPtr hwndInsertAfter;
-            public int x;
-            public int y;
-            public int cx;
-            public int cy;
-            public int flags;
-        }
-
-        internal struct WINDOWPLACEMENT
-        {
-            public uint length;
-            public uint flags;
-            public uint showCmd;
-            public POINT ptMinPosition;
-            public POINT ptMaxPosition;
-            public RECT rcNormalPosition;
-        }
-
-        internal struct POINT
-        {
-            public long x;
-            public long y;
-        }
-
-        internal struct RECT
-        {
-            public long left;
-            public long top;
-            public long right;
-            public long bottom;
-        }
-
-        #endregion
-
-        #region Helpers
-
-        public static int MAKELONG(int wLow, int wHigh)
-        {
-            return wLow | wHigh << 16;
-        }
-
-        public static int MAKELPARAM(ref int wLow, ref int wHigh)
-        {
-            return MAKELONG(wLow, wHigh);
-        }
-
-        public static int LOWORD(int value)
-        {
-            return value & 0xFFFF;
-        }
-
-        public static int LOWORD(IntPtr value)
-        {
-            return LOWORD(value.ToInt32());
-        }
-
-        public static int HIWORD(int value)
-        {
-            return value >> 16;
-        }
-
-        public static int HIWORD(IntPtr value)
-        {
-            return HIWORD(value.ToInt32());
-        }
-
-        #endregion
-
-        #region Constants
-
-        public const int TRUE = 1;
-
-        #region GetWindowLong
-
-        public const int GWL_STYLE = (-16);
-
-        #endregion
-
-        #region AppendMenu / ModifyMenu / DeleteMenu / RemoveMenu
-
-        public const int MF_BYCOMMAND = 0x0;
-        public const int MF_BYPOSITION = 0x400;
-        public const int MF_STRING = 0x0;
-        public const int MF_POPUP = 0x10;
-        public const int MF_SEPARATOR = 0x800;
-
-        #endregion
-
-        #region WM_LBUTTONDOWN / WM_LBUTTONUP
-
-        public const int MK_LBUTTON = 0x1;
-
-        #endregion
-
-        #region ShowWindow
-
-        public const uint SW_HIDE = 0;
-        public const uint SW_SHOWNORMAL = 1;
-        public const uint SW_SHOWMINIMIZED = 2;
-        public const uint SW_SHOWMAXIMIZED = 3;
-        public const uint SW_MAXIMIZE = 3;
-        public const uint SW_SHOWNOACTIVATE = 4;
-        public const uint SW_SHOW = 5;
-        public const uint SW_MINIMIZE = 6;
-        public const uint SW_SHOWMINNOACTIVE = 7;
-        public const uint SW_SHOWNA = 8;
-        public const uint SW_RESTORE = 9;
-
-        #endregion
-
-        #region SetWindowPos / WM_WINDOWPOSCHANGING / WM_WINDOWPOSCHANGED
-
-        /// <summary>
-        /// Retains the current size (ignores the cx and cy parameters).
-        /// </summary>
-        public const int SWP_NOSIZE = 0x1;
-
-        /// <summary>
-        /// Retains the current position (ignores the x and y parameters).
-        /// </summary>
-        public const int SWP_NOMOVE = 0x2;
-
-        /// <summary>
-        /// Retains the current Z order (ignores the hWndInsertAfter parameter).
-        /// </summary>
-        public const int SWP_NOZORDER = 0x4;
-
-        /// <summary>
-        /// Does not redraw changes. If this flag is set, no repainting of any kind occurs. This applies to the client area, the nonclient area (including the title bar and scroll bars), and any part of the parent window uncovered as a result of the window being moved. When this flag is set, the application must explicitly invalidate or redraw any parts of the window and parent window that need redrawing.
-        /// </summary>
-        public const int SWP_NOREDRAW = 0x8;
-
-        /// <summary>
-        /// Does not activate the window. If this flag is not set, the window is activated and moved to the top of either the topmost or non-topmost group (depending on the setting of the hWndInsertAfter parameter).
-        /// </summary>
-        public const int SWP_NOACTIVATE = 0x10;
-
-        /// <summary>
-        /// Draws a frame (defined in the window's class description) around the window.
-        /// </summary>
-        public const int SWP_DRAWFRAME = 0x20;
-
-        /// <summary>
-        /// Sends a WM_NCCALCSIZE message to the window, even if the window's size is not being changed. If this flag is not specified, WM_NCCALCSIZE is sent only when the window's size is being changed.
-        /// </summary>
-        public const int SWP_FRAMECHANGED = 0x20;
-
-        /// <summary>
-        /// Displays the window.
-        /// </summary>
-        public const int SWP_SHOWWINDOW = 0x40;
-
-        /// <summary>
-        /// Hides the window.
-        /// </summary>
-        public const int SWP_HIDEWINDOW = 0x80;
-
-        /// <summary>
-        /// Discards the entire contents of the client area. If this flag is not specified, the valid contents of the client area are saved and copied back into the client area after the window is sized or repositioned.
-        /// </summary>
-        public const int SWP_NOCOPYBITS = 0x100;
-
-        /// <summary>
-        /// Does not change the owner window's position in the Z order.
-        /// </summary>
-        public const int SWP_NOOWNERZORDER = 0x200;
-
-        /// <summary>
-        /// Prevents the window from receiving the WM_WINDOWPOSCHANGING message.
-        /// </summary>
-        public const int SWP_NOSENDCHANGING = 0x400;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public const int SWP_NOCLIENTSIZE = 0x800;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public const int SWP_NOCLIENTMOVE = 0x1000;
-
-        /// <summary>
-        /// Prevents generation of the WM_SYNCPAINT message.
-        /// </summary>
-        public const int SWP_DEFERERASE = 0x2000;
-
-        /// <summary>
-        /// If the calling thread and the thread that owns the window are attached to different input queues, the system posts the request to the thread that owns the window. This prevents the calling thread from blocking its execution while other threads process the request.
-        /// </summary>
-        public const int SWP_ASYNCWINDOWPOS = 0x4000;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public const int SWP_STATECHANGED = 0x8000;
-
-        #endregion
-
-        #region Window Placement Flags (WPF)
-
-        public const uint WPF_SETMINPOSITION = 0x1;
-        public const uint WPF_RESTORETOMAXIMIZED = 0x2;
-        public const uint WPF_ASYNCWINDOWPLACEMENT = 0x4;
-
-        #endregion
-
-        #region WM_ACTIVATE
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public const int WA_INACTIVE = 0x0;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public const int WA_ACTIVE = 0x1;
-
-        /// <summary>
-        /// Sent to both the window being activated and the window being deactivated.
-        /// If the windows use the same input queue, the message is sent synchronously, first to the window procedure of the
-        /// top-level window being deactivated, then to the window procedure of the top-level window being activated. If the
-        /// windows use different input queues, the message is sent asynchronously, so the window is activated immediately.
-        /// </summary>
-        public const int WA_CLICKACTIVE = 0x2;
-
-        #endregion
-
-        #region Window Messages
-
-        /// <summary>
-        /// Sent when an application requests that a window be created by calling the CreateWindowEx or CreateWindow function. (The message is sent before the function returns.) The window procedure of the new window receives this message after the window is created, but before the window becomes visible.
-        /// </summary>
-        public const int WM_CREATE = 0x1;
-
-        /// <summary>
-        /// Sent when a window is being destroyed. It is sent to the window procedure of the window being destroyed after the window is removed from the screen. This message is sent first to the window being destroyed and then to the child windows(if any) as they are destroyed.During the processing of the message, it can be assumed that all child windows still exist.
-        /// </summary>
-        public const int WM_DESTROY = 0x2;
-
-        /// <summary>
-        /// Sent to both the window being activated and the window being deactivated. If the windows use the same input queue, the message is sent synchronously, first to the window procedure of the top-level window being deactivated, then to the window procedure of the top-level window being activated. If the windows use different input queues, the message is sent asynchronously, so the window is activated immediately.
-        /// </summary>
-        public const int WM_ACTIVATE = 0x6;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public const int WM_SETTEXT = 0xC;
-
-        /// <summary>
-        /// Copies the text that corresponds to a window into a buffer provided by the caller.
-        /// </summary>
-        public const int WM_GETTEXT = 0xD;
-
-        /// <summary>
-        /// Sent as a signal that a window or an application should terminate.
-        /// </summary>
-        public const int WM_CLOSE = 0x10;
-
-        /// <summary>
-        /// Sent when a window belonging to a different application than the active window is about to be activated. The message is sent to the application whose window is being activated and to the application whose window is being deactivated.
-        /// </summary>
-        public const int WM_ACTIVATEAPP = 0x1C;
-
-        /// <summary>
-        /// Sent to a window if the mouse causes the cursor to move within a window and mouse input is not captured.
-        /// </summary>
-        public const int WM_SETCURSOR = 0x20;
-
-        /// <summary>
-        /// Sent when the cursor is in an inactive window and the user presses a mouse button. The parent window receives this message only if the child window passes it to the DefWindowProc function.
-        /// </summary>
-        public const int WM_MOUSEACTIVATE = 0x21;
-
-        /// <summary>
-        /// Sent to a window when the size or position of the window is about to change. An application can use this message to override the window's default maximized size and position, or its default minimum or maximum tracking size.
-        /// </summary>
-        public const int WM_GETMINMAXINFO = 0x24;
-
-        /// <summary>
-        /// Sent to a window whose size, position, or place in the Z order is about to change as a result of a call to the SetWindowPos function or another window-management function.
-        /// </summary>
-        public const int WM_WINDOWPOSCHANGING = 0x46;
-
-        /// <summary>
-        /// Sent to a window whose size, position, or place in the Z order has changed as a result of a call to the SetWindowPos function or another window-management function.
-        /// </summary>
-        public const int WM_WINDOWPOSCHANGED = 0x47;
-
-        /// <summary>
-        /// Posted to the window with the keyboard focus when a nonsystem key is pressed. A nonsystem key is a key that is pressed when the ALT key is not pressed.
-        /// </summary>
-        public const int WM_KEYDOWN = 0x100;
-
-        /// <summary>
-        /// Posted to the window with the keyboard focus when a nonsystem key is released. A nonsystem key is a key that is pressed when the ALT key is not pressed, or a keyboard key that is pressed when a window has the keyboard focus.
-        /// </summary>
-        public const int WM_KEYUP = 0x101;
-
-        /// <summary>
-        /// Posted to the window with the keyboard focus when a WM_KEYDOWN message is translated by the TranslateMessage function. The WM_CHAR message contains the character code of the key that was pressed.
-        /// </summary>
-        public const int WM_CHAR = 0x102;
-
-        /// <summary>
-        /// Sent when the user selects a command item from a menu, when a control sends a notification message to its parent window, or when an accelerator keystroke is translated.
-        /// </summary>
-        public const int WM_COMMAND = 0x111;
-
-        /// <summary>
-        /// A window receives this message when the user chooses a command from the Window menu (formerly known as the system or control menu) or when the user chooses the maximize button, minimize button, restore button, or close button.
-        /// </summary>
-        public const int WM_SYSCOMMAND = 0x112;
-
-        /// <summary>
-        /// Posted to a window when the cursor moves. If the mouse is not captured, the message is posted to the window that contains the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_MOUSEMOVE = 0x200;
-
-        /// <summary>
-        /// Posted when the user presses the left mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_LBUTTONDOWN = 0x201;
-
-        /// <summary>
-        /// Posted when the user releases the left mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_LBUTTONUP = 0x202;
-
-        /// <summary>
-        /// Posted when the user presses the right mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_RBUTTONDOWN = 0x204;
-
-        /// <summary>
-        /// Posted when the user releases the right mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_RBUTTONUP = 0x205;
-
-        /// <summary>
-        /// Posted when the user presses the middle mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_MBUTTONDOWN = 0x207;
-
-        /// <summary>
-        /// Posted when the user releases the middle mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_MBUTTONUP = 0x208;
-
-        /// <summary>
-        /// Posted when the user presses the first or second X button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_XBUTTONDOWN = 0x20B;
-
-        /// <summary>
-        /// Posted when the user releases the first or second X button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
-        /// </summary>
-        public const int WM_XBUTTONUP = 0x20C;
-
-        /// <summary>
-        /// Sent to a window when a significant action occurs on a descendant window. This message is now extended to include the WM_POINTERDOWN event. When the child window is being created, the system sends WM_PARENTNOTIFY just before the CreateWindow or CreateWindowEx function that creates the window returns. When the child window is being destroyed, the system sends the message before any processing to destroy the window takes place.
-        /// </summary>
-        public const int WM_PARENTNOTIFY = 0x210;
-
-        /// <summary>
-        /// Sent one time to a window after it enters the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns.
-        /// </summary>
-        public const int WM_ENTERSIZEMOVE = 0x231;
-
-        /// <summary>
-        /// Sent one time to a window, after it has exited the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns.
-        /// </summary>
-        public const int WM_EXITSIZEMOVE = 0x232;
-
-        /// <summary>
-        /// Sent to the first window in the clipboard viewer chain when the content of the clipboard changes. This enables a clipboard viewer window to display the new content of the clipboard.
-        /// </summary>
-        public const int WM_DRAWCLIPBOARD = 0x308;
-
-        /// <summary>
-        /// Sent to the first window in the clipboard viewer chain when a window is being removed from the chain.
-        /// </summary>
-        public const int WM_CHANGECBCHAIN = 0x30D;
-
-        #endregion
-
-        #region Window Styles
-
-        public const int WS_MAXIMIZE = 0x1000000;
-        public const int WS_VISIBLE = 0x10000000;
-        public const int WS_CHILD = 0x40000000;
-        public const int WS_EX_MDICHILD = 0x40;
-
-        #endregion
-
-        #region Virtual Key Codes
-
-        public const int VK_CONTROL = 0x11;
-        public const int VK_C = 0x67;
-
-        #endregion
-
-        #region EM
-
-        public const uint ECM_FIRST = 0x1500;
-        public const uint EM_SETCUEBANNER = ECM_FIRST + 1;
-        public const uint EM_GETCUEBANNER = ECM_FIRST + 2;
-
-        #endregion
-
-        #region LB
-
-        public const int LB_ERR = -1;
-        public const int LB_SELECTSTRING = 0x18C;
-
-        #endregion
-
-        #region TCM
-
-        internal const int TCM_ADJUSTRECT = 0x1328;
-
-        #endregion
-
-        #endregion
-    }
-}

mRemoteNG/App/Update/AppUpdater.cs

@@ -1,269 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using mRemoteNG.App.Info;
-using mRemoteNG.Security.SymmetricEncryption;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-using mRemoteNG.Properties;
-#if !PORTABLE
-using mRemoteNG.Tools;
-
-#else
-using System.Windows.Forms;
-
-#endif
-// ReSharper disable ArrangeAccessorOwnerBody
-
-namespace mRemoteNG.App.Update
-{
-    public class AppUpdater
-    {
-        private const int _bufferLength = 8192;
-        private WebProxy _webProxy;
-        private HttpClient _httpClient;
-        private CancellationTokenSource _changeLogCancelToken;
-        private CancellationTokenSource _getUpdateInfoCancelToken;
-
-        #region Public Properties
-
-        public UpdateInfo CurrentUpdateInfo { get; private set; }
-
-        public bool IsGetUpdateInfoRunning
-        {
-            get
-            {
-                return _getUpdateInfoCancelToken != null;
-            }
-        }
-
-        private bool IsGetChangeLogRunning
-        {
-            get
-            {
-                return _changeLogCancelToken != null;
-            }
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        public AppUpdater()
-        {
-            SetDefaultProxySettings();
-        }
-
-        private void SetDefaultProxySettings()
-        {
-            var shouldWeUseProxy = Settings.Default.UpdateUseProxy;
-            var proxyAddress = Settings.Default.UpdateProxyAddress;
-            var port = Settings.Default.UpdateProxyPort;
-            var useAuthentication = Settings.Default.UpdateProxyUseAuthentication;
-            var username = Settings.Default.UpdateProxyAuthUser;
-            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-            var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey);
-
-            SetProxySettings(shouldWeUseProxy, proxyAddress, port, useAuthentication, username, password);
-        }
-
-        public void SetProxySettings(bool useProxy,
-                                     string address,
-                                     int port,
-                                     bool useAuthentication,
-                                     string username,
-                                     string password)
-        {
-            if (useProxy && !string.IsNullOrEmpty(address))
-            {
-                _webProxy = port != 0 ? new WebProxy(address, port) : new WebProxy(address);
-                _webProxy.Credentials = useAuthentication ? new NetworkCredential(username, password) : null;
-            }
-            else
-            {
-                _webProxy = null;
-            }
-
-            UpdateHttpClient();
-        }
-
-        public bool IsUpdateAvailable()
-        {
-            if (CurrentUpdateInfo == null || !CurrentUpdateInfo.IsValid)
-            {
-                return false;
-            }
-
-            return CurrentUpdateInfo.Version > GeneralAppInfo.GetApplicationVersion();
-        }
-        
-        public async Task DownloadUpdateAsync(IProgress<int> progress)
-        {
-            if (IsGetUpdateInfoRunning)
-            {
-                _getUpdateInfoCancelToken.Cancel();
-                _getUpdateInfoCancelToken.Dispose();
-                _getUpdateInfoCancelToken = null;
-
-                throw new InvalidOperationException("A previous call to DownloadUpdateAsync() is still in progress.");
-            }
-
-            if (CurrentUpdateInfo == null || !CurrentUpdateInfo.IsValid)
-            {
-                throw new InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().");
-            }
-#if !PORTABLE
-            CurrentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "msi"));
-#else
-            var sfd = new SaveFileDialog
-            {
-                InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),
-                FileName = CurrentUpdateInfo.FileName,
-                RestoreDirectory = true
-            };
-            if (sfd.ShowDialog() == DialogResult.OK)
-            {
-                CurrentUpdateInfo.UpdateFilePath = sfd.FileName;
-            }
-            else
-            {
-                return;
-            }
-#endif
-            try
-            {
-                _getUpdateInfoCancelToken = new CancellationTokenSource();
-                using var response = await _httpClient.GetAsync(CurrentUpdateInfo.DownloadAddress, HttpCompletionOption.ResponseHeadersRead, _getUpdateInfoCancelToken.Token);
-                var buffer = new byte[_bufferLength];
-                var totalBytes = response.Content.Headers.ContentLength ?? 0;
-                var readBytes = 0L;
-
-                await using (var httpStream = await response.Content.ReadAsStreamAsync(_getUpdateInfoCancelToken.Token))
-                {
-                    await using var fileStream = new FileStream(CurrentUpdateInfo.UpdateFilePath, FileMode.Create,
-                        FileAccess.Write, FileShare.None, _bufferLength, true);
-
-                    while (readBytes <= totalBytes || !_getUpdateInfoCancelToken.IsCancellationRequested)
-                    {
-                        var bytesRead =
-                            await httpStream.ReadAsync(buffer, 0, _bufferLength, _getUpdateInfoCancelToken.Token);
-                        if (bytesRead == 0)
-                        {
-                            progress.Report(100);
-                            break;
-                        }
-
-                        await fileStream.WriteAsync(buffer, 0, bytesRead, _getUpdateInfoCancelToken.Token);
-
-                        readBytes += bytesRead;
-
-                        var percentComplete = (int)(readBytes * 100 / totalBytes);
-                        progress.Report(percentComplete);
-                    }
-                }
-
-#if !PORTABLE
-                    var updateAuthenticode = new Authenticode(CurrentUpdateInfo.UpdateFilePath)
-                    {
-                        RequireThumbprintMatch = true,
-                        ThumbprintToMatch = CurrentUpdateInfo.CertificateThumbprint
-                    };
-
-                    if (updateAuthenticode.Verify() != Authenticode.StatusValue.Verified)
-                    {
-                        if (updateAuthenticode.Status == Authenticode.StatusValue.UnhandledException)
-                        {
-                            throw updateAuthenticode.Exception;
-                        }
-
-                        throw new Exception(updateAuthenticode.GetStatusMessage());
-                    }
-#endif
-
-                using var checksum = SHA512.Create();
-                await using var stream = File.OpenRead(CurrentUpdateInfo.UpdateFilePath);
-                var hash = await checksum.ComputeHashAsync(stream);
-                var hashString = BitConverter.ToString(hash).Replace("-", "").ToUpperInvariant();
-                if (!hashString.Equals(CurrentUpdateInfo.Checksum))
-                    throw new Exception("SHA512 Hashes didn't match!");
-            } finally{
-                _getUpdateInfoCancelToken?.Dispose();
-                _getUpdateInfoCancelToken = null;
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private void UpdateHttpClient()
-        {
-            if (_httpClient != null)
-            {
-                _httpClient.Dispose();
-            }
-
-            var httpClientHandler = new HttpClientHandler();
-            if (_webProxy != null)
-            {
-                httpClientHandler.UseProxy = true;
-                httpClientHandler.Proxy = _webProxy;
-            }
-            _httpClient = new HttpClient(httpClientHandler);
-            _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(GeneralAppInfo.UserAgent);
-        }
-
-        public async Task GetUpdateInfoAsync()
-        {
-            if (IsGetUpdateInfoRunning)
-            {
-                _getUpdateInfoCancelToken.Cancel();
-                _getUpdateInfoCancelToken.Dispose();
-                _getUpdateInfoCancelToken = null;
-            }
-
-            try
-            {
-                _getUpdateInfoCancelToken = new CancellationTokenSource();
-                var updateInfo = await _httpClient.GetStringAsync(UpdateChannelInfo.GetUpdateChannelInfo(), _getUpdateInfoCancelToken.Token);
-                CurrentUpdateInfo = UpdateInfo.FromString(updateInfo);
-                Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
-
-                if (!Settings.Default.UpdatePending)
-                {
-                    Settings.Default.UpdatePending = IsUpdateAvailable();
-                }
-            }
-            finally
-            {
-                _getUpdateInfoCancelToken?.Dispose();
-                _getUpdateInfoCancelToken = null;
-            }
-        }
-
-        public async Task<string> GetChangeLogAsync()
-        {
-            if (IsGetChangeLogRunning)
-            {
-                _changeLogCancelToken.Cancel();
-                _changeLogCancelToken.Dispose();
-                _changeLogCancelToken = null;
-            }
-
-            try
-            {
-                _changeLogCancelToken = new CancellationTokenSource();
-                return await _httpClient.GetStringAsync(CurrentUpdateInfo.ChangeLogAddress, _changeLogCancelToken.Token);
-            }
-            finally
-            {
-                _changeLogCancelToken?.Dispose();
-                _changeLogCancelToken = null;
-            }
-        }
-
-        #endregion
-    }
-}

mRemoteNG/Config/Connections/ConnectionsBackupFrequencyEnum.cs

@@ -1,13 +0,0 @@
-namespace mRemoteNG.Config.Connections
-{
-    public enum ConnectionsBackupFrequencyEnum
-    {
-        Unassigned = 0,
-        Never = 1,
-        OnEdit = 2,
-        OnExit = 3,
-        Daily = 4,
-        Weekly = 5,
-        Custom = 6
-    }
-}

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

@@ -1,259 +0,0 @@
-using System;
-using System.Security;
-using System.Xml.Linq;
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
-using mRemoteNG.Security;
-
-namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
-{
-    // ReSharper disable once InconsistentNaming
-    public class XmlConnectionNodeSerializer26 : ISerializer<ConnectionInfo, XElement>
-    {
-        private readonly ICryptographyProvider _cryptographyProvider;
-        private readonly SecureString _encryptionKey;
-        private readonly SaveFilter _saveFilter;
-
-        public Version Version { get; } = new Version(2, 6);
-
-        public XmlConnectionNodeSerializer26(ICryptographyProvider cryptographyProvider, SecureString encryptionKey, SaveFilter saveFilter)
-        {
-            if (cryptographyProvider == null)
-                throw new ArgumentNullException(nameof(cryptographyProvider));
-            if (encryptionKey == null)
-                throw new ArgumentNullException(nameof(encryptionKey));
-            if (saveFilter == null)
-                throw new ArgumentNullException(nameof(saveFilter));
-
-            _cryptographyProvider = cryptographyProvider;
-            _encryptionKey = encryptionKey;
-            _saveFilter = saveFilter;
-        }
-
-        public XElement Serialize(ConnectionInfo connectionInfo)
-        {
-            var element = new XElement(XName.Get("Node", ""));
-            SetElementAttributes(element, connectionInfo);
-            SetInheritanceAttributes(element, connectionInfo);
-            return element;
-        }
-
-        private void SetElementAttributes(XContainer element, ConnectionInfo connectionInfo)
-        {
-            var nodeAsContainer = connectionInfo as ContainerInfo;
-            element.Add(new XAttribute("Name", connectionInfo.Name));
-            element.Add(new XAttribute("Type", connectionInfo.GetTreeNodeType().ToString()));
-            if (nodeAsContainer != null)
-                element.Add(new XAttribute("Expanded", nodeAsContainer.IsExpanded.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("Descr", connectionInfo.Description));
-            element.Add(new XAttribute("Icon", connectionInfo.Icon));
-            element.Add(new XAttribute("Panel", connectionInfo.Panel));
-            element.Add(new XAttribute("Id", connectionInfo.ConstantID));
-
-            element.Add(_saveFilter.SaveUsername
-                ? new XAttribute("Username", connectionInfo.Username)
-                : new XAttribute("Username", ""));
-
-            element.Add(_saveFilter.SaveDomain
-                ? new XAttribute("Domain", connectionInfo.Domain)
-                : new XAttribute("Domain", ""));
-
-            if (_saveFilter.SavePassword && !connectionInfo.Inheritance.Password)
-                element.Add(new XAttribute("Password", _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey)));
-            else
-                element.Add(new XAttribute("Password", ""));
-
-            element.Add(new XAttribute("Hostname", connectionInfo.Hostname));
-            element.Add(new XAttribute("Protocol", connectionInfo.Protocol));
-            element.Add(new XAttribute("SSHTunnelConnectionName", connectionInfo.SSHTunnelConnectionName));
-            element.Add(new XAttribute("OpeningCommand", connectionInfo.OpeningCommand));
-            element.Add(new XAttribute("SSHOptions", connectionInfo.SSHOptions));
-            element.Add(new XAttribute("PuttySession", connectionInfo.PuttySession));
-            element.Add(new XAttribute("Port", connectionInfo.Port));
-            element.Add(new XAttribute("ConnectToConsole", connectionInfo.UseConsoleSession.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("UseCredSsp", connectionInfo.UseCredSsp.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RenderingEngine", connectionInfo.RenderingEngine));
-            element.Add(new XAttribute("RDPAuthenticationLevel", connectionInfo.RDPAuthenticationLevel));
-            element.Add(new XAttribute("RDPMinutesToIdleTimeout", connectionInfo.RDPMinutesToIdleTimeout));
-            element.Add(new XAttribute("RDPAlertIdleTimeout", connectionInfo.RDPAlertIdleTimeout.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("LoadBalanceInfo", connectionInfo.LoadBalanceInfo));
-            element.Add(new XAttribute("Colors", connectionInfo.Colors));
-            element.Add(new XAttribute("Resolution", connectionInfo.Resolution));
-            element.Add(new XAttribute("AutomaticResize", connectionInfo.AutomaticResize.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisplayWallpaper", connectionInfo.DisplayWallpaper.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisplayThemes", connectionInfo.DisplayThemes.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("EnableFontSmoothing", connectionInfo.EnableFontSmoothing.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("EnableDesktopComposition", connectionInfo.EnableDesktopComposition.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("CacheBitmaps", connectionInfo.CacheBitmaps.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectDiskDrives", connectionInfo.RedirectDiskDrives.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectPorts", connectionInfo.RedirectPorts.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectPrinters", connectionInfo.RedirectPrinters.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectClipboard", connectionInfo.RedirectClipboard.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectSmartCards", connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectSound", connectionInfo.RedirectSound.ToString()));
-            element.Add(new XAttribute("SoundQuality", connectionInfo.SoundQuality.ToString()));
-            element.Add(new XAttribute("RedirectKeys", connectionInfo.RedirectKeys.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("Connected", (connectionInfo.OpenConnections.Count > 0).ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("PreExtApp", connectionInfo.PreExtApp));
-            element.Add(new XAttribute("PostExtApp", connectionInfo.PostExtApp));
-            element.Add(new XAttribute("MacAddress", connectionInfo.MacAddress));
-            element.Add(new XAttribute("UserField", connectionInfo.UserField));
-            element.Add(new XAttribute("ExtApp", connectionInfo.ExtApp));
-            element.Add(new XAttribute("StartProgram", connectionInfo.RDPStartProgram));
-            element.Add(new XAttribute("VNCCompression", connectionInfo.VNCCompression));
-            element.Add(new XAttribute("VNCEncoding", connectionInfo.VNCEncoding));
-            element.Add(new XAttribute("VNCAuthMode", connectionInfo.VNCAuthMode));
-            element.Add(new XAttribute("VNCProxyType", connectionInfo.VNCProxyType));
-            element.Add(new XAttribute("VNCProxyIP", connectionInfo.VNCProxyIP));
-            element.Add(new XAttribute("VNCProxyPort", connectionInfo.VNCProxyPort));
-
-            element.Add(_saveFilter.SaveUsername
-                ? new XAttribute("VNCProxyUsername", connectionInfo.VNCProxyUsername)
-                : new XAttribute("VNCProxyUsername", ""));
-
-            element.Add(_saveFilter.SavePassword
-                ? new XAttribute("VNCProxyPassword", _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, _encryptionKey))
-                : new XAttribute("VNCProxyPassword", ""));
-
-            element.Add(new XAttribute("VNCColors", connectionInfo.VNCColors));
-            element.Add(new XAttribute("VNCSmartSizeMode", connectionInfo.VNCSmartSizeMode));
-            element.Add(new XAttribute("VNCViewOnly", connectionInfo.VNCViewOnly.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RDGatewayUsageMethod", connectionInfo.RDGatewayUsageMethod));
-            element.Add(new XAttribute("RDGatewayHostname", connectionInfo.RDGatewayHostname));
-            element.Add(new XAttribute("RDGatewayUseConnectionCredentials", connectionInfo.RDGatewayUseConnectionCredentials));
-
-            element.Add(_saveFilter.SaveUsername
-                ? new XAttribute("RDGatewayUsername", connectionInfo.RDGatewayUsername)
-                : new XAttribute("RDGatewayUsername", ""));
-
-            element.Add(_saveFilter.SavePassword
-                ? new XAttribute("RDGatewayPassword", _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, _encryptionKey))
-                : new XAttribute("RDGatewayPassword", ""));
-
-            element.Add(_saveFilter.SaveDomain
-                ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain)
-                : new XAttribute("RDGatewayDomain", ""));
-        }
-
-        private void SetInheritanceAttributes(XContainer element, IInheritable connectionInfo)
-        {
-            if (_saveFilter.SaveInheritance)
-            {
-                var inheritance = connectionInfo.Inheritance;
-
-                if (inheritance.CacheBitmaps)
-                    element.Add(new XAttribute("InheritCacheBitmaps", inheritance.CacheBitmaps.ToString().ToLowerInvariant()));
-                if (inheritance.Colors)
-                    element.Add(new XAttribute("InheritColors", inheritance.Colors.ToString().ToLowerInvariant()));
-                if (inheritance.Description)
-                    element.Add(new XAttribute("InheritDescription", inheritance.Description.ToString().ToLowerInvariant()));
-                if (inheritance.DisplayThemes)
-                    element.Add(new XAttribute("InheritDisplayThemes", inheritance.DisplayThemes.ToString().ToLowerInvariant()));
-                if (inheritance.DisplayWallpaper)
-                    element.Add(new XAttribute("InheritDisplayWallpaper", inheritance.DisplayWallpaper.ToString().ToLowerInvariant()));
-                if (inheritance.EnableFontSmoothing)
-                    element.Add(new XAttribute("InheritEnableFontSmoothing", inheritance.EnableFontSmoothing.ToString().ToLowerInvariant()));
-                if (inheritance.EnableDesktopComposition)
-                    element.Add(new XAttribute("InheritEnableDesktopComposition", inheritance.EnableDesktopComposition.ToString().ToLowerInvariant()));
-                if (inheritance.Domain)
-                    element.Add(new XAttribute("InheritDomain", inheritance.Domain.ToString().ToLowerInvariant()));
-                if (inheritance.Icon)
-                    element.Add(new XAttribute("InheritIcon", inheritance.Icon.ToString().ToLowerInvariant()));
-                if (inheritance.Panel)
-                    element.Add(new XAttribute("InheritPanel", inheritance.Panel.ToString().ToLowerInvariant()));
-                if (inheritance.Password)
-                    element.Add(new XAttribute("InheritPassword", inheritance.Password.ToString().ToLowerInvariant()));
-                if (inheritance.Port)
-                    element.Add(new XAttribute("InheritPort", inheritance.Port.ToString().ToLowerInvariant()));
-                if (inheritance.Protocol)
-                    element.Add(new XAttribute("InheritProtocol", inheritance.Protocol.ToString().ToLowerInvariant()));
-                if (inheritance.SSHTunnelConnectionName)
-                    element.Add(new XAttribute("InheritSSHTunnelConnectionName", inheritance.SSHTunnelConnectionName.ToString().ToLowerInvariant()));
-                if (inheritance.OpeningCommand)
-                    element.Add(new XAttribute("InheritOpeningCommand", inheritance.OpeningCommand.ToString().ToLowerInvariant()));
-                if (inheritance.SSHOptions)
-                    element.Add(new XAttribute("InheritSSHOptions", inheritance.SSHOptions.ToString().ToLowerInvariant()));
-                if (inheritance.PuttySession)
-                    element.Add(new XAttribute("InheritPuttySession", inheritance.PuttySession.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectDiskDrives)
-                    element.Add(new XAttribute("InheritRedirectDiskDrives", inheritance.RedirectDiskDrives.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectKeys)
-                    element.Add(new XAttribute("InheritRedirectKeys", inheritance.RedirectKeys.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectPorts)
-                    element.Add(new XAttribute("InheritRedirectPorts", inheritance.RedirectPorts.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectPrinters)
-                    element.Add(new XAttribute("InheritRedirectPrinters", inheritance.RedirectPrinters.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectSmartCards)
-                    element.Add(new XAttribute("InheritRedirectSmartCards", inheritance.RedirectSmartCards.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectSound)
-                    element.Add(new XAttribute("InheritRedirectSound", inheritance.RedirectSound.ToString().ToLowerInvariant()));
-                if (inheritance.SoundQuality)
-                    element.Add(new XAttribute("InheritSoundQuality", inheritance.SoundQuality.ToString().ToLowerInvariant()));
-                if (inheritance.Resolution)
-                    element.Add(new XAttribute("InheritResolution", inheritance.Resolution.ToString().ToLowerInvariant()));
-                if (inheritance.AutomaticResize)
-                    element.Add(new XAttribute("InheritAutomaticResize", inheritance.AutomaticResize.ToString().ToLowerInvariant()));
-                if (inheritance.UseConsoleSession)
-                    element.Add(new XAttribute("InheritUseConsoleSession", inheritance.UseConsoleSession.ToString().ToLowerInvariant()));
-                if (inheritance.UseCredSsp)
-                    element.Add(new XAttribute("InheritUseCredSsp", inheritance.UseCredSsp.ToString().ToLowerInvariant()));
-                if (inheritance.RenderingEngine)
-                    element.Add(new XAttribute("InheritRenderingEngine", inheritance.RenderingEngine.ToString().ToLowerInvariant()));
-                if (inheritance.Username)
-                    element.Add(new XAttribute("InheritUsername", inheritance.Username.ToString().ToLowerInvariant()));
-                if (inheritance.RDPAuthenticationLevel)
-                    element.Add(new XAttribute("InheritRDPAuthenticationLevel", inheritance.RDPAuthenticationLevel.ToString().ToLowerInvariant()));
-                if (inheritance.RDPMinutesToIdleTimeout)
-                    element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", inheritance.RDPMinutesToIdleTimeout.ToString().ToLowerInvariant()));
-                if (inheritance.RDPAlertIdleTimeout)
-                    element.Add(new XAttribute("InheritRDPAlertIdleTimeout", inheritance.RDPAlertIdleTimeout.ToString().ToLowerInvariant()));
-                if (inheritance.LoadBalanceInfo)
-                    element.Add(new XAttribute("InheritLoadBalanceInfo", inheritance.LoadBalanceInfo.ToString().ToLowerInvariant()));
-                if (inheritance.PreExtApp)
-                    element.Add(new XAttribute("InheritPreExtApp", inheritance.PreExtApp.ToString().ToLowerInvariant()));
-                if (inheritance.PostExtApp)
-                    element.Add(new XAttribute("InheritPostExtApp", inheritance.PostExtApp.ToString().ToLowerInvariant()));
-                if (inheritance.MacAddress)
-                    element.Add(new XAttribute("InheritMacAddress", inheritance.MacAddress.ToString().ToLowerInvariant()));
-                if (inheritance.UserField)
-                    element.Add(new XAttribute("InheritUserField", inheritance.UserField.ToString().ToLowerInvariant()));
-                if (inheritance.ExtApp)
-                    element.Add(new XAttribute("InheritExtApp", inheritance.ExtApp.ToString().ToLowerInvariant()));
-                if (inheritance.VNCCompression)
-                    element.Add(new XAttribute("InheritVNCCompression", inheritance.VNCCompression.ToString().ToLowerInvariant()));
-                if (inheritance.VNCEncoding)
-                    element.Add(new XAttribute("InheritVNCEncoding", inheritance.VNCEncoding.ToString().ToLowerInvariant()));
-                if (inheritance.VNCAuthMode)
-                    element.Add(new XAttribute("InheritVNCAuthMode", inheritance.VNCAuthMode.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyType)
-                    element.Add(new XAttribute("InheritVNCProxyType", inheritance.VNCProxyType.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyIP)
-                    element.Add(new XAttribute("InheritVNCProxyIP", inheritance.VNCProxyIP.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyPort)
-                    element.Add(new XAttribute("InheritVNCProxyPort", inheritance.VNCProxyPort.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyUsername)
-                    element.Add(new XAttribute("InheritVNCProxyUsername", inheritance.VNCProxyUsername.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyPassword)
-                    element.Add(new XAttribute("InheritVNCProxyPassword", inheritance.VNCProxyPassword.ToString().ToLowerInvariant()));
-                if (inheritance.VNCColors)
-                    element.Add(new XAttribute("InheritVNCColors", inheritance.VNCColors.ToString().ToLowerInvariant()));
-                if (inheritance.VNCSmartSizeMode)
-                    element.Add(new XAttribute("InheritVNCSmartSizeMode", inheritance.VNCSmartSizeMode.ToString().ToLowerInvariant()));
-                if (inheritance.VNCViewOnly)
-                    element.Add(new XAttribute("InheritVNCViewOnly", inheritance.VNCViewOnly.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayUsageMethod)
-                    element.Add(new XAttribute("InheritRDGatewayUsageMethod", inheritance.RDGatewayUsageMethod.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayHostname)
-                    element.Add(new XAttribute("InheritRDGatewayHostname", inheritance.RDGatewayHostname.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayUseConnectionCredentials)
-                    element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", inheritance.RDGatewayUseConnectionCredentials.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayUsername)
-                    element.Add(new XAttribute("InheritRDGatewayUsername", inheritance.RDGatewayUsername.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayPassword)
-                    element.Add(new XAttribute("InheritRDGatewayPassword", inheritance.RDGatewayPassword.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayDomain)
-                    element.Add(new XAttribute("InheritRDGatewayDomain", inheritance.RDGatewayDomain.ToString().ToLowerInvariant()));
-            }
-        }
-    }
-}

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

@@ -1,304 +0,0 @@
-using System;
-using System.Security;
-using System.Xml.Linq;
-using mRemoteNG.App;
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
-using mRemoteNG.Security;
-
-namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
-{
-    // ReSharper disable once InconsistentNaming
-    public class XmlConnectionNodeSerializer27 : ISerializer<ConnectionInfo, XElement>
-    {
-        private readonly ICryptographyProvider _cryptographyProvider;
-        private readonly SecureString _encryptionKey;
-        private readonly SaveFilter _saveFilter;
-
-        public Version Version { get; } = new Version(2, 7);
-
-        public XmlConnectionNodeSerializer27(ICryptographyProvider cryptographyProvider,
-                                             SecureString encryptionKey,
-                                             SaveFilter saveFilter)
-        {
-            if (cryptographyProvider == null)
-                throw new ArgumentNullException(nameof(cryptographyProvider));
-            if (encryptionKey == null)
-                throw new ArgumentNullException(nameof(encryptionKey));
-            if (saveFilter == null)
-                throw new ArgumentNullException(nameof(saveFilter));
-
-            _cryptographyProvider = cryptographyProvider;
-            _encryptionKey = encryptionKey;
-            _saveFilter = saveFilter;
-        }
-
-        public XElement Serialize(ConnectionInfo connectionInfo)
-        {
-            var element = new XElement(XName.Get("Node", ""));
-            SetElementAttributes(element, connectionInfo);
-            SetInheritanceAttributes(element, connectionInfo);
-            return element;
-        }
-
-        private void SetElementAttributes(XContainer element, ConnectionInfo connectionInfo)
-        {
-            var nodeAsContainer = connectionInfo as ContainerInfo;
-            element.Add(new XAttribute("Name", connectionInfo.Name));
-            element.Add(new XAttribute("VmId", connectionInfo.VmId));
-            element.Add(new XAttribute("UseVmId", connectionInfo.UseVmId));
-            element.Add(new XAttribute("UseEnhancedMode", connectionInfo.UseVmId));
-            element.Add(new XAttribute("Type", connectionInfo.GetTreeNodeType().ToString()));
-            if (nodeAsContainer != null)
-                element.Add(new XAttribute("Expanded", nodeAsContainer.IsExpanded.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("Descr", connectionInfo.Description));
-            element.Add(new XAttribute("Icon", connectionInfo.Icon));
-            element.Add(new XAttribute("Panel", connectionInfo.Panel));
-            element.Add(new XAttribute("Id", connectionInfo.ConstantID));
-
-            if (!Runtime.UseCredentialManager)
-            {
-                element.Add(_saveFilter.SaveUsername
-                    ? new XAttribute("Username", connectionInfo.Username)
-                    : new XAttribute("Username", ""));
-
-                element.Add(_saveFilter.SaveDomain
-                    ? new XAttribute("Domain", connectionInfo.Domain)
-                    : new XAttribute("Domain", ""));
-
-                if (_saveFilter.SavePassword && !connectionInfo.Inheritance.Password)
-                    element.Add(new XAttribute("Password", _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey)));
-                else
-                    element.Add(new XAttribute("Password", ""));
-            }
-
-            element.Add(new XAttribute("Hostname", connectionInfo.Hostname));
-            element.Add(new XAttribute("Protocol", connectionInfo.Protocol));
-            element.Add(new XAttribute("RdpVersion", connectionInfo.RdpVersion.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("SSHTunnelConnectionName", connectionInfo.SSHTunnelConnectionName));
-            element.Add(new XAttribute("OpeningCommand", connectionInfo.OpeningCommand));
-            element.Add(new XAttribute("SSHOptions", connectionInfo.SSHOptions));
-            element.Add(new XAttribute("PuttySession", connectionInfo.PuttySession));
-            element.Add(new XAttribute("Port", connectionInfo.Port));
-            element.Add(new XAttribute("ConnectToConsole", connectionInfo.UseConsoleSession.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("UseCredSsp", connectionInfo.UseCredSsp.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RenderingEngine", connectionInfo.RenderingEngine));
-            element.Add(new XAttribute("RDPAuthenticationLevel", connectionInfo.RDPAuthenticationLevel));
-            element.Add(new XAttribute("RDPMinutesToIdleTimeout", connectionInfo.RDPMinutesToIdleTimeout));
-            element.Add(new XAttribute("RDPAlertIdleTimeout", connectionInfo.RDPAlertIdleTimeout.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("LoadBalanceInfo", connectionInfo.LoadBalanceInfo));
-            element.Add(new XAttribute("Colors", connectionInfo.Colors));
-            element.Add(new XAttribute("Resolution", connectionInfo.Resolution));
-            element.Add(new XAttribute("AutomaticResize", connectionInfo.AutomaticResize.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisplayWallpaper", connectionInfo.DisplayWallpaper.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisplayThemes", connectionInfo.DisplayThemes.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("EnableFontSmoothing", connectionInfo.EnableFontSmoothing.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("EnableDesktopComposition", connectionInfo.EnableDesktopComposition.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisableFullWindowDrag", connectionInfo.DisableFullWindowDrag.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisableMenuAnimations", connectionInfo.DisableMenuAnimations.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisableCursorShadow", connectionInfo.DisableCursorShadow.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("DisableCursorBlinking", connectionInfo.DisableCursorBlinking.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("CacheBitmaps", connectionInfo.CacheBitmaps.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectDiskDrives", connectionInfo.RedirectDiskDrives.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectPorts", connectionInfo.RedirectPorts.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectPrinters", connectionInfo.RedirectPrinters.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectClipboard", connectionInfo.RedirectClipboard.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectSmartCards", connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectSound", connectionInfo.RedirectSound.ToString()));
-            element.Add(new XAttribute("SoundQuality", connectionInfo.SoundQuality.ToString()));
-            element.Add(new XAttribute("RedirectAudioCapture", connectionInfo.RedirectAudioCapture.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RedirectKeys", connectionInfo.RedirectKeys.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("Connected", (connectionInfo.OpenConnections.Count > 0).ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("PreExtApp", connectionInfo.PreExtApp));
-            element.Add(new XAttribute("PostExtApp", connectionInfo.PostExtApp));
-            element.Add(new XAttribute("MacAddress", connectionInfo.MacAddress));
-            element.Add(new XAttribute("UserField", connectionInfo.UserField));
-            element.Add(new XAttribute("Favorite", connectionInfo.Favorite));
-            element.Add(new XAttribute("ExtApp", connectionInfo.ExtApp));
-            element.Add(new XAttribute("StartProgram", connectionInfo.RDPStartProgram));
-            element.Add(new XAttribute("StartProgramWorkDir", connectionInfo.RDPStartProgramWorkDir));
-            element.Add(new XAttribute("VNCCompression", connectionInfo.VNCCompression));
-            element.Add(new XAttribute("VNCEncoding", connectionInfo.VNCEncoding));
-            element.Add(new XAttribute("VNCAuthMode", connectionInfo.VNCAuthMode));
-            element.Add(new XAttribute("VNCProxyType", connectionInfo.VNCProxyType));
-            element.Add(new XAttribute("VNCProxyIP", connectionInfo.VNCProxyIP));
-            element.Add(new XAttribute("VNCProxyPort", connectionInfo.VNCProxyPort));
-
-            element.Add(_saveFilter.SaveUsername
-                ? new XAttribute("VNCProxyUsername", connectionInfo.VNCProxyUsername)
-                : new XAttribute("VNCProxyUsername", ""));
-
-            element.Add(_saveFilter.SavePassword
-                ? new XAttribute("VNCProxyPassword", _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, _encryptionKey))
-                : new XAttribute("VNCProxyPassword", ""));
-
-            element.Add(new XAttribute("VNCColors", connectionInfo.VNCColors));
-            element.Add(new XAttribute("VNCSmartSizeMode", connectionInfo.VNCSmartSizeMode));
-            element.Add(new XAttribute("VNCViewOnly", connectionInfo.VNCViewOnly.ToString().ToLowerInvariant()));
-            element.Add(new XAttribute("RDGatewayUsageMethod", connectionInfo.RDGatewayUsageMethod));
-            element.Add(new XAttribute("RDGatewayHostname", connectionInfo.RDGatewayHostname));
-            element.Add(new XAttribute("RDGatewayUseConnectionCredentials", connectionInfo.RDGatewayUseConnectionCredentials));
-
-            element.Add(_saveFilter.SaveUsername
-                ? new XAttribute("RDGatewayUsername", connectionInfo.RDGatewayUsername)
-                : new XAttribute("RDGatewayUsername", ""));
-
-            element.Add(_saveFilter.SavePassword
-                ? new XAttribute("RDGatewayPassword", _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, _encryptionKey))
-                : new XAttribute("RDGatewayPassword", ""));
-
-            element.Add(_saveFilter.SaveDomain
-                ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain)
-                : new XAttribute("RDGatewayDomain", ""));
-
-            element.Add(new XAttribute("UserViaAPI", connectionInfo.UserViaAPI));
-            element.Add(new XAttribute("EC2InstanceId", connectionInfo.EC2InstanceId));
-            element.Add(new XAttribute("EC2Region", connectionInfo.EC2Region));
-        }
-
-        private void SetInheritanceAttributes(XContainer element, IInheritable connectionInfo)
-        {
-            if (_saveFilter.SaveInheritance)
-            {
-                var inheritance = connectionInfo.Inheritance;
-
-                if (inheritance.CacheBitmaps)
-                    element.Add(new XAttribute("InheritCacheBitmaps", inheritance.CacheBitmaps.ToString().ToLowerInvariant()));
-                if (inheritance.Colors)
-                    element.Add(new XAttribute("InheritColors", inheritance.Colors.ToString().ToLowerInvariant()));
-                if (inheritance.Description)
-                    element.Add(new XAttribute("InheritDescription", inheritance.Description.ToString().ToLowerInvariant()));
-                if (inheritance.DisplayThemes)
-                    element.Add(new XAttribute("InheritDisplayThemes", inheritance.DisplayThemes.ToString().ToLowerInvariant()));
-                if (inheritance.DisplayWallpaper)
-                    element.Add(new XAttribute("InheritDisplayWallpaper", inheritance.DisplayWallpaper.ToString().ToLowerInvariant()));
-                if (inheritance.EnableFontSmoothing)
-                    element.Add(new XAttribute("InheritEnableFontSmoothing", inheritance.EnableFontSmoothing.ToString().ToLowerInvariant()));
-                if (inheritance.EnableDesktopComposition)
-                    element.Add(new XAttribute("InheritEnableDesktopComposition", inheritance.EnableDesktopComposition.ToString().ToLowerInvariant()));
-                if (inheritance.DisableFullWindowDrag)
-                    element.Add(new XAttribute("InheritDisableFullWindowDrag", inheritance.DisableFullWindowDrag.ToString().ToLowerInvariant()));
-                if (inheritance.DisableMenuAnimations)
-                    element.Add(new XAttribute("InheritDisableMenuAnimations", inheritance.DisableMenuAnimations.ToString().ToLowerInvariant()));
-                if (inheritance.DisableCursorShadow)
-                    element.Add(new XAttribute("InheritDisableCursorShadow", inheritance.DisableCursorShadow.ToString().ToLowerInvariant()));
-                if (inheritance.DisableCursorBlinking)
-                    element.Add(new XAttribute("InheritDisableCursorBlinking", inheritance.DisableCursorBlinking.ToString().ToLowerInvariant()));
-                if (inheritance.Domain)
-                    element.Add(new XAttribute("InheritDomain", inheritance.Domain.ToString().ToLowerInvariant()));
-                if (inheritance.Icon)
-                    element.Add(new XAttribute("InheritIcon", inheritance.Icon.ToString().ToLowerInvariant()));
-                if (inheritance.Panel)
-                    element.Add(new XAttribute("InheritPanel", inheritance.Panel.ToString().ToLowerInvariant()));
-                if (inheritance.Password)
-                    element.Add(new XAttribute("InheritPassword", inheritance.Password.ToString().ToLowerInvariant()));
-                if (inheritance.Port)
-                    element.Add(new XAttribute("InheritPort", inheritance.Port.ToString().ToLowerInvariant()));
-                if (inheritance.Protocol)
-                    element.Add(new XAttribute("InheritProtocol", inheritance.Protocol.ToString().ToLowerInvariant()));
-                if (inheritance.RdpVersion)
-                    element.Add(new XAttribute("InheritRdpVersion", inheritance.RdpVersion.ToString().ToLowerInvariant()));
-                if (inheritance.SSHTunnelConnectionName)
-                    element.Add(new XAttribute("InheritSSHTunnelConnectionName", inheritance.SSHTunnelConnectionName.ToString().ToLowerInvariant()));
-                if (inheritance.OpeningCommand)
-                    element.Add(new XAttribute("InheritOpeningCommand", inheritance.OpeningCommand.ToString().ToLowerInvariant()));
-                if (inheritance.SSHOptions)
-                    element.Add(new XAttribute("InheritSSHOptions", inheritance.SSHOptions.ToString().ToLowerInvariant()));
-                if (inheritance.PuttySession)
-                    element.Add(new XAttribute("InheritPuttySession", inheritance.PuttySession.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectDiskDrives)
-                    element.Add(new XAttribute("InheritRedirectDiskDrives", inheritance.RedirectDiskDrives.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectKeys)
-                    element.Add(new XAttribute("InheritRedirectKeys", inheritance.RedirectKeys.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectPorts)
-                    element.Add(new XAttribute("InheritRedirectPorts", inheritance.RedirectPorts.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectPrinters)
-                    element.Add(new XAttribute("InheritRedirectPrinters", inheritance.RedirectPrinters.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectClipboard)
-                    element.Add(new XAttribute("InheritRedirectClipboard", inheritance.RedirectClipboard.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectSmartCards)
-                    element.Add(new XAttribute("InheritRedirectSmartCards", inheritance.RedirectSmartCards.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectSound)
-                    element.Add(new XAttribute("InheritRedirectSound", inheritance.RedirectSound.ToString().ToLowerInvariant()));
-                if (inheritance.SoundQuality)
-                    element.Add(new XAttribute("InheritSoundQuality", inheritance.SoundQuality.ToString().ToLowerInvariant()));
-                if (inheritance.RedirectAudioCapture)
-                    element.Add(new XAttribute("InheritRedirectAudioCapture", inheritance.RedirectAudioCapture.ToString().ToLowerInvariant()));
-                if (inheritance.Resolution)
-                    element.Add(new XAttribute("InheritResolution", inheritance.Resolution.ToString().ToLowerInvariant()));
-                if (inheritance.AutomaticResize)
-                    element.Add(new XAttribute("InheritAutomaticResize", inheritance.AutomaticResize.ToString().ToLowerInvariant()));
-                if (inheritance.UseConsoleSession)
-                    element.Add(new XAttribute("InheritUseConsoleSession", inheritance.UseConsoleSession.ToString().ToLowerInvariant()));
-                if (inheritance.UseCredSsp)
-                    element.Add(new XAttribute("InheritUseCredSsp", inheritance.UseCredSsp.ToString().ToLowerInvariant()));
-                if (inheritance.RenderingEngine)
-                    element.Add(new XAttribute("InheritRenderingEngine", inheritance.RenderingEngine.ToString().ToLowerInvariant()));
-                if (inheritance.Username)
-                    element.Add(new XAttribute("InheritUsername", inheritance.Username.ToString().ToLowerInvariant()));
-                if (inheritance.RDPAuthenticationLevel)
-                    element.Add(new XAttribute("InheritRDPAuthenticationLevel", inheritance.RDPAuthenticationLevel.ToString().ToLowerInvariant()));
-                if (inheritance.RDPMinutesToIdleTimeout)
-                    element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", inheritance.RDPMinutesToIdleTimeout.ToString().ToLowerInvariant()));
-                if (inheritance.RDPAlertIdleTimeout)
-                    element.Add(new XAttribute("InheritRDPAlertIdleTimeout", inheritance.RDPAlertIdleTimeout.ToString().ToLowerInvariant()));
-                if (inheritance.LoadBalanceInfo)
-                    element.Add(new XAttribute("InheritLoadBalanceInfo", inheritance.LoadBalanceInfo.ToString().ToLowerInvariant()));
-                if (inheritance.PreExtApp)
-                    element.Add(new XAttribute("InheritPreExtApp", inheritance.PreExtApp.ToString().ToLowerInvariant()));
-                if (inheritance.PostExtApp)
-                    element.Add(new XAttribute("InheritPostExtApp", inheritance.PostExtApp.ToString().ToLowerInvariant()));
-                if (inheritance.MacAddress)
-                    element.Add(new XAttribute("InheritMacAddress", inheritance.MacAddress.ToString().ToLowerInvariant()));
-                if (inheritance.UserField)
-                    element.Add(new XAttribute("InheritUserField", inheritance.UserField.ToString().ToLowerInvariant()));
-                if (inheritance.Favorite)
-                    element.Add(new XAttribute("InheritFavorite", inheritance.Favorite.ToString().ToLowerInvariant()));
-                if (inheritance.ExtApp)
-                    element.Add(new XAttribute("InheritExtApp", inheritance.ExtApp.ToString().ToLowerInvariant()));
-                if (inheritance.VNCCompression)
-                    element.Add(new XAttribute("InheritVNCCompression", inheritance.VNCCompression.ToString().ToLowerInvariant()));
-                if (inheritance.VNCEncoding)
-                    element.Add(new XAttribute("InheritVNCEncoding", inheritance.VNCEncoding.ToString().ToLowerInvariant()));
-                if (inheritance.VNCAuthMode)
-                    element.Add(new XAttribute("InheritVNCAuthMode", inheritance.VNCAuthMode.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyType)
-                    element.Add(new XAttribute("InheritVNCProxyType", inheritance.VNCProxyType.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyIP)
-                    element.Add(new XAttribute("InheritVNCProxyIP", inheritance.VNCProxyIP.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyPort)
-                    element.Add(new XAttribute("InheritVNCProxyPort", inheritance.VNCProxyPort.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyUsername)
-                    element.Add(new XAttribute("InheritVNCProxyUsername", inheritance.VNCProxyUsername.ToString().ToLowerInvariant()));
-                if (inheritance.VNCProxyPassword)
-                    element.Add(new XAttribute("InheritVNCProxyPassword", inheritance.VNCProxyPassword.ToString().ToLowerInvariant()));
-                if (inheritance.VNCColors)
-                    element.Add(new XAttribute("InheritVNCColors", inheritance.VNCColors.ToString().ToLowerInvariant()));
-                if (inheritance.VNCSmartSizeMode)
-                    element.Add(new XAttribute("InheritVNCSmartSizeMode", inheritance.VNCSmartSizeMode.ToString().ToLowerInvariant()));
-                if (inheritance.VNCViewOnly)
-                    element.Add(new XAttribute("InheritVNCViewOnly", inheritance.VNCViewOnly.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayUsageMethod)
-                    element.Add(new XAttribute("InheritRDGatewayUsageMethod", inheritance.RDGatewayUsageMethod.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayHostname)
-                    element.Add(new XAttribute("InheritRDGatewayHostname", inheritance.RDGatewayHostname.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayUseConnectionCredentials)
-                    element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", inheritance.RDGatewayUseConnectionCredentials.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayUsername)
-                    element.Add(new XAttribute("InheritRDGatewayUsername", inheritance.RDGatewayUsername.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayPassword)
-                    element.Add(new XAttribute("InheritRDGatewayPassword", inheritance.RDGatewayPassword.ToString().ToLowerInvariant()));
-                if (inheritance.RDGatewayDomain)
-                    element.Add(new XAttribute("InheritRDGatewayDomain", inheritance.RDGatewayDomain.ToString().ToLowerInvariant()));
-                if (inheritance.VmId)
-                    element.Add(new XAttribute("InheritVmId", inheritance.VmId.ToString().ToLowerInvariant()));
-                if (inheritance.UseVmId)
-                    element.Add(new XAttribute("InheritUseVmId", inheritance.UseVmId.ToString().ToLowerInvariant()));
-                if (inheritance.UseEnhancedMode)
-                    element.Add(new XAttribute("InheritUseEnhancedMode", inheritance.UseEnhancedMode.ToString().ToLowerInvariant()));
-                if (inheritance.UserViaAPI)
-                    element.Add(new XAttribute("InheritUserViaAPI", inheritance.UserViaAPI.ToString().ToLowerInvariant()));
-            }
-        }
-    }
-}

mRemoteNG/Config/Serializers/Versioning/SqlVersion27To28Upgrader.cs

@@ -1,64 +0,0 @@
-using mRemoteNG.App;
-using mRemoteNG.Config.DatabaseConnectors;
-using mRemoteNG.Messages;
-using System;
-using System.Data.Common;
-
-namespace mRemoteNG.Config.Serializers.Versioning
-{
-    public class SqlVersion27To28Upgrader : IVersionUpgrader
-    {
-        private readonly IDatabaseConnector _databaseConnector;
-
-        public SqlVersion27To28Upgrader(IDatabaseConnector databaseConnector)
-        {
-            _databaseConnector = databaseConnector ?? throw new ArgumentNullException(nameof(databaseConnector));
-        }
-
-        public bool CanUpgrade(Version currentVersion)
-        {
-            return currentVersion.CompareTo(new Version(2, 7)) == 0;
-        }
-
-        public Version Upgrade()
-        {
-            Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                "Upgrading database from version 2.7 to version 2.8.");
-
-            const string mySqlText = @"
-ALTER TABLE tblCons MODIFY COLUMN ID INT;
-ALTER TABLE tblCons DROP PRIMARY KEY, ADD PRIMARY KEY (ConstantID);
-ALTER TABLE tblCons ADD INDEX `id` (ID), MODIFY ID int auto_increment;
-ALTER TABLE tblCons MODIFY COLUMN ID INT AUTO_INCREMENT, ADD UNIQUE(ID);
-UPDATE tblRoot SET ConfVersion='2.8'";
-            const string msSqlText1 = @"
-ALTER TABLE tblCons ADD  DEFAULT 0 FOR UseEnhancedMode;
-ALTER TABLE tblCons ADD  DEFAULT 0 FOR InheritUseEnhancedMode;
-UPDATE tblCons SET UseEnhancedMode = 0 WHERE UseEnhancedMode IS NULL;
-UPDATE tblCons SET InheritUseEnhancedMode = 0 WHERE InheritUseEnhancedMode IS NULL;
-ALTER TABLE tblCons ALTER COLUMN ConstantID varchar(128) NOT NULL;";
-            const string msSqlText2 = @"
-ALTER TABLE tblCons ADD CONSTRAINT PK_tblCons PRIMARY KEY (ConstantID);
-UPDATE tblRoot SET ConfVersion='2.8';";
-            DbCommand dbCommand;
-
-            if (_databaseConnector.GetType() == typeof(MSSqlDatabaseConnector))
-            {
-                dbCommand = _databaseConnector.DbCommand(msSqlText1);
-                dbCommand.ExecuteNonQuery();
-                dbCommand = _databaseConnector.DbCommand(msSqlText2);
-            } else if (_databaseConnector.GetType() == typeof(MySqlDatabaseConnector))
-            {
-                dbCommand = _databaseConnector.DbCommand(mySqlText);
-            } else
-            {
-                throw new Exception("Unknow database backend");
-            }
-
-
-
-            dbCommand.ExecuteNonQuery();
-            return new Version(2, 8);
-        }
-    }
-}

mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs

@@ -1,80 +0,0 @@
-using mRemoteNG.App;
-using mRemoteNG.Config.DatabaseConnectors;
-using mRemoteNG.Messages;
-using System;
-using System.Data.Common;
-
-namespace mRemoteNG.Config.Serializers.Versioning
-{
-    public class SqlVersion28To29Upgrader : IVersionUpgrader
-    {
-        private readonly Version version = new Version(2, 9);
-        private readonly IDatabaseConnector _databaseConnector;
-
-        public SqlVersion28To29Upgrader(IDatabaseConnector databaseConnector)
-        {
-            _databaseConnector = databaseConnector ?? throw new ArgumentNullException(nameof(databaseConnector));
-        }
-
-        public bool CanUpgrade(Version currentVersion)
-        {
-            return currentVersion == new Version(2, 8) ||
-                // Support upgrading during dev revisions, 2.9.1, 2.9.2, etc...
-                (currentVersion <= new Version(2, 9) &&
-                currentVersion < version);
-        }
-
-        public Version Upgrade()
-        {
-            Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                string.Format("Upgrading database to version {0}.", version));
-
-            const string mySqlAlter = @"
-ALTER TABLE tblCons ADD COLUMN StartProgram varchar(512) DEFAULT NULL;
-ALTER TABLE tblCons ADD COLUMN StartProgramWorkDir varchar(512) DEFAULT NULL;
-ALTER TABLE tblRoot CHANGE COLUMN ConfVersion ConfVersion VARCHAR(15) NOT NULL;";
-            const string mySqlUpdate = @"UPDATE tblRoot SET ConfVersion=?;";
-            const string msSqlAlter = @"
-IF NOT EXISTS (SELECT * FROM sys.columns WHERE object_id = OBJECT_ID(N'[dbo].[tblCons]') AND name = 'StartProgram')
-BEGIN
- ALTER TABLE tblCons ADD StartProgram varchar(512), StartProgramWorkDir varchar(512);
-END;GO;
-ALTER TABLE tblRoot MODIFY COLUMN ConfVersion varchar(15);GO;";
-            const string msSqlUpdate = @"UPDATE tblRoot SET ConfVersion=@confVersion;";
-            using (var sqlTran = _databaseConnector.DbConnection().BeginTransaction(System.Data.IsolationLevel.Serializable))
-            {
-                DbCommand dbCommand;
-                if (_databaseConnector.GetType() == typeof(MSSqlDatabaseConnector))
-                {
-                    dbCommand = _databaseConnector.DbCommand(msSqlAlter);
-                    dbCommand.Transaction = sqlTran;
-                    dbCommand.ExecuteNonQuery();
-                    dbCommand = _databaseConnector.DbCommand(msSqlUpdate);
-                    dbCommand.Transaction = sqlTran;
-                }
-                else if (_databaseConnector.GetType() == typeof(MySqlDatabaseConnector))
-                {
-                    dbCommand = _databaseConnector.DbCommand(mySqlAlter);
-                    dbCommand.Transaction = sqlTran;
-                    dbCommand.ExecuteNonQuery();
-                    dbCommand = _databaseConnector.DbCommand(mySqlUpdate);
-                    dbCommand.Transaction = sqlTran;
-                }
-                else
-                {
-                    throw new Exception("Unknown database back-end");
-                }
-                var pConfVersion = dbCommand.CreateParameter();
-                pConfVersion.ParameterName = "confVersion";
-                pConfVersion.Value = version.ToString();
-                pConfVersion.DbType = System.Data.DbType.String;
-                pConfVersion.Direction = System.Data.ParameterDirection.Input;
-                dbCommand.Parameters.Add(pConfVersion);
-
-                dbCommand.ExecuteNonQuery();
-                sqlTran.Commit();
-            }
-            return version;
-        }
-    }
-}

mRemoteNG/Connection/AbstractConnectionRecord.cs

@@ -1,958 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Connection.Protocol.Http;
-using mRemoteNG.Connection.Protocol.RDP;
-using mRemoteNG.Connection.Protocol.VNC;
-using mRemoteNG.Properties;
-using mRemoteNG.Tools;
-using mRemoteNG.Tools.Attributes;
-using mRemoteNG.Resources.Language;
-
-
-namespace mRemoteNG.Connection
-{
-    public abstract class AbstractConnectionRecord : INotifyPropertyChanged
-    {
-        #region Fields
-
-        private string _name;
-        private string _description;
-        private string _icon;
-        private string _panel;
-
-        private string _hostname;
-        private string _ec2InstanceId = "";
-        private string _ec2Region = "";
-        private string _userViaAPI = "";
-        private string _username = "";
-        private string _password = "";
-        private string _domain = "";
-        private string _vmId = "";
-        private bool _useEnhancedMode;
-        
-        private string _sshTunnelConnectionName = "";
-        private ProtocolType _protocol;
-        private RdpVersion _rdpProtocolVersion;
-        private string _extApp;
-        private int _port;
-        private string _sshOptions = "";
-        private string _puttySession;
-        private bool _useConsoleSession;
-        private AuthenticationLevel _rdpAuthenticationLevel;
-        private int _rdpMinutesToIdleTimeout;
-        private bool _rdpAlertIdleTimeout;
-        private string _loadBalanceInfo;
-        private HTTPBase.RenderingEngine _renderingEngine;
-        private bool _useCredSsp;
-        private bool _useVmId;
-
-        private RDGatewayUsageMethod _rdGatewayUsageMethod;
-        private string _rdGatewayHostname;
-        private RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials;
-        private string _rdGatewayUsername;
-        private string _rdGatewayPassword;
-        private string _rdGatewayDomain;
-
-        private RDPResolutions _resolution;
-        private bool _automaticResize;
-        private RDPColors _colors;
-        private bool _cacheBitmaps;
-        private bool _displayWallpaper;
-        private bool _displayThemes;
-        private bool _enableFontSmoothing;
-        private bool _enableDesktopComposition;
-        private bool _disableFullWindowDrag;
-        private bool _disableMenuAnimations;
-        private bool _disableCursorShadow;
-        private bool _disableCursorBlinking;
-
-        private bool _redirectKeys;
-        private bool _redirectDiskDrives;
-        private bool _redirectPrinters;
-        private bool _redirectClipboard;
-        private bool _redirectPorts;
-        private bool _redirectSmartCards;
-        private RDPSounds _redirectSound;
-        private RDPSoundQuality _soundQuality;
-        private bool _redirectAudioCapture;
-
-        private string _preExtApp;
-        private string _postExtApp;
-        private string _macAddress;
-        private string _openingCommand;
-        private string _userField;
-        private string _RDPStartProgram;
-        private string _RDPStartProgramWorkDir;
-        private bool _favorite;
-
-        private ProtocolVNC.Compression _vncCompression;
-        private ProtocolVNC.Encoding _vncEncoding;
-        private ProtocolVNC.AuthMode _vncAuthMode;
-        private ProtocolVNC.ProxyType _vncProxyType;
-        private string _vncProxyIp;
-        private int _vncProxyPort;
-        private string _vncProxyUsername;
-        private string _vncProxyPassword;
-        private ProtocolVNC.Colors _vncColors;
-        private ProtocolVNC.SmartSizeMode _vncSmartSizeMode;
-        private bool _vncViewOnly;
-
-        #endregion
-
-        #region Properties
-
-        #region Display
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Name)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionName))]
-        public virtual string Name
-        {
-            get => _name;
-            set => SetField(ref _name, value, "Name");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Description)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDescription))]
-        public virtual string Description
-        {
-            get => GetPropertyValue("Description", _description);
-            set => SetField(ref _description, value, "Description");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
-         TypeConverter(typeof(ConnectionIcon)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Icon)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionIcon))]
-        public virtual string Icon
-        {
-            get => GetPropertyValue("Icon", _icon);
-            set => SetField(ref _icon, value, "Icon");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Panel)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPanel))]
-        public virtual string Panel
-        {
-            get => GetPropertyValue("Panel", _panel);
-            set => SetField(ref _panel, value, "Panel");
-        }
-
-        #endregion
-
-        #region Connection
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.HostnameIp)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionHostnameIp)),
-         AttributeUsedInAllProtocolsExcept()]
-        public virtual string Hostname
-        {
-            get => _hostname.Trim();
-            set => SetField(ref _hostname, value?.Trim(), "Hostname");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Port)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPort)),
-         AttributeUsedInAllProtocolsExcept()]
-        public virtual int Port
-        {
-            get => GetPropertyValue("Port", _port);
-            set => SetField(ref _port, value, "Port");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UserViaAPI)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUserViaAPI)),
-         AttributeUsedInAllProtocolsExcept(ProtocolType.VNC, ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)]
-        public virtual string UserViaAPI
-        {
-            get => GetPropertyValue("UserViaAPI", _userViaAPI);
-            set => SetField(ref _userViaAPI, value, "UserViaAPI");
-        }
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Username)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUsername)),
-         AttributeUsedInProtocol(ProtocolType.RDP, ProtocolType.SSH1, ProtocolType.SSH2)]
-        public virtual string Username
-        {
-            get => GetPropertyValue("Username", _username);
-            set => SetField(ref _username, Settings.Default.DoNotTrimUsername ? value : value?.Trim(), "Username");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Password)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPassword)),
-         PasswordPropertyText(true),
-         AttributeUsedInAllProtocolsExcept(ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)]
-        public virtual string Password
-        {
-            get => GetPropertyValue("Password", _password);
-            set => SetField(ref _password, value, "Password");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Domain)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDomain)),
-         AttributeUsedInProtocol(ProtocolType.RDP, ProtocolType.IntApp, ProtocolType.PowerShell)]
-        public string Domain
-        {
-            get => GetPropertyValue("Domain", _domain).Trim();
-            set => SetField(ref _domain, value?.Trim(), "Domain");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-        LocalizedAttributes.LocalizedDisplayName(nameof(Language.EC2InstanceId)),
-        LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEC2InstanceId)),
-        AttributeUsedInProtocol(ProtocolType.RDP, ProtocolType.SSH2)]
-        public string EC2InstanceId
-        {
-            get => GetPropertyValue("EC2InstanceId", _ec2InstanceId).Trim();
-            set => SetField(ref _ec2InstanceId, value?.Trim(), "EC2InstanceId");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-        LocalizedAttributes.LocalizedDisplayName(nameof(Language.EC2Region)),
-        LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEC2Region)),
-        AttributeUsedInProtocol(ProtocolType.RDP, ProtocolType.SSH2)]
-        public string EC2Region
-        {
-            get => GetPropertyValue("EC2Region", _ec2Region).Trim();
-            set => SetField(ref _ec2Region, value?.Trim(), "EC2Region");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.VmId)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVmId)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public string VmId
-        {
-            get => GetPropertyValue("VmId", _vmId).Trim();
-            set => SetField(ref _vmId, value?.Trim(), "VmId");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshTunnel)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshTunnel)),
-         TypeConverter(typeof(SshTunnelTypeConverter)),
-         AttributeUsedInAllProtocolsExcept()]
-        public string SSHTunnelConnectionName
-        {
-            get => GetPropertyValue("SSHTunnelConnectionName", _sshTunnelConnectionName).Trim();
-            set => SetField(ref _sshTunnelConnectionName, value?.Trim(), "SSHTunnelConnectionName");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-        LocalizedAttributes.LocalizedDisplayName(nameof(Language.OpeningCommand)),
-        LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionOpeningCommand)),
-           AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2)]
-        public virtual string OpeningCommand
-        {
-            get => GetPropertyValue("OpeningCommand", _openingCommand);
-            set => SetField(ref _openingCommand, value, "OpeningCommand");
-        }
-        #endregion
-
-        #region Protocol
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Protocol)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionProtocol)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter))]
-        public virtual ProtocolType Protocol
-        {
-            get => GetPropertyValue("Protocol", _protocol);
-            set => SetField(ref _protocol, value, "Protocol");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpVersion)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpVersion)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public virtual RdpVersion RdpVersion
-        {
-            get => GetPropertyValue("RdpVersion", _rdpProtocolVersion);
-            set => SetField(ref _rdpProtocolVersion, value, nameof(RdpVersion));
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalTool)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalTool)),
-         TypeConverter(typeof(ExternalToolsTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.IntApp)]
-        public string ExtApp
-        {
-            get => GetPropertyValue("ExtApp", _extApp);
-            set => SetField(ref _extApp, value, "ExtApp");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.PuttySession)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPuttySession)),
-         TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList)),
-         AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2, ProtocolType.Telnet,
-            ProtocolType.RAW, ProtocolType.Rlogin)]
-        public virtual string PuttySession
-        {
-            get => GetPropertyValue("PuttySession", _puttySession);
-            set => SetField(ref _puttySession, value, "PuttySession");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshOptions)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshOptions)),
-         AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2)]
-        public virtual string SSHOptions
-        {
-            get => GetPropertyValue("SSHOptions", _sshOptions);
-            set => SetField(ref _sshOptions, value, "SSHOptions");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseConsoleSession)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseConsoleSession)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool UseConsoleSession
-        {
-            get => GetPropertyValue("UseConsoleSession", _useConsoleSession);
-            set => SetField(ref _useConsoleSession, value, "UseConsoleSession");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationLevel)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationLevel)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public AuthenticationLevel RDPAuthenticationLevel
-        {
-            get => GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel);
-            set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPMinutesToIdleTimeout)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public virtual int RDPMinutesToIdleTimeout
-        {
-            get => GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout);
-            set
-            {
-                if (value < 0)
-                    value = 0;
-                else if (value > 240)
-                    value = 240;
-                SetField(ref _rdpMinutesToIdleTimeout, value, "RDPMinutesToIdleTimeout");
-            }
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPAlertIdleTimeout)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RDPAlertIdleTimeout
-        {
-            get => GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout);
-            set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.LoadBalanceInfo)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionLoadBalanceInfo)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public string LoadBalanceInfo
-        {
-            get => GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim();
-            set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RenderingEngine)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRenderingEngine)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.HTTP, ProtocolType.HTTPS)]
-        public HTTPBase.RenderingEngine RenderingEngine
-        {
-            get => GetPropertyValue("RenderingEngine", _renderingEngine);
-            set => SetField(ref _renderingEngine, value, "RenderingEngine");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseCredSsp)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseCredSsp)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool UseCredSsp
-        {
-            get => GetPropertyValue("UseCredSsp", _useCredSsp);
-            set => SetField(ref _useCredSsp, value, "UseCredSsp");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseVmId)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseVmId)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool UseVmId
-        {
-            get => GetPropertyValue("UseVmId", _useVmId);
-            set => SetField(ref _useVmId, value, "UseVmId");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseEnhancedMode)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseEnhancedMode)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool UseEnhancedMode
-        {
-            get => GetPropertyValue("UseEnhancedMode", _useEnhancedMode);
-            set => SetField(ref _useEnhancedMode, value, "UseEnhancedMode");
-        }
-        #endregion
-
-        #region RD Gateway
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsageMethod)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayUsageMethod)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public RDGatewayUsageMethod RDGatewayUsageMethod
-        {
-            get => GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod);
-            set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayHostname)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayHostname)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public string RDGatewayHostname
-        {
-            get => GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim();
-            set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUseConnectionCredentials)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUseConnectionCredentials)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
-        {
-            get => GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials);
-            set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsername)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUsername)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public string RDGatewayUsername
-        {
-            get => GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim();
-            set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayPassword)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayPassword)),
-         PasswordPropertyText(true),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public string RDGatewayPassword
-        {
-            get => GetPropertyValue("RDGatewayPassword", _rdGatewayPassword);
-            set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayDomain)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayDomain)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public string RDGatewayDomain
-        {
-            get => GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim();
-            set => SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain");
-        }
-
-        #endregion
-
-        #region Appearance
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Resolution)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionResolution)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public RDPResolutions Resolution
-        {
-            get => GetPropertyValue("Resolution", _resolution);
-            set => SetField(ref _resolution, value, "Resolution");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AutomaticResize)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAutomaticResize)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool AutomaticResize
-        {
-            get => GetPropertyValue("AutomaticResize", _automaticResize);
-            set => SetField(ref _automaticResize, value, "AutomaticResize");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public RDPColors Colors
-        {
-            get => GetPropertyValue("Colors", _colors);
-            set => SetField(ref _colors, value, "Colors");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.CacheBitmaps)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCacheBitmaps)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool CacheBitmaps
-        {
-            get => GetPropertyValue("CacheBitmaps", _cacheBitmaps);
-            set => SetField(ref _cacheBitmaps, value, "CacheBitmaps");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayWallpaper)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayWallpaper)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool DisplayWallpaper
-        {
-            get => GetPropertyValue("DisplayWallpaper", _displayWallpaper);
-            set => SetField(ref _displayWallpaper, value, "DisplayWallpaper");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayThemes)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayThemes)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool DisplayThemes
-        {
-            get => GetPropertyValue("DisplayThemes", _displayThemes);
-            set => SetField(ref _displayThemes, value, "DisplayThemes");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.FontSmoothing)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableFontSmoothing)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool EnableFontSmoothing
-        {
-            get => GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing);
-            set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.EnableDesktopComposition)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableDesktopComposition)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool EnableDesktopComposition
-        {
-            get => GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition);
-            set => SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableFullWindowDrag)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableFullWindowDrag)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool DisableFullWindowDrag
-        {
-            get => GetPropertyValue("DisableFullWindowDrag", _disableFullWindowDrag);
-            set => SetField(ref _disableFullWindowDrag, value, "DisableFullWindowDrag");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableMenuAnimations)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableMenuAnimations)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool DisableMenuAnimations
-        {
-            get => GetPropertyValue("DisableMenuAnimations", _disableMenuAnimations);
-            set => SetField(ref _disableMenuAnimations, value, "DisableMenuAnimations");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool DisableCursorShadow
-        {
-            get => GetPropertyValue("DisableCursorShadow", _disableCursorShadow);
-            set => SetField(ref _disableCursorShadow, value, "DisableCursorShadow");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool DisableCursorBlinking
-        {
-            get => GetPropertyValue("DisableCursorBlinking", _disableCursorBlinking);
-            set => SetField(ref _disableCursorBlinking, value, "DisableCursorBlinking");
-        }
-        #endregion
-
-        #region Redirect
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RedirectKeys)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectKeys)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RedirectKeys
-        {
-            get => GetPropertyValue("RedirectKeys", _redirectKeys);
-            set => SetField(ref _redirectKeys, value, "RedirectKeys");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DiskDrives)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectDrives)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RedirectDiskDrives
-        {
-            get => GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives);
-            set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Printers)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPrinters)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RedirectPrinters
-        {
-            get => GetPropertyValue("RedirectPrinters", _redirectPrinters);
-            set => SetField(ref _redirectPrinters, value, "RedirectPrinters");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Clipboard)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectClipboard)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RedirectClipboard
-        {
-            get => GetPropertyValue("RedirectClipboard", _redirectClipboard);
-            set => SetField(ref _redirectClipboard, value, "RedirectClipboard");
-        }
-
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Ports)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPorts)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RedirectPorts
-        {
-            get => GetPropertyValue("RedirectPorts", _redirectPorts);
-            set => SetField(ref _redirectPorts, value, "RedirectPorts");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SmartCard)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSmartCards)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RedirectSmartCards
-        {
-            get => GetPropertyValue("RedirectSmartCards", _redirectSmartCards);
-            set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Sounds)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSounds)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public RDPSounds RedirectSound
-        {
-            get => GetPropertyValue("RedirectSound", _redirectSound);
-            set => SetField(ref _redirectSound, value, "RedirectSound");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SoundQuality)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSoundQuality)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public RDPSoundQuality SoundQuality
-        {
-            get => GetPropertyValue("SoundQuality", _soundQuality);
-            set => SetField(ref _soundQuality, value, "SoundQuality");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AudioCapture)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectAudioCapture)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public bool RedirectAudioCapture
-        {
-            get => GetPropertyValue("RedirectAudioCapture", _redirectAudioCapture);
-            set => SetField(ref _redirectAudioCapture, value, nameof(RedirectAudioCapture));
-        }
-
-        #endregion
-
-        #region Misc
-
-        [Browsable(false)] public string ConstantID { get; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolBefore)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolBefore)),
-         TypeConverter(typeof(ExternalToolsTypeConverter))]
-        public virtual string PreExtApp
-        {
-            get => GetPropertyValue("PreExtApp", _preExtApp);
-            set => SetField(ref _preExtApp, value, "PreExtApp");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolAfter)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolAfter)),
-         TypeConverter(typeof(ExternalToolsTypeConverter))]
-        public virtual string PostExtApp
-        {
-            get => GetPropertyValue("PostExtApp", _postExtApp);
-            set => SetField(ref _postExtApp, value, "PostExtApp");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.MacAddress)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionMACAddress))]
-        public virtual string MacAddress
-        {
-            get => GetPropertyValue("MacAddress", _macAddress);
-            set => SetField(ref _macAddress, value, "MacAddress");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UserField)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUser1))]
-        public virtual string UserField
-        {
-            get => GetPropertyValue("UserField", _userField);
-            set => SetField(ref _userField, value, "UserField");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.Favorite)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionFavorite)),
-            TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public virtual bool Favorite
-        {
-            get => GetPropertyValue("Favorite", _favorite);
-            set => SetField(ref _favorite, value, "Favorite");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RDPStartProgram)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPStartProgram)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public virtual string RDPStartProgram
-        {
-            get => GetPropertyValue("RDPStartProgram", _RDPStartProgram);
-            set => SetField(ref _RDPStartProgram, value, "RDPStartProgram");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RDPStartProgramWorkDir)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPStartProgramWorkDir)),
-         AttributeUsedInProtocol(ProtocolType.RDP)]
-        public virtual string RDPStartProgramWorkDir
-        {
-            get => GetPropertyValue("RDPStartProgramWorkDir", _RDPStartProgramWorkDir);
-            set => SetField(ref _RDPStartProgramWorkDir, value, "RDPStartProgramWorkDir");
-        }
-
-        #endregion
-
-        #region VNC
-        // TODO: it seems all these VNC properties were added and serialized but
-        // never hooked up to the VNC protocol or shown to the user
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Compression)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCompression)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.VNC),
-         Browsable(false)]
-        public ProtocolVNC.Compression VNCCompression
-        {
-            get => GetPropertyValue("VNCCompression", _vncCompression);
-            set => SetField(ref _vncCompression, value, "VNCCompression");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Encoding)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEncoding)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.VNC),
-         Browsable(false)]
-        public ProtocolVNC.Encoding VNCEncoding
-        {
-            get => GetPropertyValue("VNCEncoding", _vncEncoding);
-            set => SetField(ref _vncEncoding, value, "VNCEncoding");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationMode)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationMode)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.VNC),
-         Browsable(false)]
-        public ProtocolVNC.AuthMode VNCAuthMode
-        {
-            get => GetPropertyValue("VNCAuthMode", _vncAuthMode);
-            set => SetField(ref _vncAuthMode, value, "VNCAuthMode");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyType)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyType)),
-            TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-            AttributeUsedInProtocol(ProtocolType.VNC),
-            Browsable(false)]
-        public ProtocolVNC.ProxyType VNCProxyType
-        {
-            get => GetPropertyValue("VNCProxyType", _vncProxyType);
-            set => SetField(ref _vncProxyType, value, "VNCProxyType");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyAddress)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyAddress)),
-            AttributeUsedInProtocol(ProtocolType.VNC),
-            Browsable(false)]
-        public string VNCProxyIP
-        {
-            get => GetPropertyValue("VNCProxyIP", _vncProxyIp);
-            set => SetField(ref _vncProxyIp, value, "VNCProxyIP");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPort)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPort)),
-            AttributeUsedInProtocol(ProtocolType.VNC),
-            Browsable(false)]
-        public int VNCProxyPort
-        {
-            get => GetPropertyValue("VNCProxyPort", _vncProxyPort);
-            set => SetField(ref _vncProxyPort, value, "VNCProxyPort");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyUsername)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyUsername)),
-            AttributeUsedInProtocol(ProtocolType.VNC),
-            Browsable(false)]
-        public string VNCProxyUsername
-        {
-            get => GetPropertyValue("VNCProxyUsername", _vncProxyUsername);
-            set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPassword)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPassword)),
-            PasswordPropertyText(true),
-            AttributeUsedInProtocol(ProtocolType.VNC),
-            Browsable(false)]
-        public string VNCProxyPassword
-        {
-            get => GetPropertyValue("VNCProxyPassword", _vncProxyPassword);
-            set => SetField(ref _vncProxyPassword, value, "VNCProxyPassword");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.VNC),
-         Browsable(false)]
-        public ProtocolVNC.Colors VNCColors
-        {
-            get => GetPropertyValue("VNCColors", _vncColors);
-            set => SetField(ref _vncColors, value, "VNCColors");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SmartSizeMode)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSmartSizeMode)),
-         TypeConverter(typeof(MiscTools.EnumTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.VNC)]
-        public ProtocolVNC.SmartSizeMode VNCSmartSizeMode
-        {
-            get => GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode);
-            set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode");
-        }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ViewOnly)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionViewOnly)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         AttributeUsedInProtocol(ProtocolType.VNC)]
-        public bool VNCViewOnly
-        {
-            get => GetPropertyValue("VNCViewOnly", _vncViewOnly);
-            set => SetField(ref _vncViewOnly, value, "VNCViewOnly");
-        }
-
-        #endregion
-
-        #endregion
-
-        protected AbstractConnectionRecord(string uniqueId)
-        {
-            ConstantID = uniqueId.ThrowIfNullOrEmpty(nameof(uniqueId));
-        }
-
-        protected virtual TPropertyType GetPropertyValue<TPropertyType>(string propertyName, TPropertyType value)
-        {
-            return (TPropertyType)GetType().GetProperty(propertyName)?.GetValue(this, null);
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void RaisePropertyChangedEvent(object sender, PropertyChangedEventArgs args)
-        {
-            PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(args.PropertyName));
-        }
-
-        protected void SetField<T>(ref T field, T value, string propertyName = null)
-        {
-            if (EqualityComparer<T>.Default.Equals(field, value)) return;
-            field = value;
-            RaisePropertyChangedEvent(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-}

mRemoteNG/Connection/ConnectionInfoInheritance.cs

@@ -1,588 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using mRemoteNG.Tools;
-using mRemoteNG.Tree.Root;
-using mRemoteNG.Resources.Language;
-
-namespace mRemoteNG.Connection
-{
-    public class ConnectionInfoInheritance
-    {
-        private ConnectionInfoInheritance _tempInheritanceStorage;
-
-        #region Public Properties
-
-        #region General
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.General)),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.All)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAll)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool EverythingInherited
-        {
-            get => EverythingIsInherited();
-            set => SetAllValues(value);
-        }
-
-        #endregion
-
-        #region Display
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display), 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Description)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDescription)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Description { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display), 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Icon)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionIcon)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Icon { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display), 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Panel)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPanel)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Panel { get; set; }
-
-        #endregion
-
-        #region Connection
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UserViaAPI)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUserViaAPI)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        [Browsable(true)]
-        public bool UserViaAPI { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Username)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUsername)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        [Browsable(true)]
-        public bool Username { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.VmId)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVmId)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        [Browsable(true)]
-        public bool VmId { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Password)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPassword)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        [Browsable(true)]
-        public bool Password { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Domain)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDomain)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        [Browsable(true)]
-        public bool Domain { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Port)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPort)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Port { get; set; }
-        
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute(nameof(Language.SshTunnel)),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute(nameof(Language.PropertyDescriptionSshTunnel)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        [Browsable(true)]
-        public bool SSHTunnelConnectionName { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute(nameof(Language.OpeningCommand)),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute(nameof(Language.PropertyDescriptionOpeningCommand)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        [Browsable(true)]
-        public bool OpeningCommand { get; set; }
-
-        
-
-        #endregion
-
-        #region Protocol
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Protocol)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionProtocol)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Protocol { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpVersion)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRdpVersion)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RdpVersion { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ExternalTool)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionExternalTool)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool ExtApp { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.PuttySession)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPuttySession)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool PuttySession { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.SshOptions)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionSshOptions)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool SSHOptions { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AuthenticationLevel)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAuthenticationLevel)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDPAuthenticationLevel { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.MinutesToIdleTimeout)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDPMinutesToIdleTimeout)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDPMinutesToIdleTimeout { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.MinutesToIdleTimeout)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDPAlertIdleTimeout)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDPAlertIdleTimeout { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.LoadBalanceInfo)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionLoadBalanceInfo)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool LoadBalanceInfo { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RenderingEngine)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRenderingEngine)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RenderingEngine { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseConsoleSession)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseConsoleSession)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool UseConsoleSession { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseCredSsp)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseCredSsp)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool UseCredSsp { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseVmId)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseVmId)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool UseVmId { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseEnhancedMode)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseEnhancedMode)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool UseEnhancedMode { get; set; }
-
-        #endregion
-
-        #region RD Gateway
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayUsageMethod)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRdpGatewayUsageMethod)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDGatewayUsageMethod { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayHostname)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayHostname)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDGatewayHostname { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayUseConnectionCredentials)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayUseConnectionCredentials)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDGatewayUseConnectionCredentials { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayUsername)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayUsername)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDGatewayUsername { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayPassword)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRdpGatewayPassword)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDGatewayPassword { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayDomain)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayDomain)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RDGatewayDomain { get; set; }
-
-        #endregion
-
-        #region Appearance
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Resolution)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionResolution)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Resolution { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AutomaticResize)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAutomaticResize)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool AutomaticResize { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Colors)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionColors)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Colors { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.CacheBitmaps)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionCacheBitmaps)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool CacheBitmaps { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisplayWallpaper)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisplayWallpaper)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool DisplayWallpaper { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisplayThemes)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisplayThemes)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool DisplayThemes { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.FontSmoothing)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEnableFontSmoothing)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool EnableFontSmoothing { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.EnableDesktopComposition)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEnableDesktopComposition)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool EnableDesktopComposition { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableFullWindowDrag)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableFullWindowDrag)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool DisableFullWindowDrag { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableMenuAnimations)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableMenuAnimations)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool DisableMenuAnimations { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableCursorShadow)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableCursorShadow)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool DisableCursorShadow { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableCursorBlinking)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableCursorBlinking)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool DisableCursorBlinking { get; set; }
-
-        #endregion
-
-        #region Redirect
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RedirectKeys)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectKeys)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectKeys { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DiskDrives)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectDrives)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectDiskDrives { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Printers)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectPrinters)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectPrinters { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Clipboard)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectClipboard)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectClipboard { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Redirect)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectPorts)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectPorts { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Redirect)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectSmartCards)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectSmartCards { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Sounds)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectSounds)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectSound { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.SoundQuality)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionSoundQuality)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool SoundQuality { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AudioCapture)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectAudioCapture)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool RedirectAudioCapture { get; set; }
-
-        #endregion
-
-        #region Misc
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ExternalToolBefore)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionExternalToolBefore)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool PreExtApp { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ExternalToolAfter)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionExternalToolAfter)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool PostExtApp { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.MacAddress)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionMACAddress)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool MacAddress { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UserField)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUser1)),
-         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool UserField { get; set; }
-
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
-        LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Favorite)),
-        LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionFavorite)),
-        TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
-        public bool Favorite { get; set; }
-        #endregion
-
-        #region VNC
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Compression)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionCompression)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCCompression {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Encoding)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEncoding)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCEncoding {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AuthenticationMode)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAuthenticationMode)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCAuthMode {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyType)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyType)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyType {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyAddress)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyAddress)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyIP {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyPort)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyPort)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPort {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyUsername)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyUsername)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyUsername {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyPassword)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyPassword)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPassword {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Colors)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionColors)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCColors {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.SmartSizeMode)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionSmartSizeMode)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCSmartSizeMode {get; set;}
-				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ViewOnly)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionViewOnly)), 
-		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCViewOnly {get; set;}
-        #endregion
-
-        [Browsable(false)]
-        public ConnectionInfo Parent { get; private set; }
-
-        /// <summary>
-        /// Indicates whether this inheritance object is enabled.
-        /// When false, users of this object should not respect inheritance
-        /// settings for individual properties.
-        /// </summary>
-        [Browsable(false)]
-        public bool InheritanceActive => !(Parent is RootNodeInfo || Parent?.Parent is RootNodeInfo);
-
-        #endregion
-
-
-        public ConnectionInfoInheritance(ConnectionInfo parent, bool ignoreDefaultInheritance = false)
-        {
-            Parent = parent;
-            if (!ignoreDefaultInheritance)
-                SetAllValues(DefaultConnectionInheritance.Instance);
-        }
-
-
-        public ConnectionInfoInheritance Clone(ConnectionInfo parent)
-        {
-            var newInheritance = (ConnectionInfoInheritance)MemberwiseClone();
-            newInheritance.Parent = parent;
-            return newInheritance;
-        }
-
-        public void EnableInheritance()
-        {
-            if (_tempInheritanceStorage != null)
-                UnstashInheritanceData();
-        }
-
-        private void UnstashInheritanceData()
-        {
-            SetAllValues(_tempInheritanceStorage);
-            _tempInheritanceStorage = null;
-        }
-
-        public void DisableInheritance()
-        {
-            StashInheritanceData();
-            TurnOffInheritanceCompletely();
-        }
-
-        private void StashInheritanceData()
-        {
-            _tempInheritanceStorage = Clone(Parent);
-        }
-
-        public void TurnOnInheritanceCompletely()
-        {
-            SetAllValues(true);
-        }
-
-        public void TurnOffInheritanceCompletely()
-        {
-            SetAllValues(false);
-        }
-
-        private bool EverythingIsInherited()
-        {
-            var inheritanceProperties = GetProperties();
-            var everythingInherited = inheritanceProperties.All((p) => (bool)p.GetValue(this, null));
-            return everythingInherited;
-        }
-
-        public IEnumerable<PropertyInfo> GetProperties()
-        {
-            var properties = typeof(ConnectionInfoInheritance).GetProperties();
-            var filteredProperties = properties.Where(FilterProperty);
-            return filteredProperties;
-        }
-
-        /// <summary>
-        /// Gets the name of all properties where inheritance is turned on
-        /// (set to True).
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<string> GetEnabledInheritanceProperties()
-        {
-            return InheritanceActive
-                ? GetProperties()
-                    .Where(property => (bool)property.GetValue(this))
-                    .Select(property => property.Name)
-                    .ToList()
-                : Enumerable.Empty<string>();
-        }
-
-        private bool FilterProperty(PropertyInfo propertyInfo)
-        {
-            var exclusions = new[]
-            {
-                nameof(EverythingInherited),
-                nameof(Parent),
-                nameof(InheritanceActive)
-            };
-            var valueShouldNotBeFiltered = !exclusions.Contains(propertyInfo.Name);
-            return valueShouldNotBeFiltered;
-        }
-
-        private void SetAllValues(bool value)
-        {
-            var properties = GetProperties();
-            foreach (var property in properties)
-            {
-                if (property.PropertyType.Name == typeof(bool).Name)
-                    property.SetValue(this, value, null);
-            }
-        }
-
-        private void SetAllValues(ConnectionInfoInheritance otherInheritanceObject)
-        {
-            var properties = GetProperties();
-            foreach (var property in properties)
-            {
-                var newPropertyValue = property.GetValue(otherInheritanceObject, null);
-                property.SetValue(this, newPropertyValue, null);
-            }
-        }
-    }
-}