lib updates

fix test cases caused by new fields

CHANGELOG.md

@@ -5,15 +5,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 ### Added
-- #1427: Fix RDP local desktop scale not taking effect on remote
+- #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
-- #1850: Minify config xml
+- #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
@@ -24,20 +32,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - #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 
+- #1773: Connection issue with MySql - Missing fields in
 - #1756: Cannot type any character on MultiSSH toolbar 
 - #1720: Show configuration file name in title of password prompt form
 - #1713: Sound redirection does not work if Clipboard redirection is set to No
 - #1632: 1.77.1 breaks RDP drive and sound redirection
-- #1610: Menu bar changes to english when cancelling options form
+- #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

COPYING.TXT

@@ -278,62 +278,3 @@ 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

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

ExternalConnectors/AWS/AWSConnectionForm.Designer.cs

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

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

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

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

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

@@ -0,0 +1,28 @@
+<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.9" />
+    <PackageReference Include="AWSSDK.EC2" Version="3.7.50.4" />
+    <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

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

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

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

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

@@ -0,0 +1,184 @@
+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);
+        }
+    }
+}

README.MD

@@ -2,7 +2,7 @@
 
 <br/><br/>
 <p align="center">
-  <img width="500" src="https://github.com/mRemoteNG/mRemoteNG/blob/develop/mRemoteNGProjectFiles/Header_dark.png">
+  <img width="450" src="https://github.com/mRemoteNG/mRemoteNG/blob/develop/mRemoteNGProjectFiles/Header_dark.png">
 </p>
   
 <p align="center">
@@ -45,11 +45,11 @@
 
 ---
 
-| Update Channel | Build Status | Downloads |
+| Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
-| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) |
-| Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) |
-| Nightly build | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) |
+| 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/dnightly?svg=true) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) |
 
 ## Features
 
@@ -73,24 +73,11 @@ For a detailed feature list and general usage support, refer to the [Documentati
 - [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)
 
-### Packaging
-
-Downloads are provided in three different packages.
-
-#### Binary package
-
-The binary package of mRemoteNG is a compiled version of mRemoteNG which comes in an MSI installer.
-This is the most common way to install mRemoteNG and get up and running.
-
-#### Portable package
-
-The portable package contains a modified version of the executable which stores and loads all your settings from files in the application's directory.
-This package can be used to run mRemoteNG from a USB stick and preserve your configuration wherever you go.
-
 #### Source package
 
 This contains the source code from which mRemoteNG is build.
@@ -98,8 +85,8 @@ You will need to compile it yourself using Visual Studio.
 
 ### Minimum Requirements
 
-* [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
-* [Microsoft .NET Framework 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=17851)
+* [Microsoft 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.
 
@@ -113,41 +100,16 @@ mRemoteNG is available as a redistributable MSI package or as a portable ZIP pac
 
 The MSI package of mRemoteNG can be installed using the command line:
 
-`msiexec /i C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value]`
+`msiexec /i [/qn] C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value] [/lv* <log path>]`
 
-| Property | Value | Description |
+| Argument/Property | Value | Description |
 |-|-|-|
-| INSTALLDIR | `folder path` | This allows you to set the installation directory from the command line. For paths that contain spaces, enclose the path in double quotes (""). This overrides any value found in the registry. |
+| /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. |
 
-#### Examples
-
-**Install to a custom folder**
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi INSTALLDIR="D:\Work Apps\mRemoteNG"`
-
-**Ignore prerequisites during a normal install**
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi IGNOREPREREQUISITES=1`
-
-**Ignore prerequisites during a silent install**
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /qn IGNOREPREREQUISITES=1`
-
-### Troubleshooting installation
-
-Turn on verbose logging by using the `/lv* <log path>` argument at the command line.
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /l*v C:\mremoteng_install.log`
-
-## Uninstall
-
-### Standard Uninstall
-
-mRemoteNG basic binary package can be uninstalled with Windows Control Panel. If for some reason it does not work please
-follow information provided below for Manual Uninstall.
-
-### Manual Uninstall
+## 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_
 

Tools/copy_release_installer.ps1

@@ -1,21 +0,0 @@
-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/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,5 +40,4 @@ 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_installer_with_version.ps1" -SolutionDir $SolutionDir
-& "$PSScriptRoot\copy_release_installer.ps1" -SourcePath $TargetDir -DestinationDir (Join-Path -Path $SolutionDir -ChildPath "Release")
+& "$PSScriptRoot\rename_and_copy_installer.ps1" -SolutionDir $SolutionDir

Tools/postbuild_mremoteng.ps1

@@ -25,9 +25,9 @@ param (
     $ExcludeFromSigning
 )
 
-Write-Output "+=================================================================+"
-Write-Output "|                  Beginning mRemoteNG Post Build                 |"
-Write-Output "+=================================================================+"
+Write-Output "+===========================================================================================+"
+Write-Output "|                               Beginning mRemoteNG Post Build                              |"
+Write-Output "+===========================================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
     "TargetDir" = $TargetDir
@@ -37,9 +37,25 @@ 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\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_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/rename_and_copy_installer.ps1

@@ -0,0 +1,13 @@
+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 + "Release\mRemoteNG-Installer-" + $version + ".msi"
+
+# Copy file
+Copy-Item $src -Destination $dst -Force

Tools/rename_installer_with_version.ps1

@@ -1,29 +0,0 @@
-param (
-    [string]
-    $SolutionDir
-)
-
-$renameTarget = $SolutionDir + "mRemoteNGInstaller\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
-
-Write-Host $SolutionDir
-Write-Host $renameTarget
-
-$targetVersionedFile = "$SolutionDir\mRemoteNG\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/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") {
-    Write-Output "Removing unnecessary files from Release versions"
-
+if ($ConfigurationName -match "Release") 
+{
     $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,10 +29,18 @@ if ($ConfigurationName -match "Release") {
     ) -Exclude @(
         "mRemoteNG.VisualElementsManifest.xml"
 	)
-    Remove-Item -Path $filesToDelete.FullName
-    Write-Output $filesToDelete.FullName
+	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"
+	}
 }
-else {
+else 
+{
     Write-Output "We will not remove anything - this is not a release build."
 }
 

Tools/verify_binary_signatures.ps1

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

@@ -12,6 +12,7 @@
     $ConfigurationName
 )
 
+Write-Output ""
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 
 $ConfigurationName = $ConfigurationName.Trim()
@@ -46,8 +47,13 @@ if ($ConfigurationName -match "Release") {
     }
     # Local build
     else {
-        $outputZipPath = "$($SolutionDir)Release\$zipFilePrefix-$($version).zip"
-        Compress-Archive $debugFile $outputZipPath -Force
+		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
@@ -64,8 +70,13 @@ if ($ConfigurationName -eq "Release Portable") {
     }
     # Local build
     else {
-        $outputZipPath="$($SolutionDir)\Release\mRemoteNG-Portable-$($version).zip"
-        Compress-Archive $Source $outputZipPath -Force
+		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"
+		}
     }
 }
 

mRemoteNG.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 14.0.25420.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
+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
@@ -16,108 +16,63 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "mRemoteNGInsta
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04} = {5423D985-CB48-4344-B47F-E8C6D60C8B04}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
+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|Any CPU = Debug Portable|Any CPU
-		Debug Portable|x86 = Debug Portable|x86
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release Installer|Any CPU = Release Installer|Any CPU
-		Release Installer|x86 = Release Installer|x86
-		Release Portable|Any CPU = Release Portable|Any CPU
-		Release Portable|x86 = Release Portable|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
+		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|Any CPU.ActiveCfg = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.Build.0 = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.ActiveCfg = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.Build.0 = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.Build.0 = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.ActiveCfg = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.Build.0 = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.Build.0 = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.ActiveCfg = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.Build.0 = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.ActiveCfg = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.Build.0 = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x86.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.Build.0 = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x86.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x86.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x86.ActiveCfg = Debug|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.Build.0 = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x86.ActiveCfg = Release Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.ActiveCfg = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.Build.0 = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.Build.0 = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.Build.0 = Release|x86
+		{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

mRemoteNG/App/CompatibilityChecker.cs

@@ -7,6 +7,7 @@ using mRemoteNG.Messages;
 using mRemoteNG.Properties;
 using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.TaskDialog;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App
 {

mRemoteNG/App/Import.cs

@@ -7,6 +7,7 @@ using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Container;
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App
 {

mRemoteNG/App/Info/ConnectionsFileInfo.cs

@@ -1,10 +1,12 @@
-namespace mRemoteNG.App.Info
+using System;
+
+namespace mRemoteNG.App.Info
 {
     public static class ConnectionsFileInfo
     {
         public static readonly string DefaultConnectionsPath = SettingsFileInfo.SettingsPath;
         public static readonly string DefaultConnectionsFile = "confCons.xml";
         public static readonly string DefaultConnectionsFileNew = "confConsNew.xml";
-        public static readonly double ConnectionFileVersion = 2.8;
+        public static readonly Version ConnectionFileVersion = new Version(2, 9);
     }
 }

mRemoteNG/App/Initialization/StartupDataLogger.cs

@@ -3,6 +3,7 @@ using System.Management;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App.Initialization
 {

mRemoteNG/App/Logger.cs

@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.IO;
+using System.Reflection;
 using System.Windows.Forms;
 using log4net;
 using log4net.Appender;
@@ -35,6 +36,7 @@ namespace mRemoteNG.App
         public void SetLogPath(string path)
         {
             var repository = LogManager.GetRepository("mRemoteNG");
+            XmlConfigurator.Configure(repository, new FileInfo("log4net.config"));
             var appenders = repository.GetAppenders();
 
             foreach (var appender in appenders)

mRemoteNG/App/NativeMethods.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Drawing;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
@@ -71,6 +71,12 @@ namespace mRemoteNG.App
         [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);
 
@@ -106,7 +112,6 @@ namespace mRemoteNG.App
         internal static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
 
         [DllImport("kernel32", SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern bool CloseHandle(IntPtr handle);
 
         #endregion

mRemoteNG/App/Runtime.cs

@@ -16,6 +16,7 @@ using System.Security;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.App
 {
@@ -101,6 +102,10 @@ namespace mRemoteNG.App
                 if (Settings.Default.UseSQLServer)
                 {
                     ConnectionsService.LastSqlUpdate = DateTime.Now;
+                } 
+				else
+                {
+                    ConnectionsService.LastFileUpdate =  System.IO.File.GetLastWriteTime(connectionFileName);
                 }
 
                 // re-enable sql update checking after updates are loaded

mRemoteNG/App/Shutdown.cs

@@ -2,10 +2,12 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
+using mRemoteNG.Config.Connections;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Properties;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
+using mRemoteNG.Resources.Language;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 
@@ -59,8 +61,34 @@ namespace mRemoteNG.App
 
         private static void SaveConnections()
         {
-            if (Settings.Default.SaveConsOnExit)
+            DateTime lastUpdate;
+            DateTime updateDate;
+            DateTime currentDate = DateTime.Now;
+
+            //OBSOLETE: Settings.Default.SaveConsOnExit is obsolete and should be removed in a future release
+            if (Settings.Default.SaveConsOnExit || (Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnExit))
+            {
                 Runtime.ConnectionsService.SaveConnections();
+				return;
+            }	
+			lastUpdate = Runtime.ConnectionsService.UsingDatabase ? Runtime.ConnectionsService.LastSqlUpdate : Runtime.ConnectionsService.LastFileUpdate;
+
+            switch (Settings.Default.SaveConnectionsFrequency)
+            {
+                case (int)ConnectionsBackupFrequencyEnum.Daily:
+                    updateDate = lastUpdate.AddDays(1);
+                    break;
+                case (int)ConnectionsBackupFrequencyEnum.Weekly:
+                    updateDate = lastUpdate.AddDays(7);
+                    break;
+                default:
+                    return;
+            }
+
+            if (currentDate >= updateDate)
+            {
+                Runtime.ConnectionsService.SaveConnections();
+            }
         }
 
         private static void SaveSettings(Control quickConnectToolStrip,
@@ -92,7 +120,7 @@ namespace mRemoteNG.App
         private static void RunUpdateFile()
         {
             if (UpdatePending)
-                Process.Start(_updateFilePath);
+                Process.Start(new ProcessStartInfo(_updateFilePath) { UseShellExecute = true });
         }
     }
 }

mRemoteNG/App/Startup.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.Threading.Tasks;
 using mRemoteNG.App.Info;
 using mRemoteNG.App.Initialization;
 using mRemoteNG.App.Update;
@@ -65,7 +66,7 @@ namespace mRemoteNG.App
             Runtime.ConnectionsService.RemoteConnectionsSyncronizer.Enable();
         }
 
-        public void CheckForUpdate()
+        public async Task CheckForUpdate()
         {
             if (_appUpdate == null)
             {
@@ -87,32 +88,9 @@ namespace mRemoteNG.App
                 return;
             }
 
-            _appUpdate.GetUpdateInfoCompletedEvent += GetUpdateInfoCompleted;
-            _appUpdate.GetUpdateInfoAsync();
-        }
-
-        private void GetUpdateInfoCompleted(object sender, AsyncCompletedEventArgs e)
-        {
-            if (_frmMain.InvokeRequired)
-            {
-                _frmMain.Invoke(new AsyncCompletedEventHandler(GetUpdateInfoCompleted), sender, e);
-                return;
-            }
-
             try
             {
-                _appUpdate.GetUpdateInfoCompletedEvent -= GetUpdateInfoCompleted;
-
-                if (e.Cancelled)
-                {
-                    return;
-                }
-
-                if (e.Error != null)
-                {
-                    throw e.Error;
-                }
-
+                await _appUpdate.GetUpdateInfoAsync();
                 if (_appUpdate.IsUpdateAvailable())
                 {
                     Windows.Show(WindowType.Update);
@@ -120,7 +98,7 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage("GetUpdateInfoCompleted() failed.", ex);
+                Runtime.MessageCollector.AddExceptionMessage("CheckForUpdate() failed.", ex);
             }
         }
     }

mRemoteNG/App/Update/AppUpdater.cs

@@ -1,12 +1,12 @@
 using System;
 using System.IO;
 using System.Net;
-using System.ComponentModel;
+using System.Net.Http;
 using System.Threading;
-using System.Reflection;
 using mRemoteNG.App.Info;
 using mRemoteNG.Security.SymmetricEncryption;
 using System.Security.Cryptography;
+using System.Threading.Tasks;
 using mRemoteNG.Properties;
 #if !PORTABLE
 using mRemoteNG.Tools;
@@ -21,29 +21,30 @@ namespace mRemoteNG.App.Update
 {
     public class AppUpdater
     {
+        private const int _bufferLength = 8192;
         private WebProxy _webProxy;
-        private Thread _getUpdateInfoThread;
-        private Thread _getChangeLogThread;
+        private HttpClient _httpClient;
+        private CancellationTokenSource _changeLogCancelToken;
+        private CancellationTokenSource _getUpdateInfoCancelToken;
 
         #region Public Properties
 
         public UpdateInfo CurrentUpdateInfo { get; private set; }
 
-        public string ChangeLog { get; private set; }
-
         public bool IsGetUpdateInfoRunning
         {
-            get { return _getUpdateInfoThread != null && _getUpdateInfoThread.IsAlive; }
+            get
+            {
+                return _getUpdateInfoCancelToken != null;
+            }
         }
 
         private bool IsGetChangeLogRunning
         {
-            get { return _getChangeLogThread != null && _getChangeLogThread.IsAlive; }
-        }
-
-        public bool IsDownloadUpdateRunning
-        {
-            get { return _downloadUpdateWebClient != null; }
+            get
+            {
+                return _changeLogCancelToken != null;
+            }
         }
 
         #endregion
@@ -52,10 +53,10 @@ namespace mRemoteNG.App.Update
 
         public AppUpdater()
         {
-            SetProxySettings();
+            SetDefaultProxySettings();
         }
 
-        private void SetProxySettings()
+        private void SetDefaultProxySettings()
         {
             var shouldWeUseProxy = Settings.Default.UpdateUseProxy;
             var proxyAddress = Settings.Default.UpdateProxyAddress;
@@ -78,13 +79,14 @@ namespace mRemoteNG.App.Update
             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()
@@ -96,54 +98,24 @@ namespace mRemoteNG.App.Update
 
             return CurrentUpdateInfo.Version > GeneralAppInfo.GetApplicationVersion();
         }
-
-        public void GetUpdateInfoAsync()
+        
+        public async Task DownloadUpdateAsync(IProgress<int> progress)
         {
             if (IsGetUpdateInfoRunning)
             {
-                _getUpdateInfoThread.Abort();
-            }
+                _getUpdateInfoCancelToken.Cancel();
+                _getUpdateInfoCancelToken.Dispose();
+                _getUpdateInfoCancelToken = null;
 
-            _getUpdateInfoThread = new Thread(GetUpdateInfo);
-            _getUpdateInfoThread.SetApartmentState(ApartmentState.STA);
-            _getUpdateInfoThread.IsBackground = true;
-            _getUpdateInfoThread.Start();
-        }
-
-        public void GetChangeLogAsync()
-        {
-            if (CurrentUpdateInfo == null || !CurrentUpdateInfo.IsValid)
-            {
-                throw new InvalidOperationException(
-                                                    "CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync().");
-            }
-
-            if (IsGetChangeLogRunning)
-            {
-                _getChangeLogThread.Abort();
-            }
-
-            _getChangeLogThread = new Thread(GetChangeLog);
-            _getChangeLogThread.SetApartmentState(ApartmentState.STA);
-            _getChangeLogThread.IsBackground = true;
-            _getChangeLogThread.Start();
-        }
-
-        public void DownloadUpdateAsync()
-        {
-            if (_downloadUpdateWebClient != 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().");
+                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"));
+            CurrentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName(), "msi"));
 #else
             var sfd = new SaveFileDialog
             {
@@ -160,135 +132,38 @@ namespace mRemoteNG.App.Update
                 return;
             }
 #endif
-            DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress,
-                                                      CurrentUpdateInfo.UpdateFilePath);
-        }
-
-        #endregion
-
-        #region Private Properties
-
-        private WebClient _downloadUpdateWebClient;
-
-        private WebClient DownloadUpdateWebClient
-        {
-            get
-            {
-                if (_downloadUpdateWebClient != null)
-                {
-                    return _downloadUpdateWebClient;
-                }
-
-                _downloadUpdateWebClient = CreateWebClient();
-
-                _downloadUpdateWebClient.DownloadProgressChanged += DownloadUpdateProgressChanged;
-                _downloadUpdateWebClient.DownloadFileCompleted += DownloadUpdateCompleted;
-
-                return _downloadUpdateWebClient;
-            }
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private WebClient CreateWebClient()
-        {
-            var webClient = new WebClient();
-            webClient.Headers.Add("user-agent", GeneralAppInfo.UserAgent);
-            webClient.Proxy = _webProxy;
-            return webClient;
-        }
-
-        private static DownloadStringCompletedEventArgs NewDownloadStringCompletedEventArgs(string result,
-                                                                                            Exception exception,
-                                                                                            bool cancelled,
-                                                                                            object userToken)
-        {
-            var type = typeof(DownloadStringCompletedEventArgs);
-            const BindingFlags bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance;
-            Type[] argumentTypes = {typeof(string), typeof(Exception), typeof(bool), typeof(object)};
-            var constructor = type.GetConstructor(bindingFlags, null, argumentTypes, null);
-            object[] arguments = {result, exception, cancelled, userToken};
-
-            if (constructor == null)
-                return null;
-            return (DownloadStringCompletedEventArgs)constructor.Invoke(arguments);
-        }
-
-        private DownloadStringCompletedEventArgs DownloadString(Uri address)
-        {
-            var webClient = CreateWebClient();
-            var result = string.Empty;
-            Exception exception = null;
-            var cancelled = false;
-
             try
             {
-                result = webClient.DownloadString(address);
-            }
-            catch (ThreadAbortException)
-            {
-                cancelled = true;
-            }
-            catch (Exception ex)
-            {
-                exception = ex;
-            }
+                _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;
 
-            return NewDownloadStringCompletedEventArgs(result, exception, cancelled, null);
-        }
-
-        private void GetUpdateInfo()
-        {
-            var e = DownloadString(UpdateChannelInfo.GetUpdateChannelInfo());
-
-            if (!e.Cancelled && e.Error == null)
-            {
-                try
+                await using (var httpStream = await response.Content.ReadAsStreamAsync(_getUpdateInfoCancelToken.Token))
                 {
-                    CurrentUpdateInfo = UpdateInfo.FromString(e.Result);
+                    await using var fileStream = new FileStream(CurrentUpdateInfo.UpdateFilePath, FileMode.Create,
+                        FileAccess.Write, FileShare.None, _bufferLength, true);
 
-                    Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
-                    if (!Settings.Default.UpdatePending)
+                    while (readBytes <= totalBytes || !_getUpdateInfoCancelToken.IsCancellationRequested)
                     {
-                        Settings.Default.UpdatePending = IsUpdateAvailable();
+                        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);
                     }
                 }
-                catch (Exception ex)
-                {
-                    e = NewDownloadStringCompletedEventArgs(e.Result, ex, e.Cancelled, null);
-                }
-            }
 
-            GetUpdateInfoCompletedEventEvent?.Invoke(this, e);
-        }
-
-        private void GetChangeLog()
-        {
-            var e = DownloadString(CurrentUpdateInfo.ChangeLogAddress);
-
-            if (!e.Cancelled && e.Error == null)
-            {
-                ChangeLog = e.Result;
-            }
-
-            GetChangeLogCompletedEventEvent?.Invoke(this, e);
-        }
-
-        private void DownloadUpdateProgressChanged(object sender, DownloadProgressChangedEventArgs e)
-        {
-            DownloadUpdateProgressChangedEventEvent?.Invoke(sender, e);
-        }
-
-        private void DownloadUpdateCompleted(object sender, AsyncCompletedEventArgs e)
-        {
-            var raiseEventArgs = e;
-
-            if (!e.Cancelled && e.Error == null)
-            {
-                try
-                {
 #if !PORTABLE
                     var updateAuthenticode = new Authenticode(CurrentUpdateInfo.UpdateFilePath)
                     {
@@ -307,101 +182,85 @@ namespace mRemoteNG.App.Update
                     }
 #endif
 
-                    using (var cksum = SHA512.Create())
-                    {
-                        using (var stream = File.OpenRead(CurrentUpdateInfo.UpdateFilePath))
-                        {
-                            var hash = cksum.ComputeHash(stream);
-                            var hashString = BitConverter.ToString(hash).Replace("-", "").ToUpperInvariant();
-                            if (!hashString.Equals(CurrentUpdateInfo.Checksum))
-                                throw new Exception("SHA512 Hashes didn't match!");
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    raiseEventArgs = new AsyncCompletedEventArgs(ex, false, null);
-                }
+                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;
             }
-
-            if (raiseEventArgs.Cancelled || raiseEventArgs.Error != null)
-            {
-                File.Delete(CurrentUpdateInfo.UpdateFilePath);
-            }
-
-            DownloadUpdateCompletedEventEvent?.Invoke(this, raiseEventArgs);
-
-            _downloadUpdateWebClient.Dispose();
-            _downloadUpdateWebClient = null;
         }
 
         #endregion
 
-        #region Events
+        #region Private Methods
 
-        private AsyncCompletedEventHandler GetUpdateInfoCompletedEventEvent;
-
-        public event AsyncCompletedEventHandler GetUpdateInfoCompletedEvent
+        private void UpdateHttpClient()
         {
-            add
+            if (_httpClient != null)
             {
-                GetUpdateInfoCompletedEventEvent =
-                    (AsyncCompletedEventHandler)Delegate.Combine(GetUpdateInfoCompletedEventEvent, value);
+                _httpClient.Dispose();
             }
-            remove
+
+            var httpClientHandler = new HttpClientHandler();
+            if (_webProxy != null)
             {
-                GetUpdateInfoCompletedEventEvent =
-                    (AsyncCompletedEventHandler)Delegate.Remove(GetUpdateInfoCompletedEventEvent, value);
+                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;
             }
         }
 
-        private AsyncCompletedEventHandler GetChangeLogCompletedEventEvent;
-
-        public event AsyncCompletedEventHandler GetChangeLogCompletedEvent
+        public async Task<string> GetChangeLogAsync()
         {
-            add
+            if (IsGetChangeLogRunning)
             {
-                GetChangeLogCompletedEventEvent =
-                    (AsyncCompletedEventHandler)Delegate.Combine(GetChangeLogCompletedEventEvent, value);
+                _changeLogCancelToken.Cancel();
+                _changeLogCancelToken.Dispose();
+                _changeLogCancelToken = null;
             }
-            remove
-            {
-                GetChangeLogCompletedEventEvent =
-                    (AsyncCompletedEventHandler)Delegate.Remove(GetChangeLogCompletedEventEvent, value);
-            }
-        }
 
-        private DownloadProgressChangedEventHandler DownloadUpdateProgressChangedEventEvent;
-
-        public event DownloadProgressChangedEventHandler DownloadUpdateProgressChangedEvent
-        {
-            add
+            try
             {
-                DownloadUpdateProgressChangedEventEvent =
-                    (DownloadProgressChangedEventHandler)Delegate.Combine(DownloadUpdateProgressChangedEventEvent,
-                                                                          value);
+                _changeLogCancelToken = new CancellationTokenSource();
+                return await _httpClient.GetStringAsync(CurrentUpdateInfo.ChangeLogAddress, _changeLogCancelToken.Token);
             }
-            remove
+            finally
             {
-                DownloadUpdateProgressChangedEventEvent =
-                    (DownloadProgressChangedEventHandler)Delegate.Remove(DownloadUpdateProgressChangedEventEvent,
-                                                                         value);
-            }
-        }
-
-        private AsyncCompletedEventHandler DownloadUpdateCompletedEventEvent;
-
-        public event AsyncCompletedEventHandler DownloadUpdateCompletedEvent
-        {
-            add
-            {
-                DownloadUpdateCompletedEventEvent =
-                    (AsyncCompletedEventHandler)Delegate.Combine(DownloadUpdateCompletedEventEvent, value);
-            }
-            remove
-            {
-                DownloadUpdateCompletedEventEvent =
-                    (AsyncCompletedEventHandler)Delegate.Remove(DownloadUpdateCompletedEventEvent, value);
+                _changeLogCancelToken?.Dispose();
+                _changeLogCancelToken = null;
             }
         }
 

mRemoteNG/Config/Connections/ConnectionsBackupFrequencyEnum.cs

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

mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs

@@ -8,7 +8,7 @@ namespace mRemoteNG.Config.Connections.Multiuser
 {
     public class RemoteConnectionsSyncronizer : IConnectionsUpdateChecker
     {
-        private readonly Timer _updateTimer;
+        private readonly System.Timers.Timer _updateTimer;
         private readonly IConnectionsUpdateChecker _updateChecker;
 
         public double TimerIntervalInMilliseconds
@@ -19,7 +19,7 @@ namespace mRemoteNG.Config.Connections.Multiuser
         public RemoteConnectionsSyncronizer(IConnectionsUpdateChecker updateChecker)
         {
             _updateChecker = updateChecker;
-            _updateTimer = new Timer(3000);
+            _updateTimer = new System.Timers.Timer(3000);
             SetEventListeners();
         }
 

mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs

@@ -3,6 +3,7 @@ using System.Collections.Specialized;
 using System.ComponentModel;
 using mRemoteNG.Connection;
 using mRemoteNG.UI.Forms;
+using mRemoteNG.Properties;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -48,12 +49,14 @@ namespace mRemoteNG.Config.Connections
 
         private void SaveConnectionOnEdit(string propertyName = "")
         {
-            if (!Properties.Settings.Default.SaveConnectionsAfterEveryEdit)
-                return;
-            if (FrmMain.Default.IsClosing)
-                return;
+            //OBSOLETE: mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit is obsolete and should be removed in a future release
+            if (mRemoteNG.Properties.Settings.Default.SaveConnectionsAfterEveryEdit || (mRemoteNG.Properties.Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnEdit))
+            {
+                if (FrmMain.Default.IsClosing)
+                    return;
 
-            _connectionsService.SaveConnectionsAsync(propertyName);
+                _connectionsService.SaveConnectionsAsync(propertyName);
+            }
         }
     }
 }

mRemoteNG/Config/Connections/SqlConnectionsSaver.cs

@@ -17,6 +17,7 @@ using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -139,9 +140,9 @@ namespace mRemoteNG.Config.Connections
             {
                 dbQuery =
                     databaseConnector.DbCommand(
-                        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES(\'" +
-                        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "\', 0, \'" + strProtected + "\'," +
-                        ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) + ")");
+                        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES('" +
+                        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "', 0, '" + strProtected + "','" +
+                        ConnectionsFileInfo.ConnectionFileVersion.ToString() + "')");
                 dbQuery.ExecuteNonQuery();
             }
             else
@@ -171,7 +172,7 @@ namespace mRemoteNG.Config.Connections
         {
             var dbQuery = databaseConnector.DbCommand("DELETE FROM tblUpdate");
             dbQuery.ExecuteNonQuery();
-            dbQuery = databaseConnector.DbCommand("INSERT INTO tblUpdate (LastUpdate) VALUES(\'" + MiscTools.DBDate(DateTime.Now) + "\')");
+            dbQuery = databaseConnector.DbCommand("INSERT INTO tblUpdate (LastUpdate) VALUES('" + MiscTools.DBDate(DateTime.Now) + "')");
             dbQuery.ExecuteNonQuery();
         }
 

mRemoteNG/Config/DataProviders/FileBackupCreator.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Config.DataProviders
 {

mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs

@@ -101,6 +101,10 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
                 ? connectionCsv[headers.IndexOf("Panel")]
                 : "";
 
+            connectionRecord.Username = headers.Contains("UserViaAPI")
+                ? connectionCsv[headers.IndexOf("UserViaAPI")]
+                : "";
+
             connectionRecord.Username = headers.Contains("Username")
                 ? connectionCsv[headers.IndexOf("Username")]
                 : "";
@@ -136,6 +140,10 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
                 ? connectionCsv[headers.IndexOf("LoadBalanceInfo")]
                 : "";
 
+            connectionRecord.OpeningCommand = headers.Contains("OpeningCommand")
+                ? connectionCsv[headers.IndexOf("OpeningCommand")]
+                : "";
+
             connectionRecord.PreExtApp = headers.Contains("PreExtApp")
                 ? connectionCsv[headers.IndexOf("PreExtApp")]
                 : "";
@@ -186,6 +194,14 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
                 ? connectionCsv[headers.IndexOf("RDGatewayHostname")]
                 : "";
 
+            connectionRecord.RDPStartProgram = headers.Contains("RDPStartProgram")
+                ? connectionCsv[headers.IndexOf("RDPStartProgram")]
+                : "";
+
+            connectionRecord.RDPStartProgramWorkDir = headers.Contains("RDPStartProgramWorkDir")
+                ? connectionCsv[headers.IndexOf("RDPStartProgramWorkDir")]
+                : "";
+
             if (headers.Contains("Protocol"))
             {
                 if (Enum.TryParse(connectionCsv[headers.IndexOf("Protocol")], out ProtocolType protocolType))
@@ -536,6 +552,12 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
                     connectionRecord.Inheritance.SSHTunnelConnectionName = value;
             }
 
+            if (headers.Contains("InheritOpeningCommand"))
+            {
+                if (bool.TryParse(connectionCsv[headers.IndexOf("InheritOpeningCommand")], out bool value))
+                    connectionRecord.Inheritance.OpeningCommand = value;
+            }
+
             if (headers.Contains("InheritSSHOptions"))
             {
                 if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSSHOptions")], out bool value))
@@ -632,6 +654,12 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
                     connectionRecord.Inheritance.RenderingEngine = value;
             }
 
+            if (headers.Contains("InheritUserViaAPI"))
+            {
+                if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUserViaAPI")], out bool value))
+                    connectionRecord.Inheritance.UserViaAPI = value;
+            }
+
             if (headers.Contains("InheritUsername"))
             {
                 if (bool.TryParse(connectionCsv[headers.IndexOf("InheritUsername")], out bool value))
@@ -656,6 +684,12 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
                     connectionRecord.Inheritance.LoadBalanceInfo = value;
             }
 
+            if (headers.Contains("InheritOpeningCommand"))
+            {
+                if (bool.TryParse(connectionCsv[headers.IndexOf("InheritOpeningCommand")], out bool value))
+                    connectionRecord.Inheritance.OpeningCommand = value;
+            }
+
             if (headers.Contains("InheritPreExtApp"))
             {
                 if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPreExtApp")], out bool value))

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

@@ -1,255 +1,263 @@
-using System;
-using System.Linq;
-using System.Text;
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
-using mRemoteNG.Credential;
-using mRemoteNG.Security;
-using mRemoteNG.Tools;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-
-namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
-{
-    public class CsvConnectionsSerializerMremotengFormat : ISerializer<ConnectionInfo, string>
-    {
-        private readonly SaveFilter _saveFilter;
-        private readonly ICredentialRepositoryList _credentialRepositoryList;
-
-        public Version Version { get; } = new Version(2, 7);
-
-        public CsvConnectionsSerializerMremotengFormat(SaveFilter saveFilter,
-                                                       ICredentialRepositoryList credentialRepositoryList)
-        {
-            saveFilter.ThrowIfNull(nameof(saveFilter));
-            credentialRepositoryList.ThrowIfNull(nameof(credentialRepositoryList));
-
-            _saveFilter = saveFilter;
-            _credentialRepositoryList = credentialRepositoryList;
-        }
-
-        public string Serialize(ConnectionTreeModel connectionTreeModel)
-        {
-            connectionTreeModel.ThrowIfNull(nameof(connectionTreeModel));
-
-            var rootNode = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
-            return Serialize(rootNode);
-        }
-
-        public string Serialize(ConnectionInfo serializationTarget)
-        {
-            serializationTarget.ThrowIfNull(nameof(serializationTarget));
-            var sb = new StringBuilder();
-
-            WriteCsvHeader(sb);
-            SerializeNodesRecursive(serializationTarget, sb);
-            return sb.ToString();
-        }
-
-        private void WriteCsvHeader(StringBuilder sb)
-        {
-            sb.Append("Name;Id;Parent;NodeType;Description;Icon;Panel;");
-            if (_saveFilter.SaveUsername)
-                sb.Append("Username;");
-            if (_saveFilter.SavePassword)
-                sb.Append("Password;");
-            if (_saveFilter.SaveDomain)
-                sb.Append("Domain;");
-
-            sb.Append("Hostname;Port;VmId;Protocol;SSHTunnelConnectionName;SSHOptions;PuttySession;ConnectToConsole;UseCredSsp;UseVmId;UseEnhancedMode;RenderingEngine;RDPAuthenticationLevel;" +
-                      "LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;DisableFullWindowDrag;DisableMenuAnimations;DisableCursorShadow;DisableCursorBlinking;" +
-                      "CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;RedirectSmartCards;RedirectSound;RedirectKeys;" +
-                      "PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;Favorite;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;" +
-                      "VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;" +
-                      "RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;RedirectAudioCapture;RdpVersion;");
-
-            if (_saveFilter.SaveInheritance)
-                sb.Append("InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;" +
-                          "InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDisableFullWindowDrag;InheritDisableMenuAnimations;InheritDisableCursorShadow;InheritDisableCursorBlinking;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;" +
-                          "InheritProtocol;InheritSSHTunnelConnectionName;InheritSSHOptions;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;" +
-                          "InheritRedirectClipboard;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;" +
-                          "InheritUseConsoleSession;InheritUseCredSsp;InheritUseVmId;InheritUseEnhancedMode;InheritVmId;InheritRenderingEngine;InheritUsername;" +
-                          "InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;" +
-                          "InheritFavorite;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;" +
-                          "InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;" +
-                          "InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;" +
-                          "InheritRDGatewayPassword;InheritRDGatewayDomain;InheritRDPAlertIdleTimeout;InheritRDPMinutesToIdleTimeout;InheritSoundQuality;" +
-                          "InheritRedirectAudioCapture;InheritRdpVersion");
-        }
-
-        private void SerializeNodesRecursive(ConnectionInfo node, StringBuilder sb)
-        {
-            var nodeAsContainer = node as ContainerInfo;
-            if (nodeAsContainer != null)
-            {
-                foreach (var child in nodeAsContainer.Children)
-                {
-                    SerializeNodesRecursive(child, sb);
-                }
-            }
-
-            // dont serialize the root node
-            if (node is RootNodeInfo)
-                return;
-
-            SerializeConnectionInfo(node, sb);
-        }
-
-        private void SerializeConnectionInfo(ConnectionInfo con, StringBuilder sb)
-        {
-            sb.AppendLine();
-            sb.Append(FormatForCsv(con.Name))
-              .Append(FormatForCsv(con.ConstantID))
-              .Append(FormatForCsv(con.Parent?.ConstantID ?? ""))
-              .Append(FormatForCsv(con.GetTreeNodeType()))
-              .Append(FormatForCsv(con.Description))
-              .Append(FormatForCsv(con.Icon))
-              .Append(FormatForCsv(con.Panel));
-
-            if (_saveFilter.SaveUsername)
-                sb.Append(FormatForCsv(con.Username));
-
-            if (_saveFilter.SavePassword)
-                sb.Append(FormatForCsv(con.Password));
-
-            if (_saveFilter.SaveDomain)
-                sb.Append(FormatForCsv(con.Domain));
-
-            sb.Append(FormatForCsv(con.Hostname))
-              .Append(FormatForCsv(con.Port))
-              .Append(FormatForCsv(con.VmId))
-              .Append(FormatForCsv(con.Protocol))
-              .Append(FormatForCsv(con.SSHTunnelConnectionName))
-              .Append(FormatForCsv(con.SSHOptions))
-              .Append(FormatForCsv(con.PuttySession))
-              .Append(FormatForCsv(con.UseConsoleSession))
-              .Append(FormatForCsv(con.UseCredSsp))
-              .Append(FormatForCsv(con.UseVmId))
-              .Append(FormatForCsv(con.UseEnhancedMode))
-              .Append(FormatForCsv(con.RenderingEngine))
-              .Append(FormatForCsv(con.RDPAuthenticationLevel))
-              .Append(FormatForCsv(con.LoadBalanceInfo))
-              .Append(FormatForCsv(con.Colors))
-              .Append(FormatForCsv(con.Resolution))
-              .Append(FormatForCsv(con.AutomaticResize))
-              .Append(FormatForCsv(con.DisplayWallpaper))
-              .Append(FormatForCsv(con.DisplayThemes))
-              .Append(FormatForCsv(con.EnableFontSmoothing))
-              .Append(FormatForCsv(con.EnableDesktopComposition))
-              .Append(FormatForCsv(con.DisableFullWindowDrag))
-              .Append(FormatForCsv(con.DisableMenuAnimations))
-              .Append(FormatForCsv(con.DisableCursorShadow))
-              .Append(FormatForCsv(con.DisableCursorBlinking))
-              .Append(FormatForCsv(con.CacheBitmaps))
-              .Append(FormatForCsv(con.RedirectDiskDrives))
-              .Append(FormatForCsv(con.RedirectPorts))
-              .Append(FormatForCsv(con.RedirectPrinters))
-              .Append(FormatForCsv(con.RedirectClipboard))
-              .Append(FormatForCsv(con.RedirectSmartCards))
-              .Append(FormatForCsv(con.RedirectSound))
-              .Append(FormatForCsv(con.RedirectKeys))
-              .Append(FormatForCsv(con.PreExtApp))
-              .Append(FormatForCsv(con.PostExtApp))
-              .Append(FormatForCsv(con.MacAddress))
-              .Append(FormatForCsv(con.UserField))
-              .Append(FormatForCsv(con.ExtApp))
-              .Append(FormatForCsv(con.Favorite))
-              .Append(FormatForCsv(con.VNCCompression))
-              .Append(FormatForCsv(con.VNCEncoding))
-              .Append(FormatForCsv(con.VNCAuthMode))
-              .Append(FormatForCsv(con.VNCProxyType))
-              .Append(FormatForCsv(con.VNCProxyIP))
-              .Append(FormatForCsv(con.VNCProxyPort))
-              .Append(FormatForCsv(con.VNCProxyUsername))
-              .Append(FormatForCsv(con.VNCProxyPassword))
-              .Append(FormatForCsv(con.VNCColors))
-              .Append(FormatForCsv(con.VNCSmartSizeMode))
-              .Append(FormatForCsv(con.VNCViewOnly))
-              .Append(FormatForCsv(con.RDGatewayUsageMethod))
-              .Append(FormatForCsv(con.RDGatewayHostname))
-              .Append(FormatForCsv(con.RDGatewayUseConnectionCredentials))
-              .Append(FormatForCsv(con.RDGatewayUsername))
-              .Append(FormatForCsv(con.RDGatewayPassword))
-              .Append(FormatForCsv(con.RDGatewayDomain))
-              .Append(FormatForCsv(con.RedirectAudioCapture))
-              .Append(FormatForCsv(con.RdpVersion));
-
-
-            if (!_saveFilter.SaveInheritance)
-                return;
-
-            sb.Append(FormatForCsv(con.Inheritance.CacheBitmaps))
-              .Append(FormatForCsv(con.Inheritance.Colors))
-              .Append(FormatForCsv(con.Inheritance.Description))
-              .Append(FormatForCsv(con.Inheritance.DisplayThemes))
-              .Append(FormatForCsv(con.Inheritance.DisplayWallpaper))
-              .Append(FormatForCsv(con.Inheritance.EnableFontSmoothing))
-              .Append(FormatForCsv(con.Inheritance.EnableDesktopComposition))
-              .Append(FormatForCsv(con.Inheritance.DisableFullWindowDrag))
-              .Append(FormatForCsv(con.Inheritance.DisableMenuAnimations))
-              .Append(FormatForCsv(con.Inheritance.DisableCursorShadow))
-              .Append(FormatForCsv(con.Inheritance.DisableCursorBlinking))
-              .Append(FormatForCsv(con.Inheritance.Domain))
-              .Append(FormatForCsv(con.Inheritance.Icon))
-              .Append(FormatForCsv(con.Inheritance.Panel))
-              .Append(FormatForCsv(con.Inheritance.Password))
-              .Append(FormatForCsv(con.Inheritance.Port))
-              .Append(FormatForCsv(con.Inheritance.Protocol))
-              .Append(FormatForCsv(con.Inheritance.SSHTunnelConnectionName))
-              .Append(FormatForCsv(con.Inheritance.SSHOptions))
-              .Append(FormatForCsv(con.Inheritance.PuttySession))
-              .Append(FormatForCsv(con.Inheritance.RedirectDiskDrives))
-              .Append(FormatForCsv(con.Inheritance.RedirectKeys))
-              .Append(FormatForCsv(con.Inheritance.RedirectPorts))
-              .Append(FormatForCsv(con.Inheritance.RedirectPrinters))
-              .Append(FormatForCsv(con.Inheritance.RedirectClipboard))
-              .Append(FormatForCsv(con.Inheritance.RedirectSmartCards))
-              .Append(FormatForCsv(con.Inheritance.RedirectSound))
-              .Append(FormatForCsv(con.Inheritance.Resolution))
-              .Append(FormatForCsv(con.Inheritance.AutomaticResize))
-              .Append(FormatForCsv(con.Inheritance.UseConsoleSession))
-              .Append(FormatForCsv(con.Inheritance.UseCredSsp))
-              .Append(FormatForCsv(con.Inheritance.UseVmId))
-              .Append(FormatForCsv(con.Inheritance.UseEnhancedMode))
-              .Append(FormatForCsv(con.Inheritance.VmId))
-              .Append(FormatForCsv(con.Inheritance.RenderingEngine))
-              .Append(FormatForCsv(con.Inheritance.Username))
-              .Append(FormatForCsv(con.Inheritance.RDPAuthenticationLevel))
-              .Append(FormatForCsv(con.Inheritance.LoadBalanceInfo))
-              .Append(FormatForCsv(con.Inheritance.PreExtApp))
-              .Append(FormatForCsv(con.Inheritance.PostExtApp))
-              .Append(FormatForCsv(con.Inheritance.MacAddress))
-              .Append(FormatForCsv(con.Inheritance.UserField))
-              .Append(FormatForCsv(con.Inheritance.Favorite))
-              .Append(FormatForCsv(con.Inheritance.ExtApp))
-              .Append(FormatForCsv(con.Inheritance.VNCCompression))
-              .Append(FormatForCsv(con.Inheritance.VNCEncoding))
-              .Append(FormatForCsv(con.Inheritance.VNCAuthMode))
-              .Append(FormatForCsv(con.Inheritance.VNCProxyType))
-              .Append(FormatForCsv(con.Inheritance.VNCProxyIP))
-              .Append(FormatForCsv(con.Inheritance.VNCProxyPort))
-              .Append(FormatForCsv(con.Inheritance.VNCProxyUsername))
-              .Append(FormatForCsv(con.Inheritance.VNCProxyPassword))
-              .Append(FormatForCsv(con.Inheritance.VNCColors))
-              .Append(FormatForCsv(con.Inheritance.VNCSmartSizeMode))
-              .Append(FormatForCsv(con.Inheritance.VNCViewOnly))
-              .Append(FormatForCsv(con.Inheritance.RDGatewayUsageMethod))
-              .Append(FormatForCsv(con.Inheritance.RDGatewayHostname))
-              .Append(FormatForCsv(con.Inheritance.RDGatewayUseConnectionCredentials))
-              .Append(FormatForCsv(con.Inheritance.RDGatewayUsername))
-              .Append(FormatForCsv(con.Inheritance.RDGatewayPassword))
-              .Append(FormatForCsv(con.Inheritance.RDGatewayDomain))
-              .Append(FormatForCsv(con.Inheritance.RDPAlertIdleTimeout))
-              .Append(FormatForCsv(con.Inheritance.RDPMinutesToIdleTimeout))
-              .Append(FormatForCsv(con.Inheritance.SoundQuality))
-              .Append(FormatForCsv(con.Inheritance.RedirectAudioCapture))
-              .Append(FormatForCsv(con.Inheritance.RdpVersion));
-        }
-
-        private string FormatForCsv(object value)
-        {
-            var cleanedString = value.ToString().Replace(";", "");
-            return cleanedString + ";";
-        }
-    }
+using System;
+using System.Linq;
+using System.Text;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Credential;
+using mRemoteNG.Security;
+using mRemoteNG.Tools;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv
+{
+    public class CsvConnectionsSerializerMremotengFormat : ISerializer<ConnectionInfo, string>
+    {
+        private readonly SaveFilter _saveFilter;
+        private readonly ICredentialRepositoryList _credentialRepositoryList;
+
+        public Version Version { get; } = new Version(2, 7);
+
+        public CsvConnectionsSerializerMremotengFormat(SaveFilter saveFilter,
+                                                       ICredentialRepositoryList credentialRepositoryList)
+        {
+            saveFilter.ThrowIfNull(nameof(saveFilter));
+            credentialRepositoryList.ThrowIfNull(nameof(credentialRepositoryList));
+
+            _saveFilter = saveFilter;
+            _credentialRepositoryList = credentialRepositoryList;
+        }
+
+        public string Serialize(ConnectionTreeModel connectionTreeModel)
+        {
+            connectionTreeModel.ThrowIfNull(nameof(connectionTreeModel));
+
+            var rootNode = connectionTreeModel.RootNodes.First(node => node is RootNodeInfo);
+            return Serialize(rootNode);
+        }
+
+        public string Serialize(ConnectionInfo serializationTarget)
+        {
+            serializationTarget.ThrowIfNull(nameof(serializationTarget));
+            var sb = new StringBuilder();
+
+            WriteCsvHeader(sb);
+            SerializeNodesRecursive(serializationTarget, sb);
+            return sb.ToString();
+        }
+
+        private void WriteCsvHeader(StringBuilder sb)
+        {
+            sb.Append("Name;Id;Parent;NodeType;Description;Icon;Panel;");
+            if (_saveFilter.SaveUsername)
+                sb.Append("Username;");
+            if (_saveFilter.SavePassword)
+                sb.Append("Password;");
+            if (_saveFilter.SaveDomain)
+                sb.Append("Domain;");
+
+            sb.Append("Hostname;Port;VmId;Protocol;SSHTunnelConnectionName;OpeningCommand;SSHOptions;PuttySession;ConnectToConsole;UseCredSsp;UseVmId;UseEnhancedMode;RenderingEngine;RDPAuthenticationLevel;" +
+                      "LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;DisableFullWindowDrag;DisableMenuAnimations;DisableCursorShadow;DisableCursorBlinking;" +
+                      "CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;RedirectSmartCards;RedirectSound;RedirectKeys;" +
+                      "PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;Favorite;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;" +
+                      "VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;" +
+                      "RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;RedirectAudioCapture;RdpVersion;RDPStartProgram;RDPStartProgramWorkDir;UserViaAPI;EC2InstanceId;EC2Region;");
+
+            if (_saveFilter.SaveInheritance)
+                sb.Append("InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;" +
+                          "InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDisableFullWindowDrag;InheritDisableMenuAnimations;InheritDisableCursorShadow;InheritDisableCursorBlinking;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;" +
+                          "InheritProtocol;InheritSSHTunnelConnectionName;InheritOpeningCommand;InheritSSHOptions;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;" +
+                          "InheritRedirectClipboard;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritAutomaticResize;" +
+                          "InheritUseConsoleSession;InheritUseCredSsp;InheritUseVmId;InheritUseEnhancedMode;InheritVmId;InheritRenderingEngine;InheritUsername;" +
+                          "InheritRDPAuthenticationLevel;InheritLoadBalanceInfo;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;" +
+                          "InheritFavorite;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;" +
+                          "InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;" +
+                          "InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;" +
+                          "InheritRDGatewayPassword;InheritRDGatewayDomain;InheritRDPAlertIdleTimeout;InheritRDPMinutesToIdleTimeout;InheritSoundQuality;InheritUserViaAPI;" +
+                          "InheritRedirectAudioCapture;InheritRdpVersion");
+        }
+
+        private void SerializeNodesRecursive(ConnectionInfo node, StringBuilder sb)
+        {
+            var nodeAsContainer = node as ContainerInfo;
+            if (nodeAsContainer != null)
+            {
+                foreach (var child in nodeAsContainer.Children)
+                {
+                    SerializeNodesRecursive(child, sb);
+                }
+            }
+
+            // dont serialize the root node
+            if (node is RootNodeInfo)
+                return;
+
+            SerializeConnectionInfo(node, sb);
+        }
+
+        private void SerializeConnectionInfo(ConnectionInfo con, StringBuilder sb)
+        {
+            sb.AppendLine();
+            sb.Append(FormatForCsv(con.Name))
+              .Append(FormatForCsv(con.ConstantID))
+              .Append(FormatForCsv(con.Parent?.ConstantID ?? ""))
+              .Append(FormatForCsv(con.GetTreeNodeType()))
+              .Append(FormatForCsv(con.Description))
+              .Append(FormatForCsv(con.Icon))
+              .Append(FormatForCsv(con.Panel));
+
+            if (_saveFilter.SaveUsername)
+                sb.Append(FormatForCsv(con.Username));
+
+            if (_saveFilter.SavePassword)
+                sb.Append(FormatForCsv(con.Password));
+
+            if (_saveFilter.SaveDomain)
+                sb.Append(FormatForCsv(con.Domain));
+
+            sb.Append(FormatForCsv(con.Hostname))
+              .Append(FormatForCsv(con.Port))
+              .Append(FormatForCsv(con.VmId))
+              .Append(FormatForCsv(con.Protocol))
+              .Append(FormatForCsv(con.SSHTunnelConnectionName))
+              .Append(FormatForCsv(con.OpeningCommand))
+              .Append(FormatForCsv(con.SSHOptions))
+              .Append(FormatForCsv(con.PuttySession))
+              .Append(FormatForCsv(con.UseConsoleSession))
+              .Append(FormatForCsv(con.UseCredSsp))
+              .Append(FormatForCsv(con.UseVmId))
+              .Append(FormatForCsv(con.UseEnhancedMode))
+              .Append(FormatForCsv(con.RenderingEngine))
+              .Append(FormatForCsv(con.RDPAuthenticationLevel))
+              .Append(FormatForCsv(con.LoadBalanceInfo))
+              .Append(FormatForCsv(con.Colors))
+              .Append(FormatForCsv(con.Resolution))
+              .Append(FormatForCsv(con.AutomaticResize))
+              .Append(FormatForCsv(con.DisplayWallpaper))
+              .Append(FormatForCsv(con.DisplayThemes))
+              .Append(FormatForCsv(con.EnableFontSmoothing))
+              .Append(FormatForCsv(con.EnableDesktopComposition))
+              .Append(FormatForCsv(con.DisableFullWindowDrag))
+              .Append(FormatForCsv(con.DisableMenuAnimations))
+              .Append(FormatForCsv(con.DisableCursorShadow))
+              .Append(FormatForCsv(con.DisableCursorBlinking))
+              .Append(FormatForCsv(con.CacheBitmaps))
+              .Append(FormatForCsv(con.RedirectDiskDrives))
+              .Append(FormatForCsv(con.RedirectPorts))
+              .Append(FormatForCsv(con.RedirectPrinters))
+              .Append(FormatForCsv(con.RedirectClipboard))
+              .Append(FormatForCsv(con.RedirectSmartCards))
+              .Append(FormatForCsv(con.RedirectSound))
+              .Append(FormatForCsv(con.RedirectKeys))
+              .Append(FormatForCsv(con.PreExtApp))
+              .Append(FormatForCsv(con.PostExtApp))
+              .Append(FormatForCsv(con.MacAddress))
+              .Append(FormatForCsv(con.UserField))
+              .Append(FormatForCsv(con.ExtApp))
+              .Append(FormatForCsv(con.Favorite))
+              .Append(FormatForCsv(con.VNCCompression))
+              .Append(FormatForCsv(con.VNCEncoding))
+              .Append(FormatForCsv(con.VNCAuthMode))
+              .Append(FormatForCsv(con.VNCProxyType))
+              .Append(FormatForCsv(con.VNCProxyIP))
+              .Append(FormatForCsv(con.VNCProxyPort))
+              .Append(FormatForCsv(con.VNCProxyUsername))
+              .Append(FormatForCsv(con.VNCProxyPassword))
+              .Append(FormatForCsv(con.VNCColors))
+              .Append(FormatForCsv(con.VNCSmartSizeMode))
+              .Append(FormatForCsv(con.VNCViewOnly))
+              .Append(FormatForCsv(con.RDGatewayUsageMethod))
+              .Append(FormatForCsv(con.RDGatewayHostname))
+              .Append(FormatForCsv(con.RDGatewayUseConnectionCredentials))
+              .Append(FormatForCsv(con.RDGatewayUsername))
+              .Append(FormatForCsv(con.RDGatewayPassword))
+              .Append(FormatForCsv(con.RDGatewayDomain))
+              .Append(FormatForCsv(con.RedirectAudioCapture))
+              .Append(FormatForCsv(con.RdpVersion))
+              .Append(FormatForCsv(con.RDPStartProgram))
+              .Append(FormatForCsv(con.RDPStartProgramWorkDir))
+              .Append(FormatForCsv(con.UserViaAPI))
+              .Append(FormatForCsv(con.EC2InstanceId))
+              .Append(FormatForCsv(con.EC2Region));
+
+
+            if (!_saveFilter.SaveInheritance)
+                return;
+
+            sb.Append(FormatForCsv(con.Inheritance.CacheBitmaps))
+              .Append(FormatForCsv(con.Inheritance.Colors))
+              .Append(FormatForCsv(con.Inheritance.Description))
+              .Append(FormatForCsv(con.Inheritance.DisplayThemes))
+              .Append(FormatForCsv(con.Inheritance.DisplayWallpaper))
+              .Append(FormatForCsv(con.Inheritance.EnableFontSmoothing))
+              .Append(FormatForCsv(con.Inheritance.EnableDesktopComposition))
+              .Append(FormatForCsv(con.Inheritance.DisableFullWindowDrag))
+              .Append(FormatForCsv(con.Inheritance.DisableMenuAnimations))
+              .Append(FormatForCsv(con.Inheritance.DisableCursorShadow))
+              .Append(FormatForCsv(con.Inheritance.DisableCursorBlinking))
+              .Append(FormatForCsv(con.Inheritance.Domain))
+              .Append(FormatForCsv(con.Inheritance.Icon))
+              .Append(FormatForCsv(con.Inheritance.Panel))
+              .Append(FormatForCsv(con.Inheritance.Password))
+              .Append(FormatForCsv(con.Inheritance.Port))
+              .Append(FormatForCsv(con.Inheritance.Protocol))
+              .Append(FormatForCsv(con.Inheritance.SSHTunnelConnectionName))
+              .Append(FormatForCsv(con.Inheritance.OpeningCommand))
+              .Append(FormatForCsv(con.Inheritance.SSHOptions))
+              .Append(FormatForCsv(con.Inheritance.PuttySession))
+              .Append(FormatForCsv(con.Inheritance.RedirectDiskDrives))
+              .Append(FormatForCsv(con.Inheritance.RedirectKeys))
+              .Append(FormatForCsv(con.Inheritance.RedirectPorts))
+              .Append(FormatForCsv(con.Inheritance.RedirectPrinters))
+              .Append(FormatForCsv(con.Inheritance.RedirectClipboard))
+              .Append(FormatForCsv(con.Inheritance.RedirectSmartCards))
+              .Append(FormatForCsv(con.Inheritance.RedirectSound))
+              .Append(FormatForCsv(con.Inheritance.Resolution))
+              .Append(FormatForCsv(con.Inheritance.AutomaticResize))
+              .Append(FormatForCsv(con.Inheritance.UseConsoleSession))
+              .Append(FormatForCsv(con.Inheritance.UseCredSsp))
+              .Append(FormatForCsv(con.Inheritance.UseVmId))
+              .Append(FormatForCsv(con.Inheritance.UseEnhancedMode))
+              .Append(FormatForCsv(con.Inheritance.VmId))
+              .Append(FormatForCsv(con.Inheritance.RenderingEngine))
+              .Append(FormatForCsv(con.Inheritance.Username))
+              .Append(FormatForCsv(con.Inheritance.RDPAuthenticationLevel))
+              .Append(FormatForCsv(con.Inheritance.LoadBalanceInfo))
+              .Append(FormatForCsv(con.Inheritance.PreExtApp))
+              .Append(FormatForCsv(con.Inheritance.PostExtApp))
+              .Append(FormatForCsv(con.Inheritance.MacAddress))
+              .Append(FormatForCsv(con.Inheritance.UserField))
+              .Append(FormatForCsv(con.Inheritance.Favorite))
+              .Append(FormatForCsv(con.Inheritance.ExtApp))
+              .Append(FormatForCsv(con.Inheritance.VNCCompression))
+              .Append(FormatForCsv(con.Inheritance.VNCEncoding))
+              .Append(FormatForCsv(con.Inheritance.VNCAuthMode))
+              .Append(FormatForCsv(con.Inheritance.VNCProxyType))
+              .Append(FormatForCsv(con.Inheritance.VNCProxyIP))
+              .Append(FormatForCsv(con.Inheritance.VNCProxyPort))
+              .Append(FormatForCsv(con.Inheritance.VNCProxyUsername))
+              .Append(FormatForCsv(con.Inheritance.VNCProxyPassword))
+              .Append(FormatForCsv(con.Inheritance.VNCColors))
+              .Append(FormatForCsv(con.Inheritance.VNCSmartSizeMode))
+              .Append(FormatForCsv(con.Inheritance.VNCViewOnly))
+              .Append(FormatForCsv(con.Inheritance.RDGatewayUsageMethod))
+              .Append(FormatForCsv(con.Inheritance.RDGatewayHostname))
+              .Append(FormatForCsv(con.Inheritance.RDGatewayUseConnectionCredentials))
+              .Append(FormatForCsv(con.Inheritance.RDGatewayUsername))
+              .Append(FormatForCsv(con.Inheritance.RDGatewayPassword))
+              .Append(FormatForCsv(con.Inheritance.RDGatewayDomain))
+              .Append(FormatForCsv(con.Inheritance.RDPAlertIdleTimeout))
+              .Append(FormatForCsv(con.Inheritance.RDPMinutesToIdleTimeout))
+              .Append(FormatForCsv(con.Inheritance.SoundQuality))
+              .Append(FormatForCsv(con.Inheritance.RedirectAudioCapture))
+              .Append(FormatForCsv(con.Inheritance.RdpVersion))
+              .Append(FormatForCsv(con.Inheritance.UserViaAPI));
+        }
+
+        private string FormatForCsv(object value)
+        {
+            var cleanedString = value.ToString().Replace(";", "");
+            return cleanedString + ";";
+        }
+    }
 }

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs

@@ -1,278 +1,263 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Security;
-using mRemoteNG.App;
-using mRemoteNG.Connection;
-using mRemoteNG.Connection.Protocol;
-using mRemoteNG.Connection.Protocol.Http;
-using mRemoteNG.Connection.Protocol.RDP;
-using mRemoteNG.Connection.Protocol.VNC;
-using mRemoteNG.Container;
-using mRemoteNG.Security;
-using mRemoteNG.Tools;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-
-namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
-{
-    public class DataTableDeserializer : IDeserializer<DataTable, ConnectionTreeModel>
-    {
-        private readonly ICryptographyProvider _cryptographyProvider;
-        private readonly SecureString _decryptionKey;
-
-        public DataTableDeserializer(ICryptographyProvider cryptographyProvider, SecureString decryptionKey)
-        {
-            _cryptographyProvider = cryptographyProvider.ThrowIfNull(nameof(cryptographyProvider));
-            _decryptionKey = decryptionKey.ThrowIfNull(nameof(decryptionKey));
-        }
-
-        public ConnectionTreeModel Deserialize(DataTable table)
-        {
-            var connectionList = CreateNodesFromTable(table);
-            var connectionTreeModel = CreateNodeHierarchy(connectionList, table);
-            Runtime.ConnectionsService.IsConnectionsFileLoaded = true;
-            return connectionTreeModel;
-        }
-
-        private List<ConnectionInfo> CreateNodesFromTable(DataTable table)
-        {
-            var nodeList = new List<ConnectionInfo>();
-            foreach (DataRow row in table.Rows)
-            {
-                // ReSharper disable once SwitchStatementMissingSomeCases
-                switch ((string)row["Type"])
-                {
-                    case "Connection":
-                        nodeList.Add(DeserializeConnectionInfo(row));
-                        break;
-                    case "Container":
-                        nodeList.Add(DeserializeContainerInfo(row));
-                        break;
-                }
-            }
-
-            return nodeList;
-        }
-
-        private ConnectionInfo DeserializeConnectionInfo(DataRow row)
-        {
-            var connectionId = row["ConstantID"] as string ?? Guid.NewGuid().ToString();
-            var connectionInfo = new ConnectionInfo(connectionId);
-            PopulateConnectionInfoFromDatarow(row, connectionInfo);
-            return connectionInfo;
-        }
-
-        private ContainerInfo DeserializeContainerInfo(DataRow row)
-        {
-            var containerId = row["ConstantID"] as string ?? Guid.NewGuid().ToString();
-            var containerInfo = new ContainerInfo(containerId);
-            PopulateConnectionInfoFromDatarow(row, containerInfo);
-            return containerInfo;
-        }
-
-        private void PopulateConnectionInfoFromDatarow(DataRow dataRow, ConnectionInfo connectionInfo)
-        {
-            connectionInfo.Name = (string)dataRow["Name"];
-
-            // This throws a NPE - Parent is a connectionInfo object which will be null at this point.
-            // The Parent object is linked properly later in CreateNodeHierarchy()
-            //connectionInfo.Parent.ConstantID = (string)dataRow["ParentID"];
-
-            connectionInfo.Description = (string)dataRow["Description"];
-            connectionInfo.Icon = (string)dataRow["Icon"];
-            connectionInfo.Panel = (string)dataRow["Panel"];
-            connectionInfo.Username = (string)dataRow["Username"];
-            connectionInfo.Domain = (string)dataRow["Domain"];
-            connectionInfo.Password = DecryptValue((string)dataRow["Password"]);
-            connectionInfo.Hostname = (string)dataRow["Hostname"];
-            connectionInfo.VmId = (string)dataRow["VmId"];
-            connectionInfo.UseEnhancedMode = (bool)dataRow["UseEnhancedMode"];
-            connectionInfo.Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), (string)dataRow["Protocol"]);
-            connectionInfo.SSHTunnelConnectionName = (string)dataRow["SSHTunnelConnectionName"];
-            connectionInfo.SSHOptions = (string)dataRow["SSHOptions"];
-            connectionInfo.PuttySession = (string)dataRow["PuttySession"];
-            connectionInfo.Port = (int)dataRow["Port"];
-            connectionInfo.UseConsoleSession = (bool)dataRow["ConnectToConsole"];
-            connectionInfo.UseCredSsp = (bool)dataRow["UseCredSsp"];
-            connectionInfo.UseVmId = (bool)dataRow["UseVmId"];
-            connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine),
-                                                                                  (string)dataRow["RenderingEngine"]);
-            connectionInfo.RDPAuthenticationLevel =
-                (AuthenticationLevel)Enum.Parse(typeof(AuthenticationLevel),
-                                                            (string)dataRow["RDPAuthenticationLevel"]);
-            connectionInfo.RDPMinutesToIdleTimeout = (int)dataRow["RDPMinutesToIdleTimeout"];
-            connectionInfo.RDPAlertIdleTimeout = (bool)dataRow["RDPAlertIdleTimeout"];
-            connectionInfo.LoadBalanceInfo = (string)dataRow["LoadBalanceInfo"];
-            connectionInfo.Colors =
-                (RDPColors)Enum.Parse(typeof(RDPColors), (string)dataRow["Colors"]);
-            connectionInfo.Resolution =
-                (RDPResolutions)Enum.Parse(typeof(RDPResolutions),
-                                                       (string)dataRow["Resolution"]);
-            connectionInfo.AutomaticResize = (bool)dataRow["AutomaticResize"];
-            connectionInfo.DisplayWallpaper = (bool)dataRow["DisplayWallpaper"];
-            connectionInfo.DisplayThemes = (bool)dataRow["DisplayThemes"];
-            connectionInfo.EnableFontSmoothing = (bool)dataRow["EnableFontSmoothing"];
-            connectionInfo.EnableDesktopComposition = (bool)dataRow["EnableDesktopComposition"];
-            connectionInfo.DisableFullWindowDrag = (bool)dataRow["DisableFullWindowDrag"];
-            connectionInfo.DisableMenuAnimations = (bool)dataRow["DisableMenuAnimations"];
-            connectionInfo.DisableCursorShadow = (bool)dataRow["DisableCursorShadow"];
-            connectionInfo.DisableCursorBlinking = (bool)dataRow["DisableCursorBlinking"];
-            connectionInfo.CacheBitmaps = (bool)dataRow["CacheBitmaps"];
-            connectionInfo.RedirectDiskDrives = (bool)dataRow["RedirectDiskDrives"];
-            connectionInfo.RedirectPorts = (bool)dataRow["RedirectPorts"];
-            connectionInfo.RedirectPrinters = (bool)dataRow["RedirectPrinters"];
-            connectionInfo.RedirectClipboard = (bool)dataRow["RedirectClipboard"];
-            connectionInfo.RedirectSmartCards = (bool)dataRow["RedirectSmartCards"];
-            connectionInfo.RedirectSound =
-                (RDPSounds)Enum.Parse(typeof(RDPSounds), (string)dataRow["RedirectSound"]);
-            connectionInfo.SoundQuality = (RDPSoundQuality)Enum.Parse(typeof(RDPSoundQuality),
-                                                                                  (string)dataRow["SoundQuality"]);
-            connectionInfo.RedirectAudioCapture = (bool)dataRow["RedirectAudioCapture"];
-
-            connectionInfo.RedirectKeys = (bool)dataRow["RedirectKeys"];
-            connectionInfo.PreExtApp = (string)dataRow["PreExtApp"];
-            connectionInfo.PostExtApp = (string)dataRow["PostExtApp"];
-            connectionInfo.MacAddress = (string)dataRow["MacAddress"];
-            connectionInfo.UserField = (string)dataRow["UserField"];
-            connectionInfo.ExtApp = (string)dataRow["ExtApp"];
-            connectionInfo.VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression),
-                                                                                (string)dataRow["VNCCompression"]);
-            connectionInfo.VNCEncoding =
-                (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), (string)dataRow["VNCEncoding"]);
-            connectionInfo.VNCAuthMode =
-                (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), (string)dataRow["VNCAuthMode"]);
-            connectionInfo.VNCProxyType =
-                (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType), (string)dataRow["VNCProxyType"]);
-            connectionInfo.VNCProxyIP = (string)dataRow["VNCProxyIP"];
-            connectionInfo.VNCProxyPort = (int)dataRow["VNCProxyPort"];
-            connectionInfo.VNCProxyUsername = (string)dataRow["VNCProxyUsername"];
-            connectionInfo.VNCProxyPassword = DecryptValue((string)dataRow["VNCProxyPassword"]);
-            connectionInfo.VNCColors =
-                (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), (string)dataRow["VNCColors"]);
-            connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode),
-                                                                                    (string)dataRow
-                                                                                        ["VNCSmartSizeMode"]);
-            connectionInfo.VNCViewOnly = (bool)dataRow["VNCViewOnly"];
-            connectionInfo.RDGatewayUsageMethod =
-                (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod),
-                                                             (string)dataRow["RDGatewayUsageMethod"]);
-            connectionInfo.RDGatewayHostname = (string)dataRow["RDGatewayHostname"];
-            connectionInfo.RDGatewayUseConnectionCredentials =
-                (RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RDGatewayUseConnectionCredentials),
-                                                            (string)dataRow["RDGatewayUseConnectionCredentials"]);
-            connectionInfo.RDGatewayUsername = (string)dataRow["RDGatewayUsername"];
-            connectionInfo.RDGatewayPassword = DecryptValue((string)dataRow["RDGatewayPassword"]);
-            connectionInfo.RDGatewayDomain = (string)dataRow["RDGatewayDomain"];
-
-            if (!dataRow.IsNull("RdpVersion")) // table allows null values which must be handled
-                if (Enum.TryParse((string)dataRow["RdpVersion"], true, out RdpVersion rdpVersion))
-                    connectionInfo.RdpVersion = rdpVersion;
-
-            connectionInfo.Inheritance.CacheBitmaps = (bool)dataRow["InheritCacheBitmaps"];
-            connectionInfo.Inheritance.Colors = (bool)dataRow["InheritColors"];
-            connectionInfo.Inheritance.Description = (bool)dataRow["InheritDescription"];
-            connectionInfo.Inheritance.DisplayThemes = (bool)dataRow["InheritDisplayThemes"];
-            connectionInfo.Inheritance.DisplayWallpaper = (bool)dataRow["InheritDisplayWallpaper"];
-            connectionInfo.Inheritance.EnableFontSmoothing = (bool)dataRow["InheritEnableFontSmoothing"];
-            connectionInfo.Inheritance.EnableDesktopComposition = (bool)dataRow["InheritEnableDesktopComposition"];
-            connectionInfo.Inheritance.DisableFullWindowDrag = (bool)dataRow["InheritDisableFullWindowDrag"];
-            connectionInfo.Inheritance.DisableMenuAnimations = (bool)dataRow["InheritDisableMenuAnimations"];
-            connectionInfo.Inheritance.DisableCursorShadow = (bool)dataRow["InheritDisableCursorShadow"];
-            connectionInfo.Inheritance.DisableCursorBlinking = (bool)dataRow["InheritDisableCursorBlinking"];
-            connectionInfo.Inheritance.Domain = (bool)dataRow["InheritDomain"];
-            connectionInfo.Inheritance.Icon = (bool)dataRow["InheritIcon"];
-            connectionInfo.Inheritance.Panel = (bool)dataRow["InheritPanel"];
-            connectionInfo.Inheritance.Password = (bool)dataRow["InheritPassword"];
-            connectionInfo.Inheritance.Port = (bool)dataRow["InheritPort"];
-            connectionInfo.Inheritance.Protocol = (bool)dataRow["InheritProtocol"];
-            connectionInfo.Inheritance.SSHTunnelConnectionName = (bool)dataRow["InheritSSHTunnelConnectionName"];
-            connectionInfo.Inheritance.SSHOptions = (bool)dataRow["InheritSSHOptions"];
-            connectionInfo.Inheritance.PuttySession = (bool)dataRow["InheritPuttySession"];
-            connectionInfo.Inheritance.RedirectDiskDrives = (bool)dataRow["InheritRedirectDiskDrives"];
-            connectionInfo.Inheritance.RedirectKeys = (bool)dataRow["InheritRedirectKeys"];
-            connectionInfo.Inheritance.RedirectPorts = (bool)dataRow["InheritRedirectPorts"];
-            connectionInfo.Inheritance.RedirectPrinters = (bool)dataRow["InheritRedirectPrinters"];
-            connectionInfo.Inheritance.RedirectClipboard = (bool)dataRow["InheritRedirectClipboard"];
-            connectionInfo.Inheritance.RedirectSmartCards = (bool)dataRow["InheritRedirectSmartCards"];
-            connectionInfo.Inheritance.RedirectSound = (bool)dataRow["InheritRedirectSound"];
-            connectionInfo.Inheritance.SoundQuality = (bool)dataRow["InheritSoundQuality"];
-            connectionInfo.Inheritance.RedirectAudioCapture = (bool)dataRow["InheritRedirectAudioCapture"];
-            connectionInfo.Inheritance.Resolution = (bool)dataRow["InheritResolution"];
-            connectionInfo.Inheritance.AutomaticResize = (bool)dataRow["InheritAutomaticResize"];
-            connectionInfo.Inheritance.UseConsoleSession = (bool)dataRow["InheritUseConsoleSession"];
-            connectionInfo.Inheritance.UseCredSsp = (bool)dataRow["InheritUseCredSsp"];
-            connectionInfo.Inheritance.UseVmId = (bool)dataRow["InheritUseVmId"];
-            connectionInfo.Inheritance.UseEnhancedMode = (bool)dataRow["InheritUseEnhancedMode"];
-            connectionInfo.Inheritance.VmId = (bool)dataRow["InheritVmId"];
-            connectionInfo.Inheritance.RenderingEngine = (bool)dataRow["InheritRenderingEngine"];
-            connectionInfo.Inheritance.Username = (bool)dataRow["InheritUsername"];
-            connectionInfo.Inheritance.RDPAuthenticationLevel = (bool)dataRow["InheritRDPAuthenticationLevel"];
-            connectionInfo.Inheritance.RDPAlertIdleTimeout = (bool)dataRow["InheritRDPAlertIdleTimeout"];
-            connectionInfo.Inheritance.RDPMinutesToIdleTimeout = (bool)dataRow["InheritRDPMinutesToIdleTimeout"];
-            connectionInfo.Inheritance.LoadBalanceInfo = (bool)dataRow["InheritLoadBalanceInfo"];
-            connectionInfo.Inheritance.PreExtApp = (bool)dataRow["InheritPreExtApp"];
-            connectionInfo.Inheritance.PostExtApp = (bool)dataRow["InheritPostExtApp"];
-            connectionInfo.Inheritance.MacAddress = (bool)dataRow["InheritMacAddress"];
-            connectionInfo.Inheritance.UserField = (bool)dataRow["InheritUserField"];
-            connectionInfo.Inheritance.ExtApp = (bool)dataRow["InheritExtApp"];
-            connectionInfo.Inheritance.VNCCompression = (bool)dataRow["InheritVNCCompression"];
-            connectionInfo.Inheritance.VNCEncoding = (bool)dataRow["InheritVNCEncoding"];
-            connectionInfo.Inheritance.VNCAuthMode = (bool)dataRow["InheritVNCAuthMode"];
-            connectionInfo.Inheritance.VNCProxyType = (bool)dataRow["InheritVNCProxyType"];
-            connectionInfo.Inheritance.VNCProxyIP = (bool)dataRow["InheritVNCProxyIP"];
-            connectionInfo.Inheritance.VNCProxyPort = (bool)dataRow["InheritVNCProxyPort"];
-            connectionInfo.Inheritance.VNCProxyUsername = (bool)dataRow["InheritVNCProxyUsername"];
-            connectionInfo.Inheritance.VNCProxyPassword = (bool)dataRow["InheritVNCProxyPassword"];
-            connectionInfo.Inheritance.VNCColors = (bool)dataRow["InheritVNCColors"];
-            connectionInfo.Inheritance.VNCSmartSizeMode = (bool)dataRow["InheritVNCSmartSizeMode"];
-            connectionInfo.Inheritance.VNCViewOnly = (bool)dataRow["InheritVNCViewOnly"];
-            connectionInfo.Inheritance.RDGatewayUsageMethod = (bool)dataRow["InheritRDGatewayUsageMethod"];
-            connectionInfo.Inheritance.RDGatewayHostname = (bool)dataRow["InheritRDGatewayHostname"];
-            connectionInfo.Inheritance.RDGatewayUseConnectionCredentials =
-                (bool)dataRow["InheritRDGatewayUseConnectionCredentials"];
-            connectionInfo.Inheritance.RDGatewayUsername = (bool)dataRow["InheritRDGatewayUsername"];
-            connectionInfo.Inheritance.RDGatewayPassword = (bool)dataRow["InheritRDGatewayPassword"];
-            connectionInfo.Inheritance.RDGatewayDomain = (bool)dataRow["InheritRDGatewayDomain"];
-            connectionInfo.Inheritance.RdpVersion = (bool)dataRow["InheritRdpVersion"];
-        }
-
-        private string DecryptValue(string cipherText)
-        {
-            try
-            {
-                return _cryptographyProvider.Decrypt(cipherText, _decryptionKey);
-            }
-            catch (EncryptionException)
-            {
-                // value may not be encrypted
-                return cipherText;
-            }
-        }
-
-        private ConnectionTreeModel CreateNodeHierarchy(List<ConnectionInfo> connectionList, DataTable dataTable)
-        {
-            var connectionTreeModel = new ConnectionTreeModel();
-            var rootNode = new RootNodeInfo(RootNodeType.Connection, "0")
-            {
-                PasswordString = _decryptionKey.ConvertToUnsecureString()
-            };
-            connectionTreeModel.AddRootNode(rootNode);
-
-            foreach (DataRow row in dataTable.Rows)
-            {
-                var id = (string)row["ConstantID"];
-                var connectionInfo = connectionList.First(node => node.ConstantID == id);
-                var parentId = (string)row["ParentID"];
-                if (parentId == "0" || connectionList.All(node => node.ConstantID != parentId))
-                    rootNode.AddChild(connectionInfo);
-                else
-                    (connectionList.First(node => node.ConstantID == parentId) as ContainerInfo)?.AddChild(
-                                                                                                           connectionInfo);
-            }
-
-            return connectionTreeModel;
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Security;
+using mRemoteNG.App;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.Http;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Connection.Protocol.VNC;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tools;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+
+namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
+{
+    public class DataTableDeserializer : IDeserializer<DataTable, ConnectionTreeModel>
+    {
+        private readonly ICryptographyProvider _cryptographyProvider;
+        private readonly SecureString _decryptionKey;
+
+        public DataTableDeserializer(ICryptographyProvider cryptographyProvider, SecureString decryptionKey)
+        {
+            _cryptographyProvider = cryptographyProvider.ThrowIfNull(nameof(cryptographyProvider));
+            _decryptionKey = decryptionKey.ThrowIfNull(nameof(decryptionKey));
+        }
+
+        public ConnectionTreeModel Deserialize(DataTable table)
+        {
+            var connectionList = CreateNodesFromTable(table);
+            var connectionTreeModel = CreateNodeHierarchy(connectionList, table);
+            Runtime.ConnectionsService.IsConnectionsFileLoaded = true;
+            return connectionTreeModel;
+        }
+
+        private List<ConnectionInfo> CreateNodesFromTable(DataTable table)
+        {
+            var nodeList = new List<ConnectionInfo>();
+            foreach (DataRow row in table.Rows)
+            {
+                // ReSharper disable once SwitchStatementMissingSomeCases
+                switch ((string)row["Type"])
+                {
+                    case "Connection":
+                        nodeList.Add(DeserializeConnectionInfo(row));
+                        break;
+                    case "Container":
+                        nodeList.Add(DeserializeContainerInfo(row));
+                        break;
+                }
+            }
+
+            return nodeList;
+        }
+
+        private ConnectionInfo DeserializeConnectionInfo(DataRow row)
+        {
+            var connectionId = row["ConstantID"] as string ?? Guid.NewGuid().ToString();
+            var connectionInfo = new ConnectionInfo(connectionId);
+            PopulateConnectionInfoFromDatarow(row, connectionInfo);
+            return connectionInfo;
+        }
+
+        private ContainerInfo DeserializeContainerInfo(DataRow row)
+        {
+            var containerId = row["ConstantID"] as string ?? Guid.NewGuid().ToString();
+            var containerInfo = new ContainerInfo(containerId);
+            PopulateConnectionInfoFromDatarow(row, containerInfo);
+            return containerInfo;
+        }
+
+        private void PopulateConnectionInfoFromDatarow(DataRow dataRow, ConnectionInfo connectionInfo)
+        {
+            connectionInfo.Name = (string)dataRow["Name"];
+
+            // This throws a NPE - Parent is a connectionInfo object which will be null at this point.
+            // The Parent object is linked properly later in CreateNodeHierarchy()
+            //connectionInfo.Parent.ConstantID = (string)dataRow["ParentID"];
+
+            connectionInfo.Description = (string)dataRow["Description"];
+            connectionInfo.Icon = (string)dataRow["Icon"];
+            connectionInfo.Panel = (string)dataRow["Panel"];
+            connectionInfo.Username = (string)dataRow["Username"];
+            connectionInfo.Domain = (string)dataRow["Domain"];
+            connectionInfo.Password = DecryptValue((string)dataRow["Password"]);
+            connectionInfo.Hostname = (string)dataRow["Hostname"];
+            connectionInfo.VmId = (string)dataRow["VmId"];
+            connectionInfo.UseEnhancedMode = (bool)dataRow["UseEnhancedMode"];
+            connectionInfo.Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), (string)dataRow["Protocol"]);
+            connectionInfo.SSHTunnelConnectionName = (string)dataRow["SSHTunnelConnectionName"];
+            connectionInfo.OpeningCommand = (string)dataRow["OpeningCommand"];
+            connectionInfo.SSHOptions = (string)dataRow["SSHOptions"];
+            connectionInfo.PuttySession = (string)dataRow["PuttySession"];
+            connectionInfo.Port = (int)dataRow["Port"];
+            connectionInfo.UseConsoleSession = (bool)dataRow["ConnectToConsole"];
+            connectionInfo.UseCredSsp = (bool)dataRow["UseCredSsp"];
+            connectionInfo.UseVmId = (bool)dataRow["UseVmId"];
+            connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), (string)dataRow["RenderingEngine"]);
+            connectionInfo.RDPAuthenticationLevel = (AuthenticationLevel)Enum.Parse(typeof(AuthenticationLevel), (string)dataRow["RDPAuthenticationLevel"]);
+            connectionInfo.RDPMinutesToIdleTimeout = (int)dataRow["RDPMinutesToIdleTimeout"];
+            connectionInfo.RDPAlertIdleTimeout = (bool)dataRow["RDPAlertIdleTimeout"];
+            connectionInfo.LoadBalanceInfo = (string)dataRow["LoadBalanceInfo"];
+            connectionInfo.Colors = (RDPColors)Enum.Parse(typeof(RDPColors), (string)dataRow["Colors"]);
+            connectionInfo.Resolution = (RDPResolutions)Enum.Parse(typeof(RDPResolutions), (string)dataRow["Resolution"]);
+            connectionInfo.AutomaticResize = (bool)dataRow["AutomaticResize"];
+            connectionInfo.DisplayWallpaper = (bool)dataRow["DisplayWallpaper"];
+            connectionInfo.DisplayThemes = (bool)dataRow["DisplayThemes"];
+            connectionInfo.EnableFontSmoothing = (bool)dataRow["EnableFontSmoothing"];
+            connectionInfo.EnableDesktopComposition = (bool)dataRow["EnableDesktopComposition"];
+            connectionInfo.DisableFullWindowDrag = (bool)dataRow["DisableFullWindowDrag"];
+            connectionInfo.DisableMenuAnimations = (bool)dataRow["DisableMenuAnimations"];
+            connectionInfo.DisableCursorShadow = (bool)dataRow["DisableCursorShadow"];
+            connectionInfo.DisableCursorBlinking = (bool)dataRow["DisableCursorBlinking"];
+            connectionInfo.CacheBitmaps = (bool)dataRow["CacheBitmaps"];
+            connectionInfo.RedirectDiskDrives = (bool)dataRow["RedirectDiskDrives"];
+            connectionInfo.RedirectPorts = (bool)dataRow["RedirectPorts"];
+            connectionInfo.RedirectPrinters = (bool)dataRow["RedirectPrinters"];
+            connectionInfo.RedirectClipboard = (bool)dataRow["RedirectClipboard"];
+            connectionInfo.RedirectSmartCards = (bool)dataRow["RedirectSmartCards"];
+            connectionInfo.RedirectSound = (RDPSounds)Enum.Parse(typeof(RDPSounds), (string)dataRow["RedirectSound"]);
+            connectionInfo.SoundQuality = (RDPSoundQuality)Enum.Parse(typeof(RDPSoundQuality), (string)dataRow["SoundQuality"]);
+            connectionInfo.RedirectAudioCapture = (bool)dataRow["RedirectAudioCapture"];
+            connectionInfo.RDPStartProgram = (string)dataRow["StartProgram"];
+            connectionInfo.RDPStartProgramWorkDir = (string)dataRow["StartProgramWorkDir"];
+            connectionInfo.RedirectKeys = (bool)dataRow["RedirectKeys"];
+            connectionInfo.OpeningCommand = (string)dataRow["OpeningCommand"];
+            connectionInfo.PreExtApp = (string)dataRow["PreExtApp"];
+            connectionInfo.PostExtApp = (string)dataRow["PostExtApp"];
+            connectionInfo.MacAddress = (string)dataRow["MacAddress"];
+            connectionInfo.UserField = (string)dataRow["UserField"];
+            connectionInfo.ExtApp = (string)dataRow["ExtApp"];
+            connectionInfo.VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression), (string)dataRow["VNCCompression"]);
+            connectionInfo.VNCEncoding = (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), (string)dataRow["VNCEncoding"]);
+            connectionInfo.VNCAuthMode = (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), (string)dataRow["VNCAuthMode"]);
+            connectionInfo.VNCProxyType = (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType), (string)dataRow["VNCProxyType"]);
+            connectionInfo.VNCProxyIP = (string)dataRow["VNCProxyIP"];
+            connectionInfo.VNCProxyPort = (int)dataRow["VNCProxyPort"];
+            connectionInfo.VNCProxyUsername = (string)dataRow["VNCProxyUsername"];
+            connectionInfo.VNCProxyPassword = DecryptValue((string)dataRow["VNCProxyPassword"]);
+            connectionInfo.VNCColors = (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), (string)dataRow["VNCColors"]);
+            connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), (string)dataRow["VNCSmartSizeMode"]);
+            connectionInfo.VNCViewOnly = (bool)dataRow["VNCViewOnly"];
+            connectionInfo.RDGatewayUsageMethod = (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod), (string)dataRow["RDGatewayUsageMethod"]);
+            connectionInfo.RDGatewayHostname = (string)dataRow["RDGatewayHostname"];
+            connectionInfo.RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RDGatewayUseConnectionCredentials), (string)dataRow["RDGatewayUseConnectionCredentials"]);
+            connectionInfo.RDGatewayUsername = (string)dataRow["RDGatewayUsername"];
+            connectionInfo.RDGatewayPassword = DecryptValue((string)dataRow["RDGatewayPassword"]);
+            connectionInfo.RDGatewayDomain = (string)dataRow["RDGatewayDomain"];
+
+            if (!dataRow.IsNull("RdpVersion")) // table allows null values which must be handled
+                if (Enum.TryParse((string)dataRow["RdpVersion"], true, out RdpVersion rdpVersion))
+                    connectionInfo.RdpVersion = rdpVersion;
+
+            connectionInfo.Inheritance.CacheBitmaps = (bool)dataRow["InheritCacheBitmaps"];
+            connectionInfo.Inheritance.Colors = (bool)dataRow["InheritColors"];
+            connectionInfo.Inheritance.Description = (bool)dataRow["InheritDescription"];
+            connectionInfo.Inheritance.DisplayThemes = (bool)dataRow["InheritDisplayThemes"];
+            connectionInfo.Inheritance.DisplayWallpaper = (bool)dataRow["InheritDisplayWallpaper"];
+            connectionInfo.Inheritance.EnableFontSmoothing = (bool)dataRow["InheritEnableFontSmoothing"];
+            connectionInfo.Inheritance.EnableDesktopComposition = (bool)dataRow["InheritEnableDesktopComposition"];
+            connectionInfo.Inheritance.DisableFullWindowDrag = (bool)dataRow["InheritDisableFullWindowDrag"];
+            connectionInfo.Inheritance.DisableMenuAnimations = (bool)dataRow["InheritDisableMenuAnimations"];
+            connectionInfo.Inheritance.DisableCursorShadow = (bool)dataRow["InheritDisableCursorShadow"];
+            connectionInfo.Inheritance.DisableCursorBlinking = (bool)dataRow["InheritDisableCursorBlinking"];
+            connectionInfo.Inheritance.Domain = (bool)dataRow["InheritDomain"];
+            connectionInfo.Inheritance.Icon = (bool)dataRow["InheritIcon"];
+            connectionInfo.Inheritance.Panel = (bool)dataRow["InheritPanel"];
+            connectionInfo.Inheritance.Password = (bool)dataRow["InheritPassword"];
+            connectionInfo.Inheritance.Port = (bool)dataRow["InheritPort"];
+            connectionInfo.Inheritance.Protocol = (bool)dataRow["InheritProtocol"];
+            connectionInfo.Inheritance.SSHTunnelConnectionName = (bool)dataRow["InheritSSHTunnelConnectionName"];
+            connectionInfo.Inheritance.OpeningCommand = (bool)dataRow["InheritOpeningCommand"];
+            connectionInfo.Inheritance.SSHOptions = (bool)dataRow["InheritSSHOptions"];
+            connectionInfo.Inheritance.PuttySession = (bool)dataRow["InheritPuttySession"];
+            connectionInfo.Inheritance.RedirectDiskDrives = (bool)dataRow["InheritRedirectDiskDrives"];
+            connectionInfo.Inheritance.RedirectKeys = (bool)dataRow["InheritRedirectKeys"];
+            connectionInfo.Inheritance.RedirectPorts = (bool)dataRow["InheritRedirectPorts"];
+            connectionInfo.Inheritance.RedirectPrinters = (bool)dataRow["InheritRedirectPrinters"];
+            connectionInfo.Inheritance.RedirectClipboard = (bool)dataRow["InheritRedirectClipboard"];
+            connectionInfo.Inheritance.RedirectSmartCards = (bool)dataRow["InheritRedirectSmartCards"];
+            connectionInfo.Inheritance.RedirectSound = (bool)dataRow["InheritRedirectSound"];
+            connectionInfo.Inheritance.SoundQuality = (bool)dataRow["InheritSoundQuality"];
+            connectionInfo.Inheritance.RedirectAudioCapture = (bool)dataRow["InheritRedirectAudioCapture"];
+            connectionInfo.Inheritance.Resolution = (bool)dataRow["InheritResolution"];
+            connectionInfo.Inheritance.AutomaticResize = (bool)dataRow["InheritAutomaticResize"];
+            connectionInfo.Inheritance.UseConsoleSession = (bool)dataRow["InheritUseConsoleSession"];
+            connectionInfo.Inheritance.UseCredSsp = (bool)dataRow["InheritUseCredSsp"];
+            connectionInfo.Inheritance.UseVmId = (bool)dataRow["InheritUseVmId"];
+            connectionInfo.Inheritance.UseEnhancedMode = (bool)dataRow["InheritUseEnhancedMode"];
+            connectionInfo.Inheritance.VmId = (bool)dataRow["InheritVmId"];
+            connectionInfo.Inheritance.RenderingEngine = (bool)dataRow["InheritRenderingEngine"];
+            connectionInfo.Inheritance.Username = (bool)dataRow["InheritUsername"];
+            connectionInfo.Inheritance.RDPAuthenticationLevel = (bool)dataRow["InheritRDPAuthenticationLevel"];
+            connectionInfo.Inheritance.RDPAlertIdleTimeout = (bool)dataRow["InheritRDPAlertIdleTimeout"];
+            connectionInfo.Inheritance.RDPMinutesToIdleTimeout = (bool)dataRow["InheritRDPMinutesToIdleTimeout"];
+            connectionInfo.Inheritance.LoadBalanceInfo = (bool)dataRow["InheritLoadBalanceInfo"];
+            connectionInfo.Inheritance.OpeningCommand = (bool)dataRow["InheritOpeningCommand"];
+            connectionInfo.Inheritance.PreExtApp = (bool)dataRow["InheritPreExtApp"];
+            connectionInfo.Inheritance.PostExtApp = (bool)dataRow["InheritPostExtApp"];
+            connectionInfo.Inheritance.MacAddress = (bool)dataRow["InheritMacAddress"];
+            connectionInfo.Inheritance.UserField = (bool)dataRow["InheritUserField"];
+            connectionInfo.Inheritance.ExtApp = (bool)dataRow["InheritExtApp"];
+            connectionInfo.Inheritance.VNCCompression = (bool)dataRow["InheritVNCCompression"];
+            connectionInfo.Inheritance.VNCEncoding = (bool)dataRow["InheritVNCEncoding"];
+            connectionInfo.Inheritance.VNCAuthMode = (bool)dataRow["InheritVNCAuthMode"];
+            connectionInfo.Inheritance.VNCProxyType = (bool)dataRow["InheritVNCProxyType"];
+            connectionInfo.Inheritance.VNCProxyIP = (bool)dataRow["InheritVNCProxyIP"];
+            connectionInfo.Inheritance.VNCProxyPort = (bool)dataRow["InheritVNCProxyPort"];
+            connectionInfo.Inheritance.VNCProxyUsername = (bool)dataRow["InheritVNCProxyUsername"];
+            connectionInfo.Inheritance.VNCProxyPassword = (bool)dataRow["InheritVNCProxyPassword"];
+            connectionInfo.Inheritance.VNCColors = (bool)dataRow["InheritVNCColors"];
+            connectionInfo.Inheritance.VNCSmartSizeMode = (bool)dataRow["InheritVNCSmartSizeMode"];
+            connectionInfo.Inheritance.VNCViewOnly = (bool)dataRow["InheritVNCViewOnly"];
+            connectionInfo.Inheritance.RDGatewayUsageMethod = (bool)dataRow["InheritRDGatewayUsageMethod"];
+            connectionInfo.Inheritance.RDGatewayHostname = (bool)dataRow["InheritRDGatewayHostname"];
+            connectionInfo.Inheritance.RDGatewayUseConnectionCredentials = (bool)dataRow["InheritRDGatewayUseConnectionCredentials"];
+            connectionInfo.Inheritance.RDGatewayUsername = (bool)dataRow["InheritRDGatewayUsername"];
+            connectionInfo.Inheritance.RDGatewayPassword = (bool)dataRow["InheritRDGatewayPassword"];
+            connectionInfo.Inheritance.RDGatewayDomain = (bool)dataRow["InheritRDGatewayDomain"];
+            connectionInfo.Inheritance.RdpVersion = (bool)dataRow["InheritRdpVersion"];
+        }
+
+        private string DecryptValue(string cipherText)
+        {
+            try
+            {
+                return _cryptographyProvider.Decrypt(cipherText, _decryptionKey);
+            }
+            catch (EncryptionException)
+            {
+                // value may not be encrypted
+                return cipherText;
+            }
+        }
+
+        private ConnectionTreeModel CreateNodeHierarchy(List<ConnectionInfo> connectionList, DataTable dataTable)
+        {
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection, "0")
+            {
+                PasswordString = _decryptionKey.ConvertToUnsecureString()
+            };
+            connectionTreeModel.AddRootNode(rootNode);
+
+            foreach (DataRow row in dataTable.Rows)
+            {
+                var id = (string)row["ConstantID"];
+                var connectionInfo = connectionList.First(node => node.ConstantID == id);
+                var parentId = (string)row["ParentID"];
+                if (parentId == "0" || connectionList.All(node => node.ConstantID != parentId))
+                    rootNode.AddChild(connectionInfo);
+                else
+                    (connectionList.First(node => node.ConstantID == parentId) as ContainerInfo)?.AddChild(
+                                                                                                           connectionInfo);
+            }
+
+            return connectionTreeModel;
+        }
+    }
 }

mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs

@@ -80,9 +80,9 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
 	        if (rootTreeNode != null)
 	        {
 		        cmd = databaseConnector.DbCommand(
-                        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES(\'" +
-				        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "\', 0, \'" + strProtected + "\'," +
-				        ConnectionsFileInfo.ConnectionFileVersion.ToString(CultureInfo.InvariantCulture) + ")");
+                        "INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES('" +
+				        MiscTools.PrepareValueForDB(rootTreeNode.Name) + "', 0, '" + strProtected + "','" +
+				        ConnectionsFileInfo.ConnectionFileVersion.ToString() + "')");
 		        cmd.ExecuteNonQuery();
 	        }
 	        else

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Security;
 using System.Xml.Linq;
 using mRemoteNG.Connection;
@@ -66,6 +66,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
             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));
@@ -98,7 +99,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
             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.StartProgram));
+            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));
@@ -168,6 +169,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
                     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)

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Security;
 using System.Xml.Linq;
 using mRemoteNG.App;
@@ -76,6 +76,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
             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));
@@ -114,7 +115,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
             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.StartProgram));
+            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));
@@ -148,6 +150,10 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
             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)
@@ -194,6 +200,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
                     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)
@@ -288,6 +296,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml
                     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/MiscSerializers/ActiveDirectoryDeserializer.cs

@@ -9,6 +9,7 @@ using mRemoteNG.Container;
 using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Config.Serializers.MiscSerializers
 {

mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs

@@ -152,7 +152,7 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers
                     connectionInfo.RDGatewayHostname = value;
                     break;
                 case "alternate shell":
-                    connectionInfo.StartProgram = value;
+                    connectionInfo.RDPStartProgram = value;
                     break;
             }
         }

mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
@@ -9,6 +9,7 @@ using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Container;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Config.Serializers.MiscSerializers
 {
@@ -182,8 +183,8 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers
             {
 				if (bool.TryParse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText, out var useConsole))
 					connectionInfo.UseConsoleSession = useConsole;
-                connectionInfo.StartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText;
-                // ./workingDir
+                connectionInfo.RDPStartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText;
+                connectionInfo.RDPStartProgramWorkDir = connectionSettingsNode.SelectSingleNode("./startProgramWorkDir")?.InnerText;
                 if (int.TryParse(connectionSettingsNode.SelectSingleNode("./port")?.InnerText, out var port))
 					connectionInfo.Port = port;
             }

mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs

@@ -2,12 +2,15 @@
 using mRemoteNG.App.Info;
 using mRemoteNG.Config.DatabaseConnectors;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 using System;
 
 namespace mRemoteNG.Config.Serializers.Versioning
 {
     public class SqlDatabaseVersionVerifier
-    {
+    {
+        protected readonly Version currentSupportedVersion = new Version(2, 9);
+
         private readonly IDatabaseConnector _databaseConnector;
 
         public SqlDatabaseVersionVerifier(IDatabaseConnector DatabaseConnector)
@@ -38,6 +41,7 @@ namespace mRemoteNG.Config.Serializers.Versioning
                     new SqlVersion25To26Upgrader(_databaseConnector),
                     new SqlVersion26To27Upgrader(_databaseConnector),
                     new SqlVersion27To28Upgrader(_databaseConnector),
+                    new SqlVersion28To29Upgrader(_databaseConnector),
                 };
 
                 foreach (var upgrader in dbUpgraders)
@@ -49,7 +53,7 @@ namespace mRemoteNG.Config.Serializers.Versioning
                 }
 
                 // DB is at the highest current supported version
-                if (databaseVersion.CompareTo(new Version(2, 8)) == 0)
+                if (databaseVersion.CompareTo(currentSupportedVersion) == 0)
                     isVerified = true;
 
                 if (isVerified == false)

mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs

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

@@ -16,6 +16,8 @@ using mRemoteNG.Connection.Protocol.VNC;
 using mRemoteNG.Container;
 using mRemoteNG.Properties;
 using mRemoteNG.Tree;
+using mRemoteNG.Resources.Language;
+using mRemoteNG.Tree.Root;
 
 
 namespace mRemoteNG.Connection
@@ -45,10 +47,10 @@ namespace mRemoteNG.Connection
         [Browsable(false)] public ContainerInfo Parent { get; internal set; }
 
         [Browsable(false)]
-        // ReSharper disable once UnusedAutoPropertyAccessor.Global
         public bool IsQuickConnect { get; set; }
 
-        [Browsable(false)] public bool PleaseConnect { get; set; }
+        [Browsable(false)]
+        public bool PleaseConnect { get; set; }
 
         #endregion
 
@@ -65,6 +67,7 @@ namespace mRemoteNG.Connection
             SetTreeDisplayDefaults();
             SetConnectionDefaults();
             SetProtocolDefaults();
+            SetRemoteDesktopServicesDefaults();
             SetRdGatewayDefaults();
             SetAppearanceDefaults();
             SetRedirectDefaults();
@@ -198,7 +201,10 @@ namespace mRemoteNG.Connection
 
         private bool ShouldThisPropertyBeInherited(string propertyName)
         {
-            return ParentIsValidInheritanceTarget() && IsInheritanceTurnedOnForThisProperty(propertyName);
+            return
+                Inheritance.InheritanceActive &&
+                ParentIsValidInheritanceTarget() &&
+                IsInheritanceTurnedOnForThisProperty(propertyName);
         }
 
         private bool ParentIsValidInheritanceTarget()
@@ -290,6 +296,7 @@ namespace mRemoteNG.Connection
         private void SetConnectionDefaults()
         {
             Hostname = string.Empty;
+            EC2Region = Settings.Default.ConDefaultEC2Region;
         }
 
         private void SetProtocolDefaults()
@@ -309,6 +316,12 @@ namespace mRemoteNG.Connection
             UseEnhancedMode = Settings.Default.ConDefaultUseEnhancedMode;
         }
 
+        private void SetRemoteDesktopServicesDefaults()
+        {
+            RDPStartProgram = string.Empty;
+            RDPStartProgramWorkDir = string.Empty;
+        }
+
         private void SetRdGatewayDefaults()
         {
             RDGatewayUsageMethod = (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod), Settings.Default.ConDefaultRDGatewayUsageMethod);
@@ -355,7 +368,9 @@ namespace mRemoteNG.Connection
             MacAddress = Settings.Default.ConDefaultMacAddress;
             UserField = Settings.Default.ConDefaultUserField;
             Favorite = Settings.Default.ConDefaultFavorite;
-            StartProgram = Settings.Default.ConDefaultStartProgram;
+            RDPStartProgram = Settings.Default.ConDefaultRDPStartProgram;
+            RDPStartProgramWorkDir = Settings.Default.ConDefaultRDPStartProgram;
+            OpeningCommand = Settings.Default.OpeningCommand;
         }
 
         private void SetVncDefaults()

mRemoteNG/Connection/ConnectionInfoInheritance.cs

@@ -3,6 +3,8 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using mRemoteNG.Tools;
+using mRemoteNG.Tree.Root;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection
 {
@@ -49,6 +51,12 @@ namespace mRemoteNG.Connection
         #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)),
@@ -91,6 +99,15 @@ namespace mRemoteNG.Connection
         [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
@@ -445,7 +462,16 @@ namespace mRemoteNG.Connection
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCViewOnly {get; set;}
         #endregion
 
-        [Browsable(false)] public ConnectionInfo Parent { get; private set; }
+        [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
 
@@ -462,7 +488,6 @@ namespace mRemoteNG.Connection
         {
             var newInheritance = (ConnectionInfoInheritance)MemberwiseClone();
             newInheritance.Parent = parent;
-            newInheritance._tempInheritanceStorage = null;
             return newInheritance;
         }
 
@@ -520,15 +545,22 @@ namespace mRemoteNG.Connection
         /// <returns></returns>
         public IEnumerable<string> GetEnabledInheritanceProperties()
         {
-            return GetProperties()
-                .Where(property => (bool)property.GetValue(this))
-                .Select(property => property.Name)
-                .ToList();
+            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[] {"EverythingInherited", "Parent"};
+            var exclusions = new[]
+            {
+                nameof(EverythingInherited),
+                nameof(Parent),
+                nameof(InheritanceActive)
+            };
             var valueShouldNotBeFiltered = !exclusions.Contains(propertyInfo.Name);
             return valueShouldNotBeFiltered;
         }

mRemoteNG/Connection/ConnectionInitiator.cs

@@ -11,6 +11,7 @@ using mRemoteNG.UI.Panels;
 using mRemoteNG.UI.Tabs;
 using mRemoteNG.UI.Window;
 using WeifenLuo.WinFormsUI.Docking;
+using mRemoteNG.Resources.Language;
 
 
 namespace mRemoteNG.Connection
@@ -61,6 +62,19 @@ namespace mRemoteNG.Connection
 
             try
             {
+                if (!string.IsNullOrEmpty(connectionInfo.EC2InstanceId))
+                {
+                    try
+                    {
+                        string host = await ExternalConnectors.AWS.EC2FetchDataService.GetEC2InstanceDataAsync("AWSAPI:" + connectionInfo.EC2InstanceId, connectionInfo.EC2Region);
+                        if (!string.IsNullOrEmpty(host))
+                            connectionInfo.Hostname = host;
+                    }
+                    catch
+                    {
+                    }
+                }
+
                 if (connectionInfo.Hostname == "" && connectionInfo.Protocol != ProtocolType.IntApp)
                 {
                     Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,

mRemoteNG/Connection/ConnectionsService.cs

@@ -18,6 +18,7 @@ using mRemoteNG.Tools;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using mRemoteNG.UI;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection
 {
@@ -36,6 +37,7 @@ namespace mRemoteNG.Connection
         public string ConnectionFileName { get; private set; }
         public RemoteConnectionsSyncronizer RemoteConnectionsSyncronizer { get; set; }
         public DateTime LastSqlUpdate { get; set; }
+		public DateTime LastFileUpdate { get; set; }
 
         public ConnectionTreeModel ConnectionTreeModel { get; private set; }
 
@@ -76,10 +78,16 @@ namespace mRemoteNG.Connection
 
                 if (connectionString.Contains("@"))
                 {
-                    string[] x = connectionString.Split('@');
+                    var x = connectionString.Split('@');
                     uriBuilder.UserName = x[0];
                     uriBuilder.Host = x[1];
                 }
+                if (uriBuilder.Host.Contains(":"))
+                {
+                    var x = uriBuilder.Host.Split(':');
+                    uriBuilder.Host = x[0];
+                    uriBuilder.Port = Convert.ToInt32(x[1]);
+                }
                 else
                     uriBuilder.Host = connectionString;
                 
@@ -91,16 +99,12 @@ namespace mRemoteNG.Connection
                     : uriBuilder.Host;
 
                 newConnectionInfo.Protocol = protocol;
-                newConnectionInfo.Hostname = uriBuilder.Host;
                 newConnectionInfo.Username = uriBuilder.UserName;
+
                 if (uriBuilder.Port == -1)
                 {
                     newConnectionInfo.SetDefaultPort();
                 }
-                else
-                {
-                    newConnectionInfo.Port = uriBuilder.Port;
-                }
 
                 if (string.IsNullOrEmpty(newConnectionInfo.Panel))
                     newConnectionInfo.Panel = Language.General;

mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs

@@ -4,6 +4,7 @@ using Microsoft.Web.WebView2.WinForms;
 using mRemoteNG.Tools;
 using mRemoteNG.App;
 using mRemoteNG.UI.Tabs;
+using mRemoteNG.Resources.Language;
 
 
 namespace mRemoteNG.Connection.Protocol.Http

mRemoteNG/Connection/Protocol/IntegratedProgram.cs

@@ -7,6 +7,7 @@ using mRemoteNG.App;
 using mRemoteNG.Messages;
 using mRemoteNG.Properties;
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol
 {

mRemoteNG/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs

@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.PowerShell
 {

mRemoteNG/Connection/Protocol/ProtocolFactory.cs

@@ -8,6 +8,7 @@ using mRemoteNG.Connection.Protocol.VNC;
 using System;
 using mRemoteNG.Connection.Protocol.PowerShell;
 using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol
 {

mRemoteNG/Connection/Protocol/ProtocolType.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol
 {

mRemoteNG/Connection/Protocol/PuttyBase.cs

@@ -10,6 +10,7 @@ using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
 using mRemoteNG.Properties;
+using mRemoteNG.Resources.Language;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 
@@ -81,6 +82,19 @@ namespace mRemoteNG.Connection.Protocol
                         var username = "";
                         var password = "";
 
+                        // access secret server api if necessary
+                        if (!string.IsNullOrEmpty(InterfaceControl.Info?.UserViaAPI))
+                        {
+                            var domain = ""; // dummy
+                            try
+                            {
+                                ExternalConnectors.TSS.SecretServerInterface.FetchSecretFromServer("SSAPI:" + InterfaceControl.Info?.UserViaAPI, out username, out password, out domain);
+                            }
+                            catch (Exception ex)
+                            {
+                                Event_ErrorOccured(this, "Secret Server Interface Error: " + ex.Message, 0);
+                            }
+                        }
                         if (!string.IsNullOrEmpty(InterfaceControl.Info?.Username))
                         {
                             username = InterfaceControl.Info.Username;
@@ -187,6 +201,13 @@ namespace mRemoteNG.Connection.Protocol
                                                     string.Format(Language.PanelHandle,
                                                                   InterfaceControl.Parent.Handle), true);
 
+                if (!string.IsNullOrEmpty(InterfaceControl.Info?.OpeningCommand))
+                {
+                    NativeMethods.SetForegroundWindow(PuttyHandle);
+                    var finalCommand = InterfaceControl.Info.OpeningCommand.TrimEnd() + "\n";
+                    SendKeys.SendWait(finalCommand);
+                }
+
                 Resize(this, new EventArgs());
                 base.Connect();
                 return true;

mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDPColors.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RdpErrorCodes.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using mRemoteNG.App;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RdpProtocol7.cs

@@ -3,6 +3,7 @@ using mRemoteNG.App;
 using MSTSCLib;
 using System;
 using System.Windows.Forms;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs

@@ -5,6 +5,7 @@ using AxMSTSCLib;
 using mRemoteNG.App;
 using mRemoteNG.Messages;
 using MSTSCLib;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.RDP
 {

mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs

@@ -5,33 +5,18 @@ using System.Net.Sockets;
 using mRemoteNG.App;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
+using mRemoteNG.Resources.Language;
 
 // ReSharper disable ArrangeAccessorOwnerBody
 
 
 namespace mRemoteNG.Connection.Protocol.VNC
 {
-    public class ProtocolVNC : ProtocolBase, ISupportsViewOnly
+    public class ProtocolVNC : ProtocolBase
     {
-        #region Properties
-
-        public bool SmartSize
-        {
-            get => _vnc.Scaled;
-            set => _vnc.Scaled = value;
-        }
-
-        public bool ViewOnly
-        {
-            get => _vnc.ViewOnly;
-            set => _vnc.ViewOnly = value;
-        }
-
-        #endregion
-
         #region Private Declarations
 
-        private VncSharp.RemoteDesktop _vnc;
+        private VncSharpCore.RemoteDesktop _vnc;
         private ConnectionInfo _info;
         private static bool _isConnectionSuccessful;
         private static Exception _socketexception;
@@ -43,7 +28,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
 
         public ProtocolVNC()
         {
-            Control = new VncSharp.RemoteDesktop();
+            Control = new VncSharpCore.RemoteDesktop();
         }
 
         public override bool Initialize()
@@ -52,7 +37,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
 
             try
             {
-                _vnc = (VncSharp.RemoteDesktop)Control;
+                _vnc = (VncSharpCore.RemoteDesktop)Control;
                 _info = InterfaceControl.Info;
                 _vnc.VncPort = _info.Port;
 
@@ -108,10 +93,10 @@ namespace mRemoteNG.Connection.Protocol.VNC
                 switch (Keys)
                 {
                     case SpecialKeys.CtrlAltDel:
-                        _vnc.SendSpecialKeys(VncSharp.SpecialKeys.CtrlAltDel);
+                        _vnc.SendSpecialKeys(VncSharpCore.SpecialKeys.CtrlAltDel);
                         break;
                     case SpecialKeys.CtrlEsc:
-                        _vnc.SendSpecialKeys(VncSharp.SpecialKeys.CtrlEsc);
+                        _vnc.SendSpecialKeys(VncSharpCore.SpecialKeys.CtrlEsc);
                         break;
                 }
             }
@@ -123,36 +108,6 @@ namespace mRemoteNG.Connection.Protocol.VNC
             }
         }
 
-        public void ToggleSmartSize()
-        {
-            try
-            {
-                SmartSize = !SmartSize;
-                RefreshScreen();
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.VncToggleSmartSizeFailed + Environment.NewLine +
-                                                    ex.Message, true);
-            }
-        }
-
-        public void ToggleViewOnly()
-        {
-            try
-            {
-                ViewOnly = !ViewOnly;
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.VncToggleViewOnlyFailed + Environment.NewLine +
-                                                    ex.Message, true);
-            }
-        }
-
-
         public void StartChat()
         {
             throw new NotImplementedException();

mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using mRemoteNG.Tools;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection.Protocol.VNC
 {

mRemoteNG/Connection/PuttySessionInfo.cs

@@ -1,4 +1,4 @@
-using mRemoteNG.App;
+using mRemoteNG.App;
 using mRemoteNG.Messages;
 using mRemoteNG.Tools;
 using System;
@@ -6,6 +6,7 @@ using System.ComponentModel;
 using mRemoteNG.Connection.Protocol;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
+using mRemoteNG.Resources.Language;
 
 
 namespace mRemoteNG.Connection

mRemoteNG/Connection/WebHelper.cs

@@ -1,4 +1,5 @@
 using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Connection
 {

mRemoteNG/Container/ContainerInfo.cs

@@ -263,6 +263,34 @@ namespace mRemoteNG.Container
             return childList;
         }
 
+        /// <summary>
+        /// Pushes the connection properties of this container to all
+        /// children recursively.
+        /// </summary>
+        public void ApplyConnectionPropertiesToChildren()
+        {
+            var children = GetRecursiveChildList();
+
+            foreach (var child in children)
+            {
+                child.CopyFrom(this);
+            }
+        }
+
+        /// <summary>
+        /// Pushes the inheritance settings of this container to all
+        /// children recursively.
+        /// </summary>
+        public void ApplyInheritancePropertiesToChildren()
+        {
+            var children = GetRecursiveChildList();
+
+            foreach (var child in children)
+            {
+                child.Inheritance = Inheritance.Clone(child);
+            }
+        }
+
         private IEnumerable<ConnectionInfo> GetRecursiveFavoritChildList(ContainerInfo container)
         {
             var childList = new List<ConnectionInfo>();

mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using mRemoteNG.Tree;
+using mRemoteNG.Resources.Language;
 
 
 namespace mRemoteNG.Credential

mRemoteNG/Credential/PlaceholderCredentialRecord.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Security;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Credential
 {

mRemoteNG/Language/Language.de.resx

@@ -2025,4 +2025,10 @@ Nightly umfasst Alphas, Betas und Release Candidates.</value>
   <data name="WebView2InitializationFailed" xml:space="preserve">
     <value>WebView2-Erstellung fehlgeschlagen</value>
   </data>
+  <data name="ApplyDefaultInheritance" xml:space="preserve">
+    <value>Standardvererbung anwenden</value>
+  </data>
+  <data name="ApplyInheritanceToChildren" xml:space="preserve">
+    <value>Vererbung auf Kinder anwenden</value>
+  </data>
 </root>

mRemoteNG/Language/Language.fi-FI.resx

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>
+  <data name="PropertyDescriptionColors" xml:space="preserve">
+    <value>Valitse käytettävä värilaatu.</value>
+  </data>
+  <data name="Colors" xml:space="preserve">
+    <value>Värit</value>
+  </data>
+  <data name="Rdp16777216Colors" xml:space="preserve">
+    <value>16777216 Värit (24-bit)</value>
+  </data>
+  <data name="Rdp256Colors" xml:space="preserve">
+    <value>256 Värit (8-bit)</value>
+  </data>
+  <data name="Rdp32768Colors" xml:space="preserve">
+    <value>32768 Värit (15-bit)</value>
+  </data>
+  <data name="Rdp4294967296Colors" xml:space="preserve">
+    <value>16777216 Värit (32-bit)</value>
+  </data>
+  <data name="Rdp65536Colors" xml:space="preserve">
+    <value>65536 Värit (16-bit)</value>
+  </data>
+</root>

mRemoteNG/Language/Language.resx

@@ -112,10 +112,10 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
     <value>About</value>
@@ -264,6 +264,9 @@
   <data name="CheckboxUpdateUseProxy" xml:space="preserve">
     <value>Use a proxy server to connect</value>
   </data>
+  <data name="UserViaAPI" xml:space="preserve">
+    <value>API User ID</value>
+  </data>
   <data name="Username" xml:space="preserve">
     <value>Username</value>
   </data>
@@ -967,7 +970,7 @@ If you run into such an error, please create a new connection file!</value>
     <value>Select whether to use bitmap caching or not.</value>
   </data>
   <data name="PropertyDescriptionColors" xml:space="preserve">
-    <value>Select the colour quality to be used.</value>
+    <value>Select the color quality to be used.</value>
   </data>
   <data name="PropertyDescriptionCompression" xml:space="preserve">
     <value>Select the compression value to be used.</value>
@@ -1086,6 +1089,9 @@ If you run into such an error, please create a new connection file!</value>
   <data name="PropertyDescriptionUser1" xml:space="preserve">
     <value>Feel free to enter any information you need here.</value>
   </data>
+  <data name="PropertyDescriptionUserViaAPI" xml:space="preserve">
+    <value>Enter the ID of user data in external API (e.g. secret server). when used, leave username/password/domain fields empty</value>
+  </data>
   <data name="PropertyDescriptionUsername" xml:space="preserve">
     <value>Enter your username.</value>
   </data>
@@ -1126,7 +1132,7 @@ If you run into such an error, please create a new connection file!</value>
     <value>Cache Bitmaps</value>
   </data>
   <data name="Colors" xml:space="preserve">
-    <value>Colours</value>
+    <value>Colors</value>
   </data>
   <data name="Compression" xml:space="preserve">
     <value>Compression</value>
@@ -1313,7 +1319,7 @@ If you run into such an error, please create a new connection file!</value>
     <value>Creating quick connect failed</value>
   </data>
   <data name="_CloseWarnAll" xml:space="preserve">
-    <value>&amp;Warn me when closing connections</value>
+    <value>Warn me when closing connections</value>
   </data>
   <data name="RadioCloseWarnExit" xml:space="preserve">
     <value>Warn me only when e&amp;xiting mRemoteNG</value>
@@ -1331,19 +1337,19 @@ If you run into such an error, please create a new connection file!</value>
     <value>RDP</value>
   </data>
   <data name="Rdp16777216Colors" xml:space="preserve">
-    <value>16777216 Colours (24-bit)</value>
+    <value>16777216 Colors (24-bit)</value>
   </data>
   <data name="Rdp256Colors" xml:space="preserve">
     <value>256 Colours (8-bit)</value>
   </data>
   <data name="Rdp32768Colors" xml:space="preserve">
-    <value>32768 Colours (15-bit)</value>
+    <value>32768 Colors (15-bit)</value>
   </data>
   <data name="Rdp4294967296Colors" xml:space="preserve">
-    <value>16777216 Colours (32-bit)</value>
+    <value>16777216 Colors (32-bit)</value>
   </data>
   <data name="Rdp65536Colors" xml:space="preserve">
-    <value>65536 Colours (16-bit)</value>
+    <value>65536 Colors (16-bit)</value>
   </data>
   <data name="RdpControlCreationFailed" xml:space="preserve">
     <value>Couldn't create RDP control, please check mRemoteNG requirements.</value>
@@ -1483,8 +1489,35 @@ If you run into such an error, please create a new connection file!</value>
   <data name="SaveConnectionsFileBeforeOpeningAnother" xml:space="preserve">
     <value>Do you want to save the current connections file before loading another?</value>
   </data>
-  <data name="SaveConsOnExit" xml:space="preserve">
-    <value>Save connections on exit</value>
+  <data name="ConnectionsBackupFrequencyDaily" xml:space="preserve">
+    <value>Daily</value>
+  </data>
+  <data name="strConnectionBackupFrequency" xml:space="preserve">
+    <value>Connection Backup Frequency</value>
+  </data>
+  <data name="ConnectionsBackupFrequencyWeekly" xml:space="preserve">
+    <value>Weekly</value>
+  </data>
+  <data name="strConnectionsBackupMaxCount" xml:space="preserve">
+    <value>Maximum number of backups</value>
+  </data>
+  <data name="strConnectionsBackupPath" xml:space="preserve">
+    <value>Location of connection file backup</value>
+  </data>
+  <data name="ConnectionsBackupFrequencyOnEdit" xml:space="preserve">
+    <value>On Edit</value>
+  </data>
+  <data name="ConnectionsBackupFrequencyOnExit" xml:space="preserve">
+    <value>On Exit</value>
+  </data>
+  <data name="ConnectionsBackupFrequencyNever" xml:space="preserve">
+    <value>Never backup connections</value>
+  </data>
+  <data name="strBrowse" xml:space="preserve">
+    <value>Browse...</value>
+  </data>
+  <data name="strBackup" xml:space="preserve">
+    <value>Backup</value>
   </data>
   <data name="SaveImageFilter" xml:space="preserve">
     <value>Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png</value>
@@ -1834,7 +1867,6 @@ mRemoteNG will now quit and begin with the installation.</value>
   </data>
   <data name="CredentialUnavailable" xml:space="preserve">
     <value>Credential not available</value>
-    
   </data>
   <data name="OptionsThemeDeleteConfirmation" xml:space="preserve">
     <value>Do you really want to delete the theme?</value>
@@ -2141,16 +2173,54 @@ Nightly Channel includes Alphas, Betas &amp; Release Candidates.</value>
   <data name="ShowHideMenu" xml:space="preserve">
     <value>Show/Hide Menu Strip</value>
   </data>
-  <data name="PropertyDescriptionStartProgram" xml:space="preserve">
-    <value>Start Program/alternate shell</value>
+  <data name="PropertyDescriptionRDPStartProgram" xml:space="preserve">
+    <value>The program to be started on the remote server upon connection.</value>
   </data>
-  <data name="StartProgram" xml:space="preserve">
-    <value>Start Program</value>
+  <data name="PropertyDescriptionRDPStartProgramWorkDir" xml:space="preserve">
+    <value>Specifies the working directory of the alternate shell.</value>
   </data>
-  <data name="WebView2InitializationFailed" xml:space="preserve">
-    <value>WebView2 creation failed with exception</value>
+  <data name="RDPStartProgram" xml:space="preserve">
+    <value>Alternate Shell</value>
+    <comment>https://docs.microsoft.com/en-us/windows/win32/termserv/imstscsecuredsettings-startprogram</comment>
+  </data>
+  <data name="RDPStartProgramWorkDir" xml:space="preserve">
+    <value>Alternate shell working directory</value>
+    <comment>https://docs.microsoft.com/en-us/windows/win32/termserv/imstscsecuredsettings-workdir</comment>
+  </data>
+  <data name="OpeningCommand" xml:space="preserve">
+    <value>TODO</value>
+  </data>
+  <data name="PropertyDescriptionOpeningCommand" xml:space="preserve">
+    <value>TODO</value>
+  </data>
+  <data name="RedirectDrives" xml:space="preserve">
+    <value>Disk Drives</value>
+  </data>
+  <data name="RedirectSmartCards" xml:space="preserve">
+    <value>Smart Cards</value>
+  </data>
+  <data name="ApplyInheritanceToChildren" xml:space="preserve">
+    <value>Apply inheritance to children</value>
+  </data>
+  <data name="ApplyDefaultInheritance" xml:space="preserve">
+    <value>Apply default inheritance</value>
   </data>
   <data name="SmartCard" xml:space="preserve">
     <value>SmartCard</value>
   </data>
+  <data name="RemoteDesktopServices" xml:space="preserve">
+    <value>Remote Desktop Services</value>
+  </data>
+  <data name="EC2InstanceId" xml:space="preserve">
+    <value>EC2 Instance Id</value>
+  </data>
+  <data name="EC2Region" xml:space="preserve">
+    <value>EC2 Region</value>
+  </data>
+  <data name="PropertyDescriptionEC2InstanceId" xml:space="preserve">
+    <value>use this instance id to fetch public ip from aws ec2 instance</value>
+  </data>
+  <data name="PropertyDescriptionEC2Region" xml:space="preserve">
+    <value>fetch aws instance info from this region</value>
+  </data>
 </root>

mRemoteNG/Messages/MessageWriters/PopupMessageWriter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Messages.MessageWriters
 {

mRemoteNG/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Resources;
-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.
-
-// Review the values of the assembly attributes
-
-[assembly: AssemblyTitle("mRemoteNG")]
-[assembly: AssemblyDescription("Multi-protocol remote connections manager")]
-[assembly: AssemblyCompany("mRemoteNG")]
-[assembly: AssemblyProduct("mRemoteNG")]
-[assembly: AssemblyCopyright("2020 mRemoteNG Dev Team, 2010-2013 Riley McArdle, 2007-2009 Felix Deimel")]
-[assembly: AssemblyTrademark("")]
-
-[assembly: ComVisible(false)]
-
-//The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("A99669B2-FAEB-11DE-995A-826C56D89593")]
-
-// 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.77.2.*")]
-[assembly: NeutralResourcesLanguage("en")]

mRemoteNG/Properties/Resources.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,13 +13,13 @@ namespace mRemoteNG.Properties {
     
     
     /// <summary>
-    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -33,7 +33,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Add_16x {
             get {
@@ -71,7 +71,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap AddFolder_16x {
             get {
@@ -81,7 +81,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap AddItem_16x {
             get {
@@ -91,7 +91,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap AppearanceEditor_16x {
             get {
@@ -101,7 +101,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ASPWebSite_16x {
             get {
@@ -111,7 +111,18 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap DocumentsFolder_16x
+        {
+            get {
+                object obj = ResourceManager.GetObject("DocumentsFolder_16x", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Close_16x {
             get {
@@ -121,7 +132,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap CloseSolution_16x {
             get {
@@ -131,7 +142,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap CollapseAll_16x {
             get {
@@ -141,7 +152,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ConnectedOverlay {
             get {
@@ -151,7 +162,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Console_16x {
             get {
@@ -161,7 +172,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Copy_16x {
             get {
@@ -171,7 +182,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Diagram_16x {
             get {
@@ -181,7 +192,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Disconnect_16x {
             get {
@@ -191,7 +202,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Document_16x {
             get {
@@ -201,7 +212,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ExpandAll_16x {
             get {
@@ -211,7 +222,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ExpandDown_16x {
             get {
@@ -221,7 +232,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Export_16x {
             get {
@@ -231,7 +242,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ExtendedProperty_16x {
             get {
@@ -241,7 +252,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap F1Help_16x {
             get {
@@ -251,7 +262,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Favorite_16x {
             get {
@@ -261,7 +272,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap FolderClosed_16x {
             get {
@@ -271,7 +282,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap FullScreen_16x {
             get {
@@ -281,7 +292,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap GlyphDown_16x {
             get {
@@ -291,7 +302,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap GlyphLeft_16x {
             get {
@@ -301,7 +312,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap GlyphRight_16x {
             get {
@@ -311,7 +322,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap GlyphUp_16x {
             get {
@@ -321,7 +332,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Header_dark {
             get {
@@ -331,7 +342,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap HostStatus_Check {
             get {
@@ -341,7 +352,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap HostStatus_Off {
             get {
@@ -351,7 +362,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap HostStatus_On {
             get {
@@ -361,7 +372,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap InsertPanel_16x {
             get {
@@ -371,7 +382,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Key_16x {
             get {
@@ -381,7 +392,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Loading_Spinner {
             get {
@@ -391,7 +402,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Lock_16x {
             get {
@@ -401,7 +412,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap LogError_16x {
             get {
@@ -411,7 +422,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap LogWarning_16x {
             get {
@@ -421,7 +432,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Message_16x {
             get {
@@ -431,7 +442,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Monitor_16x {
             get {
@@ -441,7 +452,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
         internal static System.Drawing.Icon mRemoteNG_Icon {
             get {
@@ -451,14 +462,14 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die &lt;Application xmlns:xsi=&apos;http://www.w3.org/2001/XMLSchema-instance&apos;&gt;
+        ///   Looks up a localized string similar to &lt;Application xmlns:xsi=&apos;http://www.w3.org/2001/XMLSchema-instance&apos;&gt;
         ///    &lt;VisualElements
         ///        BackgroundColor=&apos;#343A40&apos;
         ///        ShowNameOnSquare150x150Logo=&apos;on&apos;
         ///        ForegroundText=&apos;light&apos;
         ///        Square150x150Logo=&apos;VisualElements_150.png&apos;
         ///        Square70x70Logo=&apos;VisualElements_70.png&apos; /&gt;
-        ///&lt;/Application&gt; ähnelt.
+        ///&lt;/Application&gt;.
         /// </summary>
         internal static string mRemoteNG_VisualElementsManifest {
             get {
@@ -467,7 +478,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap NewFile_16x {
             get {
@@ -477,7 +488,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap OpenFile_16x {
             get {
@@ -487,7 +498,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Panel_16x {
             get {
@@ -497,7 +508,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Property_16x {
             get {
@@ -507,7 +518,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap PuttyConfig {
             get {
@@ -517,7 +528,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap PuttySessions {
             get {
@@ -527,7 +538,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Refresh_16x {
             get {
@@ -537,7 +548,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Remove_16x {
             get {
@@ -547,7 +558,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Rename_16x {
             get {
@@ -557,7 +568,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Resize_16x {
             get {
@@ -567,7 +578,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Run_16x {
             get {
@@ -577,7 +588,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap RunUpdate_16x {
             get {
@@ -587,7 +598,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Save_16x {
             get {
@@ -597,7 +608,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Schema_16x {
             get {
@@ -607,7 +618,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap SchemaObjectProperty_16x {
             get {
@@ -617,7 +628,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Search_16x {
             get {
@@ -627,7 +638,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap SearchAndApps_16x {
             get {
@@ -637,7 +648,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Settings_16x {
             get {
@@ -647,7 +658,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap SortAscending_16x {
             get {
@@ -657,7 +668,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap SortDescending_16x {
             get {
@@ -667,7 +678,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap SQLDatabase_16x {
             get {
@@ -677,7 +688,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap StartupProject_16x {
             get {
@@ -687,7 +698,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap StatusInformation_16x {
             get {
@@ -697,7 +708,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Stop_16x {
             get {
@@ -707,7 +718,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap SyncArrow_16x {
             get {
@@ -717,7 +728,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Tab_16x {
             get {
@@ -727,7 +738,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap Test_16x {
             get {
@@ -737,7 +748,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ToggleOfficeKeyboardScheme_16x {
             get {
@@ -747,7 +758,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap UIAboutBox_16x {
             get {
@@ -757,7 +768,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap UniqueKeyError_16x {
             get {
@@ -767,7 +778,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ViewDownBySchema_16x {
             get {
@@ -777,7 +788,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap VisualElements_150 {
             get {
@@ -787,7 +798,7 @@ namespace mRemoteNG.Properties {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap VisualElements_70 {
             get {

mRemoteNG/Properties/Resources.resx

@@ -112,12 +112,12 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ConnectedOverlay" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ConnectedOverlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -337,4 +337,7 @@
   <data name="Property_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Property_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="DocumentsFolder_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DocumentsFolder_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

mRemoteNG/Schemas/mremoteng_confcons_v2_7.xsd

@@ -8,167 +8,172 @@
            xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 
-    <xs:element name="Connections">
-        <xs:complexType>
-            <xs:sequence minOccurs="0" maxOccurs="unbounded">
-                <xs:element name="Node" type="mrng:connectioninfo" />
-            </xs:sequence>
-            <xs:attribute name="Name" type="xs:string" use="required" />
-            <xs:attribute name="Export" type="xs:boolean" use="required" />
-            <xs:attribute name="EncryptionEngine" type="xs:string" use="required" />
-            <xs:attribute name="BlockCipherMode" type="xs:string" use="required" />
-            <xs:attribute name="KdfIterations" type="xs:int" use="optional" />
-            <xs:attribute name="FullFileEncryption" type="xs:boolean" use="required" />
-            <xs:attribute name="Protected" type="xs:string" use="required" />
-            <xs:attribute name="ConfVersion" type="xs:float" use="required" />
-        </xs:complexType>
-    </xs:element>
-
-
-    <xs:complexType name="connectioninfo">
-        <xs:sequence minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="Node" type="mrng:connectioninfo" />
-        </xs:sequence>
-        <xs:attribute name="Name" type="xs:string" use="required" />
-        <xs:attribute name="Id" type="xs:string" use="required" />
-        <xs:attribute name="Type" type="xs:string" use="required" />
-        <xs:attribute name="Expanded" type="xs:boolean" use="optional" />
-        <xs:attribute name="Descr" type="xs:string" use="required" />
-        <xs:attribute name="Icon" type="xs:string" use="required" />
-        <xs:attribute name="Panel" type="xs:string" use="required" />
-        <xs:attribute name="Username" type="xs:string" use="required" />
-        <xs:attribute name="Domain" type="xs:string" use="required" />
-        <xs:attribute name="Password" type="xs:string" use="required" />
-        <xs:attribute name="Hostname" type="xs:string" use="required" />
-        <xs:attribute name="Protocol" type="xs:string" use="required" />
-        <xs:attribute name="RdpVersion" type="xs:string" use="required" />
-        <xs:attribute name="VmId" type="xs:string" use="required" />
-        <xs:attribute name="UseVmId" type="xs:boolean" use="required" />
-        <xs:attribute name="UseEnhancedMode" type="xs:boolean" use="required" />
-        <xs:attribute name="SSHTunnelConnectionName" type="xs:string" use="optional" />
-        <xs:attribute name="SSHOptions" type="xs:string" use="optional" />
-        <xs:attribute name="PuttySession" type="xs:string" use="required" />
-        <xs:attribute name="Port" type="xs:int" use="required" />
-        <xs:attribute name="ConnectToConsole" type="xs:boolean" use="required" />
-        <xs:attribute name="UseCredSsp" type="xs:boolean" use="required" />
-        <xs:attribute name="RenderingEngine" type="xs:string" use="required" />
-        <xs:attribute name="RDPAuthenticationLevel" type="xs:string" use="required" />
-        <xs:attribute name="RDPMinutesToIdleTimeout" type="xs:int" use="required" />
-        <xs:attribute name="RDPAlertIdleTimeout" type="xs:boolean" use="required" />
-        <xs:attribute name="LoadBalanceInfo" type="xs:string" use="required" />
-        <xs:attribute name="Colors" type="xs:string" use="required" />
-        <xs:attribute name="Resolution" type="xs:string" use="required" />
-        <xs:attribute name="AutomaticResize" type="xs:boolean" use="required" />
-        <xs:attribute name="DisplayWallpaper" type="xs:boolean" use="required" />
-        <xs:attribute name="DisplayThemes" type="xs:boolean" use="required" />
-        <xs:attribute name="EnableFontSmoothing" type="xs:boolean" use="required" />
-        <xs:attribute name="EnableDesktopComposition" type="xs:boolean" use="required" />
-        <xs:attribute name="DisableFullWindowDrag" type="xs:boolean" use="required" />
-        <xs:attribute name="DisableMenuAnimations" type="xs:boolean" use="required" />
-        <xs:attribute name="DisableCursorShadow" type="xs:boolean" use="required" />
-        <xs:attribute name="DisableCursorBlinking" type="xs:boolean" use="required" />
-        <xs:attribute name="CacheBitmaps" type="xs:boolean" use="required" />
-        <xs:attribute name="RedirectDiskDrives" type="xs:boolean" use="required" />
-        <xs:attribute name="RedirectPorts" type="xs:boolean" use="required" />
-        <xs:attribute name="RedirectPrinters" type="xs:boolean" use="required" />
-        <xs:attribute name="RedirectClipboard" type="xs:boolean" use="required" />
-        <xs:attribute name="RedirectSmartCards" type="xs:boolean" use="required" />
-        <xs:attribute name="RedirectSound" type="xs:string" use="required" />
-        <xs:attribute name="SoundQuality" type="xs:string" use="required" />
-        <xs:attribute name="RedirectAudioCapture" type="xs:boolean" use="required" />
-        <xs:attribute name="RedirectKeys" type="xs:boolean" use="required" />
-        <xs:attribute name="Connected" type="xs:boolean" use="required" />
-        <xs:attribute name="PreExtApp" type="xs:string" use="required" />
-        <xs:attribute name="PostExtApp" type="xs:string" use="required" />
-        <xs:attribute name="MacAddress" type="xs:string" use="required" />
-        <xs:attribute name="UserField" type="xs:string" use="required" />
-        <xs:attribute name="ExtApp" type="xs:string" use="required" />
-        <xs:attribute name="Favorite" type="xs:string" use="required" />
-        <xs:attribute name="VNCCompression" type="xs:string" use="required" />
-        <xs:attribute name="VNCEncoding" type="xs:string" use="required" />
-        <xs:attribute name="VNCAuthMode" type="xs:string" use="required" />
-        <xs:attribute name="VNCProxyType" type="xs:string" use="required" />
-        <xs:attribute name="VNCProxyIP" type="xs:string" use="required" />
-        <xs:attribute name="VNCProxyPort" type="xs:int" use="required" />
-        <xs:attribute name="VNCProxyUsername" type="xs:string" use="required" />
-        <xs:attribute name="VNCProxyPassword" type="xs:string" use="required" />
-        <xs:attribute name="VNCColors" type="xs:string" use="required" />
-        <xs:attribute name="VNCSmartSizeMode" type="xs:string" use="required" />
-        <xs:attribute name="VNCViewOnly" type="xs:boolean" use="required" />
-        <xs:attribute name="RDGatewayUsageMethod" type="xs:string" use="required" />
-        <xs:attribute name="RDGatewayHostname" type="xs:string" use="required" />
-        <xs:attribute name="RDGatewayUseConnectionCredentials" type="xs:string" use="required" />
-        <xs:attribute name="RDGatewayUsername" type="xs:string" use="required" />
-        <xs:attribute name="RDGatewayPassword" type="xs:string" use="required" />
-        <xs:attribute name="RDGatewayDomain" type="xs:string" use="required" />
-        <xs:attribute name="StartProgram" type="xs:string" use="optional" />
-        <xs:attribute name="InheritCredentialRecord" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritCacheBitmaps" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritColors" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDescription" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDisplayThemes" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDisplayWallpaper" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritEnableFontSmoothing" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritEnableDesktopComposition" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDisableFullWindowDrag" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDisableMenuAnimations" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDisableCursorShadow" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDisableCursorBlinking" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritDomain" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritIcon" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritPanel" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritPassword" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritPort" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritProtocol" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRdpVersion" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritSSHTunnelConnectionName" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritSSHOptions" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritPuttySession" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectDiskDrives" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectKeys" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectPorts" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectPrinters" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectClipboard" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectSmartCards" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectSound" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritSoundQuality" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRedirectAudioCapture" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritResolution" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritAutomaticResize" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritUseConsoleSession" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRenderingEngine" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritUsername" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritICAEncryptionStrength" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDPAuthenticationLevel" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDPMinutesToIdleTimeout" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDPAlertIdleTimeout" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritLoadBalanceInfo" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritPreExtApp" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritPostExtApp" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritMacAddress" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritUseCredSsp" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVmId" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritUseVmId" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritUseEnhancedMode" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritUserField" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritExtApp" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritFavorite" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCCompression" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCEncoding" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCAuthMode" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCProxyType" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCProxyIP" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCProxyPort" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCProxyUsername" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCProxyPassword" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCColors" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCSmartSizeMode" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritVNCViewOnly" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDGatewayUsageMethod" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDGatewayHostname" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDGatewayUseConnectionCredentials" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDGatewayUsername" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDGatewayPassword" type="xs:boolean" use="optional" />
-        <xs:attribute name="InheritRDGatewayDomain" type="xs:boolean" use="optional" />
+  <xs:element name="Connections">
+    <xs:complexType>
+      <xs:sequence minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="Node" type="mrng:connectioninfo" />
+      </xs:sequence>
+      <xs:attribute name="Name" type="xs:string" use="required" />
+      <xs:attribute name="Export" type="xs:boolean" use="required" />
+      <xs:attribute name="EncryptionEngine" type="xs:string" use="required" />
+      <xs:attribute name="BlockCipherMode" type="xs:string" use="required" />
+      <xs:attribute name="KdfIterations" type="xs:int" use="optional" />
+      <xs:attribute name="FullFileEncryption" type="xs:boolean" use="required" />
+      <xs:attribute name="Protected" type="xs:string" use="required" />
+      <xs:attribute name="ConfVersion" type="xs:float" use="required" />
     </xs:complexType>
+  </xs:element>
+
+
+  <xs:complexType name="connectioninfo">
+    <xs:sequence minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="Node" type="mrng:connectioninfo" />
+    </xs:sequence>
+    <xs:attribute name="Name" type="xs:string" use="required" />
+    <xs:attribute name="Id" type="xs:string" use="required" />
+    <xs:attribute name="Type" type="xs:string" use="required" />
+    <xs:attribute name="Expanded" type="xs:boolean" use="optional" />
+    <xs:attribute name="Descr" type="xs:string" use="required" />
+    <xs:attribute name="Icon" type="xs:string" use="required" />
+    <xs:attribute name="Panel" type="xs:string" use="required" />
+    <xs:attribute name="Username" type="xs:string" use="required" />
+    <xs:attribute name="Domain" type="xs:string" use="required" />
+    <xs:attribute name="Password" type="xs:string" use="required" />
+    <xs:attribute name="Hostname" type="xs:string" use="required" />
+    <xs:attribute name="Protocol" type="xs:string" use="required" />
+    <xs:attribute name="RdpVersion" type="xs:string" use="required" />
+    <xs:attribute name="VmId" type="xs:string" use="required" />
+    <xs:attribute name="UseVmId" type="xs:boolean" use="required" />
+    <xs:attribute name="UseEnhancedMode" type="xs:boolean" use="required" />
+    <xs:attribute name="SSHTunnelConnectionName" type="xs:string" use="optional" />
+    <xs:attribute name="SSHOptions" type="xs:string" use="optional" />
+    <xs:attribute name="PuttySession" type="xs:string" use="required" />
+    <xs:attribute name="Port" type="xs:int" use="required" />
+    <xs:attribute name="ConnectToConsole" type="xs:boolean" use="required" />
+    <xs:attribute name="UseCredSsp" type="xs:boolean" use="required" />
+    <xs:attribute name="RenderingEngine" type="xs:string" use="required" />
+    <xs:attribute name="RDPAuthenticationLevel" type="xs:string" use="required" />
+    <xs:attribute name="RDPMinutesToIdleTimeout" type="xs:int" use="required" />
+    <xs:attribute name="RDPAlertIdleTimeout" type="xs:boolean" use="required" />
+    <xs:attribute name="LoadBalanceInfo" type="xs:string" use="required" />
+    <xs:attribute name="Colors" type="xs:string" use="required" />
+    <xs:attribute name="Resolution" type="xs:string" use="required" />
+    <xs:attribute name="AutomaticResize" type="xs:boolean" use="required" />
+    <xs:attribute name="DisplayWallpaper" type="xs:boolean" use="required" />
+    <xs:attribute name="DisplayThemes" type="xs:boolean" use="required" />
+    <xs:attribute name="EnableFontSmoothing" type="xs:boolean" use="required" />
+    <xs:attribute name="EnableDesktopComposition" type="xs:boolean" use="required" />
+    <xs:attribute name="DisableFullWindowDrag" type="xs:boolean" use="required" />
+    <xs:attribute name="DisableMenuAnimations" type="xs:boolean" use="required" />
+    <xs:attribute name="DisableCursorShadow" type="xs:boolean" use="required" />
+    <xs:attribute name="DisableCursorBlinking" type="xs:boolean" use="required" />
+    <xs:attribute name="CacheBitmaps" type="xs:boolean" use="required" />
+    <xs:attribute name="RedirectDiskDrives" type="xs:boolean" use="required" />
+    <xs:attribute name="RedirectPorts" type="xs:boolean" use="required" />
+    <xs:attribute name="RedirectPrinters" type="xs:boolean" use="required" />
+    <xs:attribute name="RedirectClipboard" type="xs:boolean" use="required" />
+    <xs:attribute name="RedirectSmartCards" type="xs:boolean" use="required" />
+    <xs:attribute name="RedirectSound" type="xs:string" use="required" />
+    <xs:attribute name="SoundQuality" type="xs:string" use="required" />
+    <xs:attribute name="RedirectAudioCapture" type="xs:boolean" use="required" />
+    <xs:attribute name="RedirectKeys" type="xs:boolean" use="required" />
+    <xs:attribute name="Connected" type="xs:boolean" use="required" />
+    <xs:attribute name="PreExtApp" type="xs:string" use="required" />
+    <xs:attribute name="PostExtApp" type="xs:string" use="required" />
+    <xs:attribute name="MacAddress" type="xs:string" use="required" />
+    <xs:attribute name="UserField" type="xs:string" use="required" />
+    <xs:attribute name="ExtApp" type="xs:string" use="required" />
+    <xs:attribute name="Favorite" type="xs:string" use="required" />
+    <xs:attribute name="VNCCompression" type="xs:string" use="required" />
+    <xs:attribute name="VNCEncoding" type="xs:string" use="required" />
+    <xs:attribute name="VNCAuthMode" type="xs:string" use="required" />
+    <xs:attribute name="VNCProxyType" type="xs:string" use="required" />
+    <xs:attribute name="VNCProxyIP" type="xs:string" use="required" />
+    <xs:attribute name="VNCProxyPort" type="xs:int" use="required" />
+    <xs:attribute name="VNCProxyUsername" type="xs:string" use="required" />
+    <xs:attribute name="VNCProxyPassword" type="xs:string" use="required" />
+    <xs:attribute name="VNCColors" type="xs:string" use="required" />
+    <xs:attribute name="VNCSmartSizeMode" type="xs:string" use="required" />
+    <xs:attribute name="VNCViewOnly" type="xs:boolean" use="required" />
+    <xs:attribute name="RDGatewayUsageMethod" type="xs:string" use="required" />
+    <xs:attribute name="RDGatewayHostname" type="xs:string" use="required" />
+    <xs:attribute name="RDGatewayUseConnectionCredentials" type="xs:string" use="required" />
+    <xs:attribute name="RDGatewayUsername" type="xs:string" use="required" />
+    <xs:attribute name="RDGatewayPassword" type="xs:string" use="required" />
+    <xs:attribute name="RDGatewayDomain" type="xs:string" use="required" />
+    <xs:attribute name="InheritCredentialRecord" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritCacheBitmaps" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritColors" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDescription" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDisplayThemes" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDisplayWallpaper" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritEnableFontSmoothing" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritEnableDesktopComposition" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDisableFullWindowDrag" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDisableMenuAnimations" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDisableCursorShadow" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDisableCursorBlinking" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritDomain" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritIcon" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritPanel" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritPassword" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritPort" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritProtocol" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRdpVersion" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritSSHTunnelConnectionName" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritSSHOptions" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritPuttySession" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectDiskDrives" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectKeys" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectPorts" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectPrinters" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectClipboard" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectSmartCards" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectSound" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritSoundQuality" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRedirectAudioCapture" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritResolution" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritAutomaticResize" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUseConsoleSession" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRenderingEngine" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUsername" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritICAEncryptionStrength" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDPAuthenticationLevel" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDPMinutesToIdleTimeout" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDPAlertIdleTimeout" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritLoadBalanceInfo" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritPreExtApp" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritPostExtApp" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritMacAddress" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUseCredSsp" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVmId" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUseVmId" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUseEnhancedMode" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritUserField" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritExtApp" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritFavorite" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCCompression" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCEncoding" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCAuthMode" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCProxyType" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCProxyIP" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCProxyPort" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCProxyUsername" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCProxyPassword" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCColors" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCSmartSizeMode" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritVNCViewOnly" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDGatewayUsageMethod" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDGatewayHostname" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDGatewayUseConnectionCredentials" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDGatewayUsername" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDGatewayPassword" type="xs:boolean" use="optional" />
+    <xs:attribute name="InheritRDGatewayDomain" type="xs:boolean" use="optional" />
+    <xs:attribute name="StartProgram" type="xs:string" use="optional" />
+    <xs:attribute name="StartProgramWorkDir" type="xs:string" use="optional" />
+    <xs:attribute name="OpeningCommand" type="xs:string" use="optional" />
+    <xs:attribute name="UserViaAPI" type="xs:string" use="optional" />
+    <xs:attribute name="EC2InstanceId" type="xs:string" use="optional" />
+    <xs:attribute name="EC2Region" type="xs:string" use="optional" />
+  </xs:complexType>
 </xs:schema>

mRemoteNG/Security/PasswordCreation/PasswordIncludesLowerCaseConstraint.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Security;
 using System.Text.RegularExpressions;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Security.PasswordCreation
 {

mRemoteNG/Security/PasswordCreation/PasswordIncludesNumbersConstraint.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Security;
 using System.Text.RegularExpressions;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Security.PasswordCreation
 {

mRemoteNG/Security/PasswordCreation/PasswordIncludesSpecialCharactersConstraint.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Security;
 using System.Text.RegularExpressions;
+using mRemoteNG.Resources.Language;
 
 
 namespace mRemoteNG.Security.PasswordCreation

mRemoteNG/Security/PasswordCreation/PasswordIncludesUpperCaseConstraint.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Security;
 using System.Text.RegularExpressions;
+using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.Security.PasswordCreation
 {