Merge pull request #1662 from GreyCorbel/release/v1.76

Added support for password retrieval via AdmPwd.E 7.7.1

.gitignore

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

CREDITS.TXT

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

CREDITS.md

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

InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs

@@ -3,10 +3,10 @@
 	<Fragment>
     <ComponentGroup Id="CG.ProjectInfoFiles" Directory="INSTALLDIR">
       <Component Id="C.Changelog" Guid="*">
-        <File Id="ChangelogFile" Name="Changelog.txt" Source="$(var.SolutionDir)CHANGELOG.md" KeyPath="yes" />
+        <File Id="ChangelogFile" Name="Changelog.txt" Source="$(var.SolutionDir)CHANGELOG.TXT" KeyPath="yes" />
       </Component>
       <Component Id="C.Credits" Guid="*">
-        <File Id="CreditsFile" Name="Credits.txt" Source="$(var.SolutionDir)CREDITS.md" KeyPath="yes" />
+        <File Id="CreditsFile" Name="Credits.txt" Source="$(var.SolutionDir)CREDITS.TXT" KeyPath="yes" />
       </Component>
       <Component Id="C.License" Guid="*">
         <File Id="LicenseFile" Name="License.txt" Source="$(var.SolutionDir)COPYING.TXT" KeyPath="yes" />
@@ -14,9 +14,6 @@
       <Component Id="C.Readme" Guid="*">
         <File Id="ReadmeFile" Name="Readme.txt" Source="$(var.SolutionDir)README.TXT" KeyPath="yes" />
       </Component>
-      <Component Id="C.TileManifest" Guid="*">
-        <File Id="TileManifest" Name="mRemoteNG.VisualElementsManifest.xml" Source="$(var.SolutionDir)mRemoteV1\bin\Release\mRemoteNG.VisualElementsManifest.xml" KeyPath="yes" />
-      </Component>
     </ComponentGroup>
 	</Fragment>
 </Wix>

InstallerProjects/Installer/Fragments/ShortcutFragment.wxs

@@ -5,14 +5,14 @@
     
     <DirectoryRef Id="DesktopFolder">
       <Component Id="C.DesktopShortcut" Guid="F78E5A16-A2F7-4BD9-9250-CBF3016CCCDA">
-        <Shortcut Id="DesktopShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="AppIcon.ico" />
+        <Shortcut Id="DesktopShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="mRemoteNG.ico" />
         <RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="DesktopShortcut" Type="integer" Value="1" KeyPath="yes" />
       </Component>
     </DirectoryRef>
     
     <DirectoryRef Id="ApplicationProgramsFolder">
       <Component Id="C.ApplicationStartMenuShortcut" Guid="193B9E14-F40E-44F1-8514-BED253BCBF75">
-        <Shortcut Id="ApplicationStartMenuShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="AppIcon.ico" />
+        <Shortcut Id="ApplicationStartMenuShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="mRemoteNG.ico" />
         <Shortcut Id="CreditsShortcut" Name="Credits" Target="[INSTALLDIR]Credits.txt" WorkingDirectory="INSTALLDIR" />
         <Shortcut Id="LicenseShortcut" Name="License" Target="[INSTALLDIR]License.txt" WorkingDirectory="INSTALLDIR" />
         <Shortcut Id="ReadmeShortcut" Name="Readme" Target="[INSTALLDIR]Readme.txt" WorkingDirectory="INSTALLDIR" />

InstallerProjects/Installer/Installer.wixproj

@@ -41,10 +41,10 @@
   <ItemGroup>
     <Content Include="Filters\Harvest_Filter.xslt" />
     <Content Include="Includes\Config.wxi" />
-    <Content Include="Resources\AppIcon.ico" />
-    <Content Include="Resources\Installer_Header.png" />
-    <Content Include="Resources\Installer_Side.png" />
+    <Content Include="Resources\header.bmp" />
     <Content Include="Resources\License.rtf" />
+    <Content Include="Resources\mRemoteNG.ico" />
+    <Content Include="Resources\welcome.bmp" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="CustomActions" />
@@ -57,6 +57,10 @@
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Localizations\ru-RU.wxl" />
+    <EmbeddedResource Include="Localizations\ja-JP.wxl" />
+    <EmbeddedResource Include="Localizations\cs-CZ.wxl" />
+    <EmbeddedResource Include="Localizations\de-DE.wxl" />
     <EmbeddedResource Include="Localizations\en-US.wxl" />
   </ItemGroup>
   <ItemGroup>
@@ -110,6 +114,21 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
     <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>:: When passing paths to powershell scripts, check if the path ends with a backslash "\"
+:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.
+
+powershell -noprofile -command "sleep 2"
+set /p buildenv=&lt;buildenv.tmp
+set solutionDir=$(SolutionDir)\
+set targetDir=%25cd%25
+set psScriptsDir=$(SolutionDir)Tools
+set certPath=$(CertPath)
+set certPassword=$(CertPassword)
+
+:: Call the post build powershell script
+powershell.exe -ExecutionPolicy Bypass -File "%25psScriptsDir%25\postbuild_installer.ps1" -SolutionDir "%25solutionDir%25" -TargetDir "%25targetDir%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "%25certPath%25" -CertificatePassword "%25certPassword%25"</PostBuildEvent>
+  </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>REM Clean the TargetDir
 rmdir /S /Q "$(TargetDir)"
@@ -122,18 +141,4 @@ REM Harvest bin directory of the mRemoteV1 project
 REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
 "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
   </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>:: When passing paths to powershell scripts, check if the path ends with a backslash "\"
-:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.
-
-powershell -noprofile -command "sleep 2"
-
-set /p buildenv=&lt;buildenv.tmp
-
-:: Manual builds, set the cert password and uncomment below.
-:: IF "%25APPVEYOR_BUILD_FOLDER"=="" ( set cert_pwd=  )
-
-:: Call the post build powershell script
-powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_installer.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "%25cd%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe"</PostBuildEvent>
-  </PropertyGroup>
 </Project>

InstallerProjects/Installer/Localizations/cs-CZ.wxl

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

InstallerProjects/Installer/Localizations/de-DE.wxl

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

InstallerProjects/Installer/Localizations/en-US.wxl

@@ -22,6 +22,6 @@
   <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
   
   <!-- GUI Page Text -->
-  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch mRemoteNG now</String>
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch mRemoteNG Now</String>
   
 </WixLocalization>

InstallerProjects/Installer/Localizations/ja-JP.wxl

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

InstallerProjects/Installer/Localizations/ru-RU.wxl

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

InstallerProjects/Installer/Resources/License.rtf

@@ -1,329 +0,0 @@
-{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f4\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Helvetica;}
-{\f5\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070409020205020404}Courier;}{\f5\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070409020205020404}Courier;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
-{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
-{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f40\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f41\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\f43\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f44\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f45\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f46\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\f47\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f48\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f80\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;}{\f81\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}
-{\f83\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f84\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f85\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f86\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}
-{\f87\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f88\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}
-{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}
-{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
-{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
-{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
-{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
-\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 
-\ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused 
-Normal Table;}}{\*\rsidtbl \rsid472762\rsid14623029}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\operator Faryan Rezagholi}{\creatim\yr2019\mo4\dy25\hr3\min56}
-{\revtim\yr2019\mo4\dy25\hr3\min57}{\version2}{\edmins1}{\nofpages5}{\nofwords2221}{\nofchars12664}{\nofcharsws14856}{\vern97}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
-\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
-\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701
-\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot14623029 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2
-\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6
-\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang 
-{\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {
-\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5         GNU GENERAL PUBLIC LICENSE\line            Version 2, June 1991
-\par }{\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-\par }{\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5             Preamble
-\par }{\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all it
-\hich\af4\dbch\af31505\loch\f4 s\hich\af4\dbch\af31505\loch\f4 
- users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License ins
-\hich\af4\dbch\af31505\loch\f4 t\hich\af4\dbch\af31505\loch\f4 ead.) You can apply it to your programs, too.
-\par \hich\af4\dbch\af31505\loch\f4 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this
-\hich\af4\dbch\af31505\loch\f4  service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-\par \hich\af4\dbch\af31505\loch\f4 To protect your rights, we need to make restrictions tha\hich\af4\dbch\af31505\loch\f4 
-t forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-\par \hich\af4\dbch\af31505\loch\f4 For example, if you distribute copies of such a \hich\af4\dbch\af31505\loch\f4 
-program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-\par \hich\af4\dbch\af31505\loch\f4 We protect your rights wit\hich\af4\dbch\af31505\loch\f4 h two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-\par \hich\af4\dbch\af31505\loch\f4 Also, for each author's protection and ours, we want to make certain that everyone understands that the\hich\af4\dbch\af31505\loch\f4 
-re is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors
-\hich\af4\dbch\af31505\loch\f4 '\hich\af4\dbch\af31505\loch\f4  reputations.
-\par \hich\af4\dbch\af31505\loch\f4 
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we 
-\hich\af4\dbch\af31505\loch\f4 have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-\par \hich\af4\dbch\af31505\loch\f4 The precise terms and conditions for copying, distribution and modification follow.
-\par }{\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5         GNU GENERAL PUBLIC LICENSE
-\par }{\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 TERMS AND CONDITIONS FOR COPYING, DIS\hich\af4\dbch\af31505\loch\f4 TRIBUTION AND MODIFICATION
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 0.\tab \hich\af4\dbch\af31505\loch\f4 
-This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such pro
-\hich\af4\dbch\af31505\loch\f4 
-gram or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another lan
-\hich\af4\dbch\af31505\loch\f4 g\hich\af4\dbch\af31505\loch\f4 uage. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The a\hich\af4\dbch\af31505\loch\f4 
-ct of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program 
-\hich\af4\dbch\af31505\loch\f4 d\hich\af4\dbch\af31505\loch\f4 oes.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 1.\tab 
-You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intac
-\hich\af4\dbch\af31505\loch\f4 t all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 You may charge a fee for the physical act of transferring a copy, and you may at yo
-\hich\af4\dbch\af31505\loch\f4 ur option offer warranty protection in exchange for a fee.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 2.\tab 
-You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 \hich\af4\dbch\af31505\loch\f4 
-above, provided that you also meet all of these conditions:
-\par }\pard \ltrpar\ql \fi-360\li720\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 a)\tab 
-You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-\par \hich\af4\dbch\af31505\loch\f4 b)\tab You must cause any work that you distribute or publish, that in wh\hich\af4\dbch\af31505\loch\f4 
-ole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-\par \hich\af4\dbch\af31505\loch\f4 c)\tab If the modified program normally reads commands interactively when run, you must cau\hich\af4\dbch\af31505\loch\f4 
-se it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that user
-\hich\af4\dbch\af31505\loch\f4 s\hich\af4\dbch\af31505\loch\f4 
- may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not require
-\hich\af4\dbch\af31505\loch\f4 d\hich\af4\dbch\af31505\loch\f4  to print an announcement.)
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, 
-\hich\af4\dbch\af31505\loch\f4 
-and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License
-,\hich\af4\dbch\af31505\loch\f4  whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-\par \hich\af4\dbch\af31505\loch\f4 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the in\hich\af4\dbch\af31505\loch\f4 
-tent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-\par \hich\af4\dbch\af31505\loch\f4 In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a\hich\af4\dbch\af31505\loch\f4 
- storage or distribution medium does not bring the other work under the scope of this License.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 3.\tab 
-You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sect\hich\af4\dbch\af31505\loch\f4 ions 1 and 2 above provided that you also do one of the following:
-\par }\pard \ltrpar\ql \fi-360\li720\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin720\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 a)\tab 
-Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software i\hich\af4\dbch\af31505\loch\f4 nterchange; or,
-\par \hich\af4\dbch\af31505\loch\f4 b)\tab 
-Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source co
-\hich\af4\dbch\af31505\loch\f4 de, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-\par \hich\af4\dbch\af31505\loch\f4 c)\tab Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allow\hich\af4\dbch\af31505\loch\f4 
-ed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-The source code for a work means the preferred form of the work for making modifications t\hich\af4\dbch\af31505\loch\f4 
-o it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a specia
-\hich\af4\dbch\af31505\loch\f4 l\hich\af4\dbch\af31505\loch\f4 
- exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that comp
-\hich\af4\dbch\af31505\loch\f4 o\hich\af4\dbch\af31505\loch\f4 nent itself accompanies the executable.
-\par \hich\af4\dbch\af31505\loch\f4 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the sourc
-\hich\af4\dbch\af31505\loch\f4 e code, even though third parties are not compelled to copy the source along with the object code.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 4.\tab 
-You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, su\hich\af4\dbch\af31505\loch\f4 
-blicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties 
-\hich\af4\dbch\af31505\loch\f4 r\hich\af4\dbch\af31505\loch\f4 emain in full compliance.
-\par \hich\af4\dbch\af31505\loch\f4 5.\tab 
-You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do n
-\hich\af4\dbch\af31505\loch\f4 
-ot accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or w
-\hich\af4\dbch\af31505\loch\f4 o\hich\af4\dbch\af31505\loch\f4 rks based on it.
-\par \hich\af4\dbch\af31505\loch\f4 6.\tab 
-Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You ma
-\hich\af4\dbch\af31505\loch\f4 y not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-\par \hich\af4\dbch\af31505\loch\f4 7.\tab If, as a consequence of a court judgment or allegation of patent infringem\hich\af4\dbch\af31505\loch\f4 
-ent or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you c
-\hich\af4\dbch\af31505\loch\f4 a\hich\af4\dbch\af31505\loch\f4 
-nnot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redist
-\hich\af4\dbch\af31505\loch\f4 r\hich\af4\dbch\af31505\loch\f4 
-ibution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 If any portion of this section is held in\hich\af4\dbch\af31505\loch\f4 
-valid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-\par \hich\af4\dbch\af31505\loch\f4 It is not the purpose of this section to induce you to infringe any patents or\hich\af4\dbch\af31505\loch\f4 
- other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generou
-\hich\af4\dbch\af31505\loch\f4 s\hich\af4\dbch\af31505\loch\f4 
- contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a license
-\hich\af4\dbch\af31505\loch\f4 e\hich\af4\dbch\af31505\loch\f4  cannot impose that choice.
-\par \hich\af4\dbch\af31505\loch\f4 This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 8.\tab 
-If the distribution and/or use of the Program is restricted in certain countries either by patents or by copy\hich\af4\dbch\af31505\loch\f4 
-righted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded.
-\hich\af4\dbch\af31505\loch\f4  \hich\af4\dbch\af31505\loch\f4 In such case, this License incorporates the limitation as if written in the body of this License.
-\par \hich\af4\dbch\af31505\loch\f4 9.\tab The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in \hich\af4\dbch\af31505\loch\f4 
-spirit to the present version, but may differ in detail to address new problems or concerns.
-\par }\pard \ltrpar\ql \li0\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you h\hich\af4\dbch\af31505\loch\f4 
-ave the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by t
-\hich\af4\dbch\af31505\loch\f4 h\hich\af4\dbch\af31505\loch\f4 e Free Software Foundation.
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 10.\tab 
-If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundati\hich\af4\dbch\af31505\loch\f4 
-on, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software general
-\hich\af4\dbch\af31505\loch\f4 l\hich\af4\dbch\af31505\loch\f4 y.
-\par }\pard \ltrpar\ql \li360\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5         NO WARRANTY
-\par }\pard \ltrpar\ql \fi-360\li360\ri0\sa180\widctlpar\tx360\wrapdefault\faauto\rin0\lin360\itap0 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 \hich\af4\dbch\af31505\loch\f4 11.\tab 
-BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGR
-\hich\af4\dbch\af31505\loch\f4 
-AM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH Y
-\hich\af4\dbch\af31505\loch\f4 O\hich\af4\dbch\af31505\loch\f4 U. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-\par \hich\af4\dbch\af31505\loch\f4 12.\tab IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDIS\hich\af4\dbch\af31505\loch\f4 
-TRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDE
-\hich\af4\dbch\af31505\loch\f4 R\hich\af4\dbch\af31505\loch\f4 
-ED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-\par }\pard \ltrpar\ql \li360\ri0\sa180\widctlpar\wrapdefault\faauto\rin0\lin360\itap0\pararsid14623029 {\rtlch\fcs1 \af5\afs24 \ltrch\fcs0 \f5\fs24\insrsid472762 \hich\af5\dbch\af31505\loch\f5      END OF TERMS AND CONDITIONS\line \line }{\rtlch\fcs1 
-\af4\afs24 \ltrch\fcs0 \f4\fs24\insrsid472762 
-\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
-9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
-5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
-b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
-0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
-a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
-c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
-0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
-a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
-6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
-4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
-4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210007b740aaca0600008f1a0000160000007468656d652f7468656d652f
-7468656d65312e786d6cec595b8bdb46147e2ff43f08bd3bbe49be2cf1065bb69336bb49889d943cceda636bb2238dd18c776342a0244f7d2914d2d28706fad6
-87521a68a0a12ffd310b1bdaf447f4cc489667ec71f6420aa1640d8b34face996fce39face48ba7aed51449d239c70c2e2965bbe52721d1c8fd898c4d3967b6f
-d82f345c870b148f1165316eb90bccdd6bbb9f7e7215ed881047d801fb98efa0961b0a31db2916f9088611bfc26638866b13964448c069322d8e13740c7e235a
-ac944ab5628448ec3a318ac0ededc9848cb033942edddda5f31e85d358703930a2c940bac68685c28e0fcb12c1173ca089738468cb8579c6ec78881f09d7a188
-0bb8d0724beacf2dee5e2da29dcc888a2db69a5d5ffd657699c1f8b0a2e64ca607f9a49ee77bb576ee5f01a8d8c4f5eabd5aaf96fb5300341ac14a532eba4fbf
-d3ec74fd0cab81d2438bef6ebd5b2d1b78cd7f758373db973f03af40a97f6f03dfef07104503af4029dedfc07b5ebd1278065e81527c6d035f2fb5bb5eddc02b
-5048497cb8812ef9b56ab05c6d0e99307ac30a6ffa5ebf5ec99caf50500d7975c929262c16db6a2d420f59d2078004522448ec88c50c4fd008aa3840941c24c4
-d923d3100a6f8662c661b85429f54b55f82f7f9e3a5211413b1869d6921730e11b43928fc34709998996fb39787535c8e9ebd7274f5f9d3cfdfde4d9b393a7bf
-66732b5786dd0d144f75bbb73f7df3cf8b2f9dbf7ffbf1edf36fd3a9d7f15cc7bff9e5ab377ffcf92ef7b0e255284ebf7bf9e6d5cbd3efbffeebe7e716efed04
-1de8f0218930776ee163e72e8b608116fef820b998c5304444b768c7538e622467b1f8ef89d040df5a208a2cb80e36e3783f01a9b101afcf1f1a8407613217c4
-e2f1661819c07dc6688725d628dc947369611ecee3a97df264aee3ee2274649b3b40b191e5de7c061a4b6c2e83101b34ef50140b34c531168ebcc60e31b6acee
-0121465cf7c928619c4d84f380381d44ac21199203a39a56463748047959d80842be8dd8ecdf773a8cda56ddc5472612ee0d442de487981a61bc8ee602453697
-4314513de07b48843692834532d2713d2e20d3534c99d31b63ce6d36b71358af96f49b2033f6b4efd345642213410e6d3ef710633ab2cb0e831045331b7640e2
-50c77ec60fa144917387091b7c9f9977883c873ca0786bbaef136ca4fb6c35b8070aab535a1588bc324f2cb9bc8e9951bf83059d20aca4061a80a1eb1189cf14
-f93579f7ff3b7907113dfde1856545ef47d2ed8e8d7c5c50ccdb09b1de4d37d6247c1b6e5db803968cc987afdb5d348fef60b855369bd747d9fe28dbeeff5eb6
-b7ddcfef5fac57fa0cd22db7ade9765d6ddea3ad7bf709a174201614ef71b57de7d095c67d189476eab915e7cf72b3100ee59d0c1318b86982948d9330f10511
-e1204433d8e3975de964ca33d753eecc1887adbf1ab6fa96783a8ff6d9387d642d97e5e3692a1e1c89d578c9cfc7e17143a4e85a7df51896bb576ca7ea717949
-40da5e8484369949a26a21515f0eca20a98773089a85845ad97b61d1b4b06848f7cb546db0006a795660dbe4c066abe5fa1e9880113c55218ac7324f69aa97d9
-55c97c9f99de164ca302600fb1ac8055a69b92ebd6e5c9d5a5a5768e4c1b24b4723349a8c8a81ec64334c65975cad1f3d0b868ae9bab941af46428d47c505a2b
-1af5c6bb585c36d760b7ae0d34d69582c6ce71cbad557d2899119ab5dc093cfac3613483dae172bb8be814de9f8d4492def097519659c24517f1300db8129d54
-0d222270e25012b55cb9fc3c0d34561aa2b8952b20081f2cb926c8ca87460e926e26194f267824f4b46b2332d2e929287caa15d6abcafcf26069c9e690ee4138
-3e760ee83cb98ba0c4fc7a5906704c38bc012aa7d11c1378a5990bd9aafed61a5326bbfa3b455543e938a2b310651d4517f314aea43ca7a3cef2186867d99a21
-a05a48b2467830950d560faad14df3ae9172d8da75cf369291d34473d5330d55915dd3ae62c60ccb36b016cbcb35798dd532c4a0697a874fa57b5d729b4bad5b
-db27e45d02029ec7cfd275cfd110346aabc90c6a92f1a60c4bcdce46cddeb15ce019d4ced32434d5af2dddaec52def11d6e960f0529d1fecd6ab168626cb7da5
-8ab4faf6a17f9e60070f413cbaf022784e0557a9848f0f09820dd140ed4952d9805be491c86e0d3872e60969b98f4b7edb0b2a7e502835fc5ec1ab7aa542c36f
-570b6ddfaf967b7eb9d4ed549e4063116154f6d3ef2e7d780d4517d9d71735bef105265abe69bb32625191a92f2c45455c7d812957b67f81710888cee35aa5df
-ac363bb542b3daee17bc6ea7516806b54ea15b0beadd7e37f01bcdfe13d7395260af5d0dbc5aaf51a89583a0e0d54a927ea359a87b954adbabb71b3daffd24db
-c6c0ca53f9c86201e155bc76ff050000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d652f5f72
-656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c08
-2e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd0
-8a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa
-4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000000000000000000000005b436f
-6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000300100005f72
-656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468656d652f746865
-6d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210007b740aaca0600008f1a00001600000000000000000000000000d60200
-007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000000000000000000000
-00d40900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000cf0a00000000}
-{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
-617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
-6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
-656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
-{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
-\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;
-\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;
-\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;
-\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;
-\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;
-\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;
-\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;
-\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;
-\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
-\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;
-\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;
-\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
-\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;
-\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;
-\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
-\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;
-\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;
-\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
-\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
-\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
-\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
-\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
-\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
-\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
-\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
-\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
-\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
-\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
-\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
-\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
-\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
-\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
-\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
-\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
-\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
-\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
-\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
-\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
-\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000
-4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
-d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000030c4
-1a380afbd401feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000105000000000000}}

InstallerProjects/Installer/mRemoteNGV1.wxs

@@ -11,7 +11,7 @@
     <MediaTemplate EmbedCab="yes" />
     <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)InstallerProjects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
     <Property Id="MsiLogging" Value="v" />
-    <Property Id="ARPPRODUCTICON" Value="AppIcon.ico" />
+    <Property Id="ARPPRODUCTICON" Value="mRemoteNG.ico" />
     <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
     <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize" />
     <Property Id="MAINEXE" Value="$(var.ExeProcessName)" />
@@ -27,7 +27,7 @@
     <Property Id='LEGACYVERSIONINSTALLED' Value='0' />
     <PropertyRef Id="NETFRAMEWORK40FULL" />
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
-    <Icon Id="AppIcon.ico" SourceFile="Resources\AppIcon.ico" />
+    <Icon Id="mRemoteNG.ico" SourceFile="Resources\mRemoteNG.ico" />
     <CustomActionRef Id='SaveCmdlineINSTALLDIR' />
 
 
@@ -106,8 +106,8 @@
     </UI>
     
     <WixVariable Id="WixUILicenseRtf" Value="Resources\License.rtf" />
-    <WixVariable Id="WixUIDialogBmp" Value="Resources\Installer_Side.png" />
-    <WixVariable Id="WixUIBannerBmp" Value="Resources\Installer_Header.png" />
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\welcome.bmp" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\header.bmp" />
     
     <!-- Provide option to run app after install -->
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.FinishPage_LaunchMremoteNow)" />

README.MD

@@ -4,15 +4,15 @@
 [![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat)
 [![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer)
 
-[![Github Releases](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/total.svg?style=flat-square)](https://github.com/mRemoteNG/mRemoteNG/releases/)
-
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)
 
+[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG)
+
 | Update Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
-| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
-| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
-| Development | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.15/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.15) |
+| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7012/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7012) |
+| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7012/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7012) |
+| Development | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76Alpha5/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76Alpha5) |
 
 mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
 
@@ -54,6 +54,6 @@ If you find mRemoteNG useful and would like to contribute, it would be greatly a
 Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/Development) on how to configure your development environment and submit a pull request.
 
 ### Translate
-Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/How%20to%20Help%20Translating%20mRemoteNG) on how to help make mRemoteNG a polyglot
+Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/How%20to%20Help%20Translating%20mRemoteNG) on how to help make mRemoteNG a polygot
 
 [![Developed with ReSharper](https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/.github/icon_ReSharper.png)](https://www.jetbrains.com/resharper/)

Tools/CreateBulkConnections_ConfCons2_6.ps1

@@ -1,208 +1,60 @@
 #####################################
-# Authors: David Sparer & Jack Denton
-# Summary:
+# Author: David Sparer
+# Summary: 
 #   This is intended to be a template for creating connections in bulk. This uses the serializers directly from the mRemoteNG binaries.
 #   You will still need to create the connection info objects, but the library will handle serialization. It is expected that you
 #   are familiar with PowerShell. If this is not the case, reach out to the mRemoteNG community for help.
 # Usage:
-#   Replace or modify the examples that are shown toward the end of the script to create your own connection info objects.
+#   Replace or modify the examples that are shown toward the end of the script to create your own connection info objects. 
 #####################################
 
-foreach ($Path in 'HKLM:\SOFTWARE\WOW6432Node\mRemoteNG', 'HKLM:\SOFTWARE\mRemoteNG') {
-    Try {
-        $mRNGPath = (Get-ItemProperty -Path $Path -Name InstallDir -ErrorAction Stop).InstallDir
-        break
-    }
-    Catch {
-        continue
-    }
-}
-if (!$mRNGPath) {
-    Add-Type -AssemblyName System.Windows.Forms
-    $FolderBrowser = [System.Windows.Forms.FolderBrowserDialog]@{
-        Description         = 'Please select the folder which contains mRemoteNG.exe'
-        ShowNewFolderButton = $false
-    }
-    
-    $Response = $FolderBrowser.ShowDialog()
-    
-    if ($Response.value__ -eq 1) {
-        $mRNGPath = $FolderBrowser.SelectedPath
-    }
-    elseif ($Response.value__ -eq 2) {
-        Write-Warning 'A folder containing mRemoteNG.exe has not been selected'
-        return
-    }
-}
-$null = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $mRNGPath -ChildPath "mRemoteNG.exe"))
-Add-Type -Path (Join-Path -Path $mRNGPath -ChildPath "BouncyCastle.Crypto.dll")
+$EncryptionKey = (Get-Credential -Message "Enter the encryption key you would like to use. This must match the encryption key used by the rest of the confCons file." -UserName "DontNeedUsername").Password
+$PathToMrngFolder = ""
 
-
-
-function ConvertTo-mRNGSerializedXml {
-    [CmdletBinding()]
-    Param (
-        [Parameter(Mandatory)]
-        [mRemoteNG.Connection.ConnectionInfo[]]
-        $Xml
-)
-
-    function Get-ChildNodes {
-        Param ($Xml)
-
-        $Xml
-
-        if ($Xml -is [mRemoteNG.Container.ContainerInfo] -and $Xml.HasChildren()) {
-            foreach ($Node in $Xml.Children) {
-                Get-ChildNodes -Xml $Node
-            }
-        }
-    }
-
-    $AllNodes = Get-ChildNodes -Xml $Xml
-    if (
-        $AllNodes.Password -or
-        $AllNodes.RDGatewayPassword -or
-        $AllNodes.VNCProxyPassword
-    ) {
-        $Password = Read-Host -Message 'If you have password protected your ConfCons.xml please enter the password here otherwise just press enter' -AsSecureString
-    }
-    else {
-        $Password = [securestring]::new()
-    }
-    $CryptoProvider = [mRemoteNG.Security.SymmetricEncryption.AeadCryptographyProvider]::new()
-    $SaveFilter = [mRemoteNG.Security.SaveFilter]::new()
-    $ConnectionNodeSerializer = [mRemoteNG.Config.Serializers.Xml.XmlConnectionNodeSerializer26]::new($CryptoProvider, $Password, $SaveFilter)
-    $XmlSerializer = [mRemoteNG.Config.Serializers.Xml.XmlConnectionsSerializer]::new($CryptoProvider, $ConnectionNodeSerializer)
-
-    $RootNode = [mRemoteNG.Tree.Root.RootNodeInfo]::new('Connection')
-    foreach ($Node in $Xml) {
-        $RootNode.AddChild($Node)
-    }
-    $XmlSerializer.Serialize($RootNode)
+if ($PathToMrngFolder -eq "") {
+    Write-Error -Message 'You must set the $PathToMrngFolder variable in this script to the folder which contains mRemoteNG.exe'
 }
 
-function New-mRNGConnection {
-    [CmdletBinding(DefaultParameterSetName = 'Credential')]
-    Param (
-        [Parameter(Mandatory)]
-        [string]
-        $Name,
+$assembly = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $PathToMrngFolder -ChildPath "mRemoteNG.exe"))
+$assembly = [System.Reflection.Assembly]::LoadFile((Join-Path -Path $PathToMrngFolder -ChildPath "BouncyCastle.Crypto.dll"))
 
-        [Parameter(Mandatory)]
-        [string]
-        $Hostname,
-
-        [Parameter(Mandatory)]
-        [mRemoteNG.Connection.Protocol.ProtocolType]
-        $Protocol,
-
-        [Parameter(ParameterSetName = 'Credential')]
-        [pscredential]
-        $Credential,
-
-        [Parameter(ParameterSetName = 'InheritCredential')]
-        [switch]
-        $InheritCredential,
-
-        [Parameter()]
-        [mRemoteNG.Container.ContainerInfo]
-        $ParentContainer,
-
-        [Parameter()]
-        [switch]
-        $PassThru
-    )
-
-    $Connection = [mRemoteNG.Connection.ConnectionInfo]@{
-        Name     = $Name
-        Hostname = $Hostname
-        Protocol = $Protocol
-    }
-
-    if ($Credential) {
-        $Connection.Username = $Credential.GetNetworkCredential().UserName
-        $Connection.Domain = $Credential.GetNetworkCredential().Domain
-        $Connection.Password = $Credential.GetNetworkCredential().Password
-    }
-
-    if ($InheritCredential) {
-        $Connection.Inheritance.Username = $true
-        $Connection.Inheritance.Domain = $true
-        $Connection.Inheritance.Password = $true
-    }
-
-    if ($ParentContainer) {
-        $ParentContainer.AddChild($Connection)
-
-        if ($PSBoundParameters.ContainsKey('PassThru')) {
-            $Connection
-        }
-    }
-    else {
-        $Connection
-    }
-}
-
-function New-mRNGContainer {
-    [CmdletBinding(DefaultParameterSetName = 'Credential')]
-    Param (
-        [Parameter(Mandatory)]
-        [string]
-        $Name,
-
-        [Parameter(ParameterSetName = 'Credential')]
-        [pscredential]
-        $Credential,
-
-        [Parameter(ParameterSetName = 'InheritCredential')]
-        [switch]
-        $InheritCredential,
-
-        [Parameter()]
-        [mRemoteNG.Container.ContainerInfo]
-        $ParentContainer
-    )
-
-    $Container = [mRemoteNG.Container.ContainerInfo]@{
-        Name = $Name
-    }
-
-    if ($Credential) {
-        $Container.Username = $Credential.GetNetworkCredential().UserName
-        $Container.Domain = $Credential.GetNetworkCredential().Domain
-        $Container.Password = $Credential.GetNetworkCredential().Password
-    }
-
-    if ($InheritCredential) {
-        $Container.Inheritance.Username = $true
-        $Container.Inheritance.Domain = $true
-        $Container.Inheritance.Password = $true
-    }
-
-    if ($ParentContainer) {
-        $ParentContainer.AddChild($Container)
-    }
-    
-    $Container
-}
-
-function Export-mRNGXml {
+function New-mRemoteNGXmlSerializer {
     [CmdletBinding()]
     param (
-        [Parameter()]
-        [string]
-        $Path,
-
-        [Parameter()]
-        [string]
-        $SerializedXml
+        [SecureString]
+        $EncryptionKey
     )
 
-    $FilePathProvider = [mRemoteNG.Config.DataProviders.FileDataProvider]::new($Path)
-    $filePathProvider.Save($SerializedXml)
+    PROCESS {
+        $cryptoProvider = New-Object -TypeName mRemoteNG.Security.SymmetricEncryption.AeadCryptographyProvider
+        $saveFilter = New-Object -TypeName mRemoteNG.Security.SaveFilter -ArgumentList @($false)
+        $xmlSerializer = New-Object -TypeName mRemoteNG.Config.Serializers.XmlConnectionNodeSerializer -ArgumentList @($cryptoProvider, $encryptionKey, $saveFilter)
+        Write-Output $xmlSerializer
+    }
 }
 
+function New-mRemoteNGConnectionInfo {
+    [CmdletBinding()]
+    param ()
+
+    PROCESS {
+        $connectionInfo = New-Object -TypeName mRemoteNG.Connection.ConnectionInfo
+        Write-Output $connectionInfo
+    }
+}
+
+function New-mRemoteNGContainerInfo {
+    [CmdletBinding()]
+    param ()
+
+    PROCESS {
+        $connectionInfo = New-Object -TypeName mRemoteNG.Container.ContainerInfo
+        Write-Output $connectionInfo
+    }
+}
+
+# Setup the services needed to do serialization
+$xmlSerializer = New-mRemoteNGXmlSerializer -EncryptionKey $EncryptionKey
 
 
 
@@ -210,85 +62,53 @@ function Export-mRNGXml {
 # Example 1: serialize many connections, no containers
 # Here you can define the number of connection info objects to create
 # You can also provide a list of desired hostnames and iterate over those
+$xml = ""
+foreach($i in 1..5)
+{
+    $connectionInfo = New-mRemoteNGConnectionInfo
 
-$Connections = foreach ($i in 1..5) {
-    # Create new connection
-    $Splat = @{
-        Name              = 'Server-{0:D2}' -f $i
-        Hostname          = 'Server-{0:D2}' -f $i
-        Protocol          = 'RDP'
-        InheritCredential = $true
-    }
-    New-mRNGConnection @Splat
+    # Set connection info properties
+    $connectionInfo.Name = "server-$i"
+    $connectionInfo.Hostname = "some-win-server-$i"
+    $connectionInfo.Protocol = [mRemoteNG.Connection.Protocol.ProtocolType]::RDP
+    $connectionInfo.Inheritance.Username = $true
+    $connectionInfo.Inheritance.Domain = $true
+    $connectionInfo.Inheritance.Password = $true
+
+    $serializedConnection = $xmlSerializer.SerializeConnectionInfo($connectionInfo).ToString()
+    $xml += $serializedConnection + [System.Environment]::NewLine
 }
 
-# Serialize the connections
-$SerializedXml = ConvertTo-mRNGSerializedXml -Xml $Connections
-
-# Write the XML to a file ready to import into mRemoteNG
-Export-mRNGXml -Path "$ENV:APPDATA\mRemoteNG\PowerShellGenerated.xml" -SerializedXml $SerializedXml
-
-# Now open up mRemoteNG and press Ctrl+O and open up the exported XML file
+Write-Output $xml
 
 
 
 
 #----------------------------------------------------------------
 # Example 2: serialize a container which has connections
-# You can also create containers and add connections and containers to them, which will be nested correctly when serialized
-# If you specify the ParentContainer parameter for new connections then there will be no output unless the PassThru parameter is also used
+# You can also create containers and add connections to them, which will be nested correctly when serialized
+$xml = ""
+$container = New-mRemoteNGContainerInfo
+$container.Name = "ProductionServers"
+$serializedContainer = $xmlSerializer.SerializeConnectionInfo($container)
 
-$ProdServerCreds = Get-Credential
-$ProdServers = New-mRNGContainer -Name 'ProdServers' -Credential $ProdServerCreds
+foreach($i in 1..3)
+{
+    $connectionInfo = New-mRemoteNGConnectionInfo
 
-foreach ($i in 1..3) {
-    # Create new connection
-    $Splat = @{
-        Name              = 'Server-{0:D2}' -f $i
-        Hostname          = 'Server-{0:D2}' -f $i
-        Protocol          = 'RDP'
-        InheritCredential = $true
-        ParentContainer   = $ProdServers
-    }
-    New-mRNGConnection @Splat
+    # Set connection info properties
+    $connectionInfo.Name = "server-$i"
+    $connectionInfo.Hostname = "some-linux-server-$i"
+    $connectionInfo.Protocol = [mRemoteNG.Connection.Protocol.ProtocolType]::SSH2
+    $connectionInfo.Inheritance.Username = $true
+    $connectionInfo.Inheritance.Domain = $true
+    $connectionInfo.Inheritance.Password = $true
+    
+    # serialize the connection
+    $serializedConnection = $xmlSerializer.SerializeConnectionInfo($connectionInfo)
+    # add the connection to the container
+    $serializedContainer.Add($serializedConnection)
 }
 
-$ProdWebServers = New-mRNGContainer -Name 'WebServers' -ParentContainer $ProdServers -InheritCredential
-
-foreach ($i in 1..3) {
-    # Create new connection
-    $Splat = @{
-        Name              = 'WebServer-{0:D2}' -f $i
-        Hostname          = 'WebServer-{0:D2}' -f $i
-        Protocol          = 'SSH1'
-        InheritCredential = $true
-        ParentContainer   = $ProdWebServers
-    }
-    New-mRNGConnection @Splat
-}
-
-$DevServers = New-mRNGContainer -Name 'DevServers'
-
-foreach ($i in 1..3) {
-    # Create new connection
-    $Splat = @{
-        Name              = 'DevServer-{0:D2}' -f $i
-        Hostname          = 'DevServer-{0:D2}' -f $i
-        Protocol          = 'RDP'
-        InheritCredential = $true
-        ParentContainer   = $DevServers
-        PassThru          = $true
-    }
-
-    # Specified the PassThru parameter in order to catch the connection and change a property
-    $Connection = New-mRNGConnection @Splat
-    $Connection.Resolution = 'FullScreen'
-}
-
-# Serialize the container
-$SerializedXml = ConvertTo-mRNGSerializedXml -Xml $ProdServers, $DevServers
-
-# Write the XML to a file ready to import into mRemoteNG
-Export-mRNGXml -Path "$ENV:APPDATA\mRemoteNG\PowerShellGenerated.xml" -SerializedXml $SerializedXml
-
-# Now open up mRemoteNG and press Ctrl+O and open up the exported XML file
+# Call ToString() on the top-level container to get the XML of it and all its children
+Write-Output $serializedContainer.ToString()

Tools/appveyor_after_build.ps1

@@ -1,73 +0,0 @@
-if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
-    Write-Output "NOT running via Appveyor - Exiting"
-    Exit
-}
-
-$appvDir = $Env:APPVEYOR_BUILD_FOLDER
-
-Write-Output "Appveyor Build Dir: '$($appvDir)'"
-$ConfigurationName = $Env:CONFIGURATION.Trim()
-Write-Output "Config Name (tirmmed): '$($ConfigurationName)'"
-
-
-$SIGCHECK="Tools\exes\sigcheck.exe"
-$SEVENZIP="Tools\7zip\7za.exe"
-
-if ($ConfigurationName -eq "Release Portable") {
-    Write-Output "Packaging Release Portable ZIP"
-   
-    $version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
-
-    Write-Output "Version is $($version)"
-
-    $PortableZip="Release\mRemoteNG-Portable-$($version).zip"
-
-    Remove-Item -Recurse "mRemoteV1\bin\package" -ErrorAction SilentlyContinue | Out-Null
-    New-Item "mRemoteV1\bin\package" -ItemType  "directory" | Out-Null
-    
-    Copy-Item "mRemoteV1\Resources\PuTTYNG.exe" -Destination "mRemoteV1\bin\package"
-
-    Copy-Item "mRemoteV1\bin\$ConfigurationName\*" -Destination "mRemoteV1\bin\package" -Recurse -Force -Exclude *.pdb
-    Copy-Item "*.txt" -Destination "mRemoteV1\bin\package"
-
-    Write-Output "Creating portable ZIP file $($PortableZip)"
-    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
-    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip ".\mRemoteV1\bin\package\*.*"
-}
-else {
-    Write-Output "We will not zip anything - this isnt a portable release build."
-}
-
-Write-Output ""
-Write-Output ""
-
-if ($ConfigurationName -match "Release" -And $ConfigurationName -ne "Release Installer") {
-    Write-Output "Packaging debug symbols"
-   
-    $version = & $SIGCHECK /accepteula -q -n "mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
-
-    Write-Output "Version is $($version)"
-
-    if ($ConfigurationName -match "Portable") {
-        $zipFilePrefix = "mRemoteNG-Portable-symbols"
-    } else {
-        $zipFilePrefix = "mRemoteNG-symbols"
-    }
-
-    $outputZipPath="Release\$zipFilePrefix-$($version).zip"
-
-    Write-Output "Creating debug symbols ZIP file $($outputZipPath)"
-    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue
-    $SymPath = (Join-Path -Path mRemoteV1\bin\$($ConfigurationName) -ChildPath "*.pdb")
-    if(Test-Path "$SymPath") {
-    	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath "$SymPath"
-    } else {
-    	Write-Output "No Debugging Symbols Found..."
-    }
-    	
-}
-else {
-    Write-Output "We will not package debug symbols for this configuration $($ConfigurationName)"
-}
-
-Write-Output ""

Tools/appveyor_publish_build.ps1

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

Tools/copy_release_installer.ps1

@@ -17,5 +17,7 @@ if (!(Test-Path -Path $DestinationDir))
 $sourceFiles = Get-ChildItem -Path $SourcePath -Recurse | ?{$_.Extension -match "exe|msi"}
 foreach ($item in $sourceFiles)
 {
+    $item.Name
+    (Get-FileHash -Path $item.fullName -Algorithm SHA512).Hash
     Copy-Item -Path $item.FullName -Destination $DestinationDir -Force
 }

Tools/copy_tiles.ps1

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

Tools/postbuild_installer.ps1

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

Tools/postbuild_mremotev1.ps1

@@ -33,7 +33,6 @@ Format-Table -AutoSize -Wrap -InputObject @{
     "TargetDir" = $TargetDir
     "TargetFileName" = $TargetFileName
     "ConfigurationName" = $ConfigurationName
-    "CertificatePath" = $CertificatePath
     "ExcludeFromSigning" = $ExcludeFromSigning
 }
 
@@ -41,12 +40,11 @@ Format-Table -AutoSize -Wrap -InputObject @{
 
 & "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\copy_themes.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
-& "$PSScriptRoot\copy_tiles.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\move_help_files.ps1" -TargetDir $TargetDir
 & "$PSScriptRoot\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\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath
 & "$PSScriptRoot\zip_symbols.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/sign_binaries.ps1

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

Tools/tidy_files_for_release.ps1

@@ -21,9 +21,7 @@ if ($ConfigurationName -match "Release") {
         "*.log",
         "*vshost*",
         "*.tmp"
-    ) -Exclude @(
-        "mRemoteNG.VisualElementsManifest.xml"
-	)
+    )
     Remove-Item -Path $filesToDelete.FullName
     Write-Output $filesToDelete.FullName
 }

Tools/verify_binary_signatures.ps1

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

Tools/zip_portable_files.ps1

@@ -56,6 +56,8 @@ if ($ConfigurationName -eq "Release Portable") {
     Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
     & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip (Join-Path -Path $tempFolderPath -ChildPath "*.*")
     #& $SEVENZIP a -bt -mx=9 -tzip -y $PortableZip "$($SolutionDir)*.TXT"
+    (Get-FileHash -Path $PortableZip -Algorithm SHA512).Hash
+
 }
 else {
     Write-Output "We will not zip anything - this isnt a portable release build."

Tools/zip_portable_files_appv.ps1

@@ -0,0 +1,39 @@
+if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {
+    Write-Output "NOT running via Appveyor - Exiting"
+    Exit
+}
+
+$appvDir = $Env:APPVEYOR_BUILD_FOLDER
+
+Write-Output "Appveyor Build Dir: '$($appvDir)'"
+$ConfigurationName = $Env:CONFIGURATION.Trim()
+Write-Output "Config Name (tirmmed): '$($ConfigurationName)'"
+
+
+$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe"
+$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
+
+if ($ConfigurationName -eq "Release Portable") {
+    Write-Output "Packaging Release Portable ZIP"
+   
+    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
+
+    Write-Output "Version is $($version)"
+
+    $PortableZip="$($SolutionDir)Release\mRemoteNG-Portable-$($version).zip"
+
+    Remove-Item -Recurse "$($SolutionDir)mRemoteV1\bin\package" -ErrorAction SilentlyContinue | Out-Null
+    New-Item "$($SolutionDir)mRemoteV1\bin\package" -ItemType  "directory" | Out-Null
+    
+    Copy-Item "$($SolutionDir)mRemoteV1\Resources\PuTTYNG.exe" -Destination "$($SolutionDir)mRemoteV1\bin\package"
+
+    Copy-Item "$($SolutionDir)mRemoteV1\bin\$ConfigurationName\*" -Destination "$($SolutionDir)mRemoteV1\bin\package" -Recurse  -Force 
+    Copy-Item "$($SolutionDir)*.txt" -Destination "$($SolutionDir)mRemoteV1\bin\package"
+
+    Write-Output "Creating portable ZIP file $($PortableZip)"
+    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue
+    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip "$($SolutionDir)mRemoteV1\bin\package\*.*"
+}
+else {
+    Write-Output "We will not zip anything - this isnt a portable release build."
+}

appveyor.yml

@@ -1,36 +1,22 @@
 version: 1.76.{build}
 pull_requests:
   do_not_increment_build_number: true
-skip_tags: true
-skip_branch_with_pr: true
 image: Visual Studio 2017
 configuration:
 - Release
 - Release Portable
 - Release Installer
 platform: x86
-shallow_clone: true
 clone_depth: 1
 install:
-- ps: >-
-    date
-
-    mRemoteV1\Resources\CitrixReceiver.exe ENABLE_SSON="No" /silent /noreboot /EnableCEIP=false /AutoUpdateCheck=disabled /EnableTracing=false | out-null
-
-    date
+- ps: C:\projects\mremoteng\mRemoteV1\Resources\CitrixReceiver.exe DONOTSTARTCC=1 ENABLE_SSON="No" /silent | out-null
 before_build:
-- cmd: >-
-    echo %TIME%
-
-    nuget restore
-
-    echo %TIME%
+- cmd: nuget restore
 build:
   project: mRemoteV1.sln
-  parallel: true
   verbosity: normal
 after_build:
-- ps: "if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {\n    Write-Output \"NOT running via Appveyor - Exiting\"\n    Exit\n}\n\n$appvDir = $Env:APPVEYOR_BUILD_FOLDER\n\nWrite-Output \"Appveyor Build Dir: '$($appvDir)'\"\n$ConfigurationName = $Env:CONFIGURATION.Trim()\nWrite-Output \"Config Name (tirmmed): '$($ConfigurationName)'\"\n\n\n$SIGCHECK=\"Tools\\exes\\sigcheck.exe\"\n$SEVENZIP=\"Tools\\7zip\\7za.exe\"\n\nif ($ConfigurationName -eq \"Release Portable\") {\n    Write-Output \"Packaging Release Portable ZIP\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    $PortableZip=\"Release\\mRemoteNG-Portable-$($version).zip\"\n\n    Remove-Item -Recurse \"mRemoteV1\\bin\\package\" -ErrorAction SilentlyContinue | Out-Null\n    New-Item \"mRemoteV1\\bin\\package\" -ItemType  \"directory\" | Out-Null\n    \n    Copy-Item \"mRemoteV1\\Resources\\PuTTYNG.exe\" -Destination \"mRemoteV1\\bin\\package\"\n\n    Copy-Item \"mRemoteV1\\bin\\$ConfigurationName\\*\" -Destination \"mRemoteV1\\bin\\package\" -Recurse -Force -Exclude *.pdb\n    Copy-Item \"*.txt\" -Destination \"mRemoteV1\\bin\\package\"\n\n    Write-Output \"Creating portable ZIP file $($PortableZip)\"\n    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue\n    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip \".\\mRemoteV1\\bin\\package\\*.*\"\n}\nelse {\n    Write-Output \"We will not zip anything - this isnt a portable release build.\"\n}\n\nWrite-Output \"\"\nWrite-Output \"\"\n\nif ($ConfigurationName -match \"Release\" -And $ConfigurationName -ne \"Release Installer\") {\n    Write-Output \"Packaging debug symbols\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    if ($ConfigurationName -match \"Portable\") {\n        $zipFilePrefix = \"mRemoteNG-Portable-symbols\"\n    } else {\n        $zipFilePrefix = \"mRemoteNG-symbols\"\n    }\n\n    $outputZipPath=\"Release\\$zipFilePrefix-$($version).zip\"\n\n    Write-Output \"Creating debug symbols ZIP file $($outputZipPath)\"\n    Remove-Item -Force  $outputZipPath -ErrorAction SilentlyContinue\n    $SymPath = (Join-Path -Path mRemoteV1\\bin\\$($ConfigurationName) -ChildPath \"*.pdb\")\n    if(Test-Path \"$SymPath\") {\n    	& $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath \"$SymPath\"\n    } else {\n    	Write-Output \"No Debugging Symbols Found...\"\n    }\n    	\n}\nelse {\n    Write-Output \"We will not package debug symbols for this configuration $($ConfigurationName)\"\n}\n\nWrite-Output \"\""
+- ps: "if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {\n    Write-Output \"NOT running via Appveyor - Exiting\"\n    Exit\n}\n\n$appvDir = $Env:APPVEYOR_BUILD_FOLDER\n\nWrite-Output \"Appveyor Build Dir: '$($appvDir)'\"\n$ConfigurationName = $Env:CONFIGURATION.Trim()\nWrite-Output \"Config Name (tirmmed): '$($ConfigurationName)'\"\n\n\n$SIGCHECK=\"$($SolutionDir)Tools\\exes\\sigcheck.exe\"\n$SEVENZIP=\"$($SolutionDir)Tools\\7zip\\7za.exe\"\n\nif ($ConfigurationName -eq \"Release Portable\") {\n    Write-Output \"Packaging Release Portable ZIP\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"$($SolutionDir)mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    $PortableZip=\"$($SolutionDir)Release\\mRemoteNG-Portable-$($version).zip\"\n\n    Remove-Item -Recurse \"$($SolutionDir)mRemoteV1\\bin\\package\" -ErrorAction SilentlyContinue | Out-Null\n    New-Item \"$($SolutionDir)mRemoteV1\\bin\\package\" -ItemType  \"directory\" | Out-Null\n    \n    Copy-Item \"$($SolutionDir)mRemoteV1\\Resources\\PuTTYNG.exe\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\"\n\n    Copy-Item \"$($SolutionDir)mRemoteV1\\bin\\$ConfigurationName\\*\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\" -Recurse  -Force \n    Copy-Item \"$($SolutionDir)*.txt\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\"\n\n    Write-Output \"Creating portable ZIP file $($PortableZip)\"\n    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue\n    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip \"$($SolutionDir)mRemoteV1\\bin\\package\\*.*\"\n}\nelse {\n    Write-Output \"We will not zip anything - this isnt a portable release build.\"\n}"
 test:
   assemblies:
     only:
@@ -38,9 +24,5 @@ test:
 artifacts:
 - path: Release\*.msi
   name: mRemoteNG-installer.msi
-- path: Release\mRemoteNG-Portable-1.*.zip
-  name: mRemoteNG-portable.zip
-- path: Release\mRemoteNG-Portable-symbols*.zip
-  name: mRemoteNG-Portable-symbols.zip
-- path: Release\mRemoteNG-symbols*.zip
-  name: mRemoteNG-symbols.zip
+- path: Release\*.zip
+  name: mRemoteNG-portable.zip

mRemoteNG.Specs/App.config

@@ -7,7 +7,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.16.0.0" newVersion="2.16.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

mRemoteNG.Specs/mRemoteNG.Specs.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,8 +12,6 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,8 +34,8 @@
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -92,12 +89,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

mRemoteNG.Specs/packages.config

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

mRemoteNGTests/Config/CredentialHarvesterTests.cs

@@ -1,4 +1,9 @@
-using mRemoteNG.Config;
+using System;
+using System.Linq;
+using System.Security;
+using System.Xml.Linq;
+using mRemoteNG.Config;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
@@ -6,10 +11,6 @@ using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Security;
-using System.Xml.Linq;
 
 
 namespace mRemoteNGTests.Config
@@ -121,7 +122,7 @@ namespace mRemoteNGTests.Config
         {
             var rootNode = new RootNodeInfo(RootNodeType.Connection) {PasswordString = _key.ConvertToUnsecureString()};
             rootNode.AddChild(connectionInfo);
-            var nodeSerializer = new XmlConnectionNodeSerializer27(_cryptographyProvider, _key, new SaveFilter());
+            var nodeSerializer = new XmlConnectionNodeSerializer26(_cryptographyProvider, _key, new SaveFilter());
             var serializer = new XmlConnectionsSerializer(_cryptographyProvider, nodeSerializer);
             var serializedData = serializer.Serialize(rootNode);
             return XDocument.Parse(serializedData);

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs

@@ -83,7 +83,6 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 PostExtApp = "SomePostExtApp",
                 MacAddress = "SomeMacAddress",
                 UserField = "SomeUserField",
-                Favorite = true,
                 ExtApp = "SomeExtApp",
                 VNCProxyUsername = "SomeVNCProxyUsername",
                 VNCProxyPassword = "SomeVNCProxyPassword",
@@ -112,7 +111,6 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv
                 RedirectPrinters = true,
                 RedirectSmartCards = true,
                 RedirectSound = RdpProtocol.RDPSounds.LeaveAtRemoteComputer,
-                RedirectAudioCapture = true,
                 RedirectKeys = true,
                 VNCCompression = ProtocolVNC.Compression.Comp4,
                 VNCEncoding = ProtocolVNC.Encoding.EncRRE,

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs

@@ -1,16 +1,17 @@
-using mRemoteNG.Config.Serializers.Xml;
-using mRemoteNG.Connection;
-using mRemoteNG.Security;
-using mRemoteNG.Security.SymmetricEncryption;
-using mRemoteNG.Tree;
-using mRemoteNG.Tree.Root;
-using NUnit.Framework;
+using System;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Xml;
 using System.Xml.Schema;
+using mRemoteNG.Config.Serializers.Xml;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
@@ -24,13 +25,9 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         [SetUp]
         public void Setup()
         {
-            _connectionTreeModel = new ConnectionTreeModel();
-            var root = new RootNodeInfo(RootNodeType.Connection);
-            root.AddChild(new ConnectionInfo());
-            _connectionTreeModel.AddRootNode(root);
-
+            _connectionTreeModel = new ConnectionTreeModelBuilder().Build();
             _cryptographyProvider = new AeadCryptographyProvider();
-            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
                 _cryptographyProvider,
                 _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());
@@ -50,8 +47,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
             var sb = new StringBuilder();
             var xml = _serializer.Serialize(_connectionTreeModel);
 
-            var schemaFileName = $"mremoteng_confcons_v{_serializer.Version.Major}_{_serializer.Version.Minor}.xsd";
-            var schemaFile = GetTargetPath(schemaFileName);
+            var schemaFile = GetTargetPath("mremoteng_confcons_v2_6.xsd");
             _xmlReaderSettings.Schemas.Add("http://mremoteng.org", schemaFile);
             _xmlReaderSettings.ValidationEventHandler += (sender, args) =>
             {

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompilerTests.cs

@@ -1,4 +1,7 @@
-using mRemoteNG.Config.Serializers.Xml;
+using System.Linq;
+using System.Xml.XPath;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -6,12 +9,10 @@ using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
-using System.Linq;
-using System.Xml.XPath;
 
 namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
-    public class XmlConnectionsDocumentCompilerTests
+	public class XmlConnectionsDocumentCompilerTests
     {
         private XmlConnectionsDocumentCompiler _documentCompiler;
         private ConnectionTreeModel _connectionTreeModel;
@@ -30,7 +31,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         {
             _connectionTreeModel = SetupConnectionTreeModel();
             _cryptographyProvider = new CryptoProviderFactory(BlockCipherEngines.AES, BlockCipherModes.GCM).Build();
-            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
                 _cryptographyProvider, 
                 _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptorTests.cs

@@ -1,4 +1,7 @@
-using mRemoteNG.Config.Serializers.Xml;
+using System.Linq;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -6,12 +9,10 @@ using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
-using System.Linq;
-using System.Xml.Linq;
 
 namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
-    public class XmlConnectionsDocumentEncryptorTests
+	public class XmlConnectionsDocumentEncryptorTests
     {
         private XmlConnectionsDocumentEncryptor _documentEncryptor;
         private XDocument _originalDocument;
@@ -21,7 +22,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         {
             var connectionTreeModel = SetupConnectionTreeModel();
             var cryptoProvider = new CryptoProviderFactory(BlockCipherEngines.AES, BlockCipherModes.GCM).Build();
-            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
                 cryptoProvider, 
                 connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs

@@ -1,4 +1,8 @@
-using mRemoteNG.Config.Serializers.Xml;
+using System.Linq;
+using System.Xml;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
@@ -6,13 +10,10 @@ using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using NUnit.Framework;
-using System.Linq;
-using System.Xml;
-using System.Xml.Linq;
 
 namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
-    public class XmlConnectionsSerializerTests
+	public class XmlConnectionsSerializerTests
     {
         private XmlConnectionsSerializer _serializer;
         private ConnectionTreeModel _connectionTreeModel;
@@ -24,7 +25,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         {
             _connectionTreeModel = SetupConnectionTreeModel();
             _cryptographyProvider = new AeadCryptographyProvider();
-            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
                 _cryptographyProvider, 
                 _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());
@@ -58,7 +59,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         [TestCase("InheritAutomaticResize", "false")]
         public void SerializerRespectsSaveFilterSettings(string attributeName, string expectedValue)
         {
-            var connectionNodeSerializer = new XmlConnectionNodeSerializer27(
+            var connectionNodeSerializer = new XmlConnectionNodeSerializer26(
                 _cryptographyProvider,
                 _connectionTreeModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter(true));

mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializerTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
@@ -10,12 +11,11 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
 {
-	public class XmlRootNodeSerializerTests
+    public class XmlRootNodeSerializerTests
     {
         private XmlRootNodeSerializer _rootNodeSerializer;
         private ICryptographyProvider _cryptographyProvider;
         private RootNodeInfo _rootNodeInfo;
-        private Version _version;
 
         [SetUp]
         public void Setup()
@@ -23,21 +23,19 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
             _rootNodeSerializer = new XmlRootNodeSerializer();
             _cryptographyProvider = new AeadCryptographyProvider();
             _rootNodeInfo = new RootNodeInfo(RootNodeType.Connection);
-            _version = new Version(99, 1);
         }
 
         [Test]
         public void RootElementNamedConnections()
         {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
             Assert.That(element.Name.LocalName, Is.EqualTo("Connections"));
         }
 
         [Test]
-		[SetUICulture("en-US")]
         public void RootNodeInfoNameSerialized()
         {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
             var attributeValue = element.Attribute(XName.Get("Name"))?.Value;
             Assert.That(attributeValue, Is.EqualTo("Connections"));
         }
@@ -46,7 +44,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         public void EncryptionEngineSerialized(BlockCipherEngines engine, BlockCipherModes mode)
         {
             var cryptoProvider = new CryptoProviderFactory(engine, mode).Build();
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider, _version);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
             var attributeValue = element.Attribute(XName.Get("EncryptionEngine"))?.Value;
             Assert.That(attributeValue, Is.EqualTo(engine.ToString()));
         }
@@ -55,7 +53,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         public void EncryptionModeSerialized(BlockCipherEngines engine, BlockCipherModes mode)
         {
             var cryptoProvider = new CryptoProviderFactory(engine, mode).Build();
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider, _version);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
             var attributeValue = element.Attribute(XName.Get("BlockCipherMode"))?.Value;
             Assert.That(attributeValue, Is.EqualTo(mode.ToString()));
         }
@@ -67,7 +65,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         public void KdfIterationsSerialized(int iterations)
         {
             _cryptographyProvider.KeyDerivationIterations = iterations;
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
             var attributeValue = element.Attribute(XName.Get("KdfIterations"))?.Value;
             Assert.That(attributeValue, Is.EqualTo(iterations.ToString()));
         }
@@ -76,7 +74,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         [TestCase(false)]
         public void FullFileEncryptionFlagSerialized(bool fullFileEncryption)
         {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version, fullFileEncryption);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, fullFileEncryption);
             var attributeValue = element.Attribute(XName.Get("FullFileEncryption"))?.Value;
             Assert.That(bool.Parse(attributeValue), Is.EqualTo(fullFileEncryption));
         }
@@ -88,7 +86,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         public void ProtectedStringSerialized(string customPassword, string expectedPlainText)
         {
             _rootNodeInfo.PasswordString = customPassword;
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
             var attributeValue = element.Attribute(XName.Get("Protected"))?.Value;
             var attributeValuePlainText = _cryptographyProvider.Decrypt(attributeValue, _rootNodeInfo.PasswordString.ConvertToSecureString());
             Assert.That(attributeValuePlainText, Is.EqualTo(expectedPlainText));
@@ -97,10 +95,10 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml
         [Test]
         public void ConfVersionSerialized()
         {
-            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, _version);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
             var attributeValue = element.Attribute(XName.Get("ConfVersion"))?.Value ?? "";
-            var confVersion = Version.Parse(attributeValue);
-            Assert.That(confVersion, Is.EqualTo(_version));
+            var versionAsNumber = double.Parse(attributeValue);
+            Assert.That(versionAsNumber, Is.GreaterThan(0));
         }
 
         private class TestCaseSources

mRemoteNGTests/Config/Serializers/CredentialSerializers/XmlCredentialSerializerTests.cs

@@ -1,10 +1,9 @@
-using mRemoteNG.Config.Serializers.CredentialSerializer;
+using System.Linq;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers.CredentialSerializer;
 using mRemoteNG.Credential;
 using mRemoteNG.Security;
 using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Xml.Linq;
 
 namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
 {
@@ -42,8 +41,7 @@ namespace mRemoteNGTests.Config.Serializers.CredentialSerializers
         {
             var serialized = _serializer.Serialize(new[] { _cred1 });
             var xdoc = XDocument.Parse(serialized);
-            var version = Version.Parse(xdoc.Root?.Attribute("SchemaVersion")?.Value ?? "");
-            Assert.That(version, Is.EqualTo(_serializer.Version));
+            Assert.That(xdoc.Root?.Attribute("SchemaVersion")?.Value, Is.EqualTo(_serializer.SchemaVersion));
         }
     }
 }

mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs

@@ -1,10 +1,10 @@
-using mRemoteNG.Config.Serializers;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Connection;
 using mRemoteNG.Connection.Protocol.RDP;
 using mRemoteNG.Tree;
 using mRemoteNGTests.Properties;
 using NUnit.Framework;
-using System.Linq;
 
 namespace mRemoteNGTests.Config.Serializers.MiscSerializers
 {
@@ -17,7 +17,6 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
         private const string ExpectedUserName = "myusernamehere";
         private const string ExpectedDomain = "myspecialdomain";
         private const string ExpectedGatewayHostname = "gatewayhostname.domain.com";
-        private const string ExpectedLoadBalanceInfo = "tsv://MS Terminal Services Plugin.1.RDS-NAME";
         private const int ExpectedPort = 9933;
         private const RdpProtocol.RDPColors ExpectedColors = RdpProtocol.RDPColors.Colors24Bit;
         private const bool ExpectedBitmapCaching = false;
@@ -167,13 +166,6 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers
             Assert.That(connectionInfo.RedirectSound, Is.EqualTo(ExpectedSoundRedirection));
         }
 
-        [Test]
-        public void LoadBalanceInfoImportedCorrectly()
-        {
-            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
-            Assert.That(connectionInfo.LoadBalanceInfo, Is.EqualTo(ExpectedLoadBalanceInfo));
-        }
-
         //[Test]
         //public void GatewayHostnameImportedCorrectly()
         //{

mRemoteNGTests/Config/Serializers/Versioning/SqlVersion22To23UpgraderTests.cs

@@ -13,7 +13,7 @@ namespace mRemoteNGTests.Config.Serializers.Versioning
         [SetUp]
         public void Setup()
         {
-            var sqlConnector = Substitute.For<MSSqlDatabaseConnector>("", "", "", "");
+            var sqlConnector = Substitute.For<SqlDatabaseConnector>("", "", "", "");
             _versionUpgrader = new SqlVersion22To23Upgrader(sqlConnector);
         }
 

mRemoteNGTests/Config/Serializers/Versioning/SqlVersion23To24UpgraderTests.cs

@@ -13,7 +13,7 @@ namespace mRemoteNGTests.Config.Serializers.Versioning
         [SetUp]
         public void Setup()
         {
-            var sqlConnector = Substitute.For<MSSqlDatabaseConnector>("", "", "", "");
+            var sqlConnector = Substitute.For<SqlDatabaseConnector>("", "", "", "");
             _versionUpgrader = new SqlVersion23To24Upgrader(sqlConnector);
         }
 

mRemoteNGTests/Config/Serializers/Versioning/SqlVersion24To25UpgraderTests.cs

@@ -13,7 +13,7 @@ namespace mRemoteNGTests.Config.Serializers.Versioning
         [SetUp]
         public void Setup()
         {
-            var sqlConnector = Substitute.For<MSSqlDatabaseConnector>("", "", "", "");
+            var sqlConnector = Substitute.For<SqlDatabaseConnector>("", "", "", "");
             _versionUpgrader = new SqlVersion24To25Upgrader(sqlConnector);
         }
 

mRemoteNGTests/Config/Serializers/Versioning/SqlVersion25To26UpgraderTests.cs

@@ -13,7 +13,7 @@ namespace mRemoteNGTests.Config.Serializers.Versioning
         [SetUp]
         public void Setup()
         {
-            var sqlConnector = Substitute.For<MSSqlDatabaseConnector>("", "", "", "");
+            var sqlConnector = Substitute.For<SqlDatabaseConnector>("", "", "", "");
             _versionUpgrader = new SqlVersion25To26Upgrader(sqlConnector);
         }
 

mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs

@@ -412,15 +412,6 @@ namespace mRemoteNGTests.Connection
             Assert.That(wasCalled, Is.True);
         }
 
-        [Test]
-        public void FavoriteNotifiesOnValueChange()
-        {
-            var wasCalled = false;
-            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
-            _testAbstractConnectionInfoData.Favorite = true;
-            Assert.That(wasCalled, Is.True);
-        }
-
         [Test]
         public void VncCompressionNotifiesOnValueChange()
         {

mRemoteNGTests/Connection/ConnectionInfoTests.cs

@@ -53,8 +53,7 @@ namespace mRemoteNGTests.Connection
         [Test]
         public void CloneCorrectlySetsParentOfInheritanceObject()
         {
-			var originalConnection = new ConnectionInfo();
-            var clonedConnection = originalConnection.Clone();
+            var clonedConnection = _connectionInfo.Clone();
             Assert.That(clonedConnection.Inheritance.Parent, Is.EqualTo(clonedConnection));
         }
 
@@ -136,7 +135,7 @@ namespace mRemoteNGTests.Connection
 	    {
 		    public static IEnumerable<PropertyInfo> GetProperties()
 		    {
-			    return new ConnectionInfoInheritance(new ConnectionInfo()).GetProperties();
+			    return new ConnectionInfoInheritance(new object()).GetProperties();
 		    }
 	    }
     }

mRemoteNGTests/Connection/DefaultConnectionInheritanceTests.cs

@@ -11,7 +11,7 @@ namespace mRemoteNGTests.Connection
 	    [TestCaseSource(nameof(GetInheritanceProperties))]
 		public void LoadingDefaultInheritanceUpdatesAllProperties(PropertyInfo property)
         {
-			var inheritanceSource = new ConnectionInfoInheritance(new ConnectionInfo(), true);
+			var inheritanceSource = new ConnectionInfoInheritance(new object(), true);
             inheritanceSource.TurnOnInheritanceCompletely();
 	        DefaultConnectionInheritance.Instance.TurnOffInheritanceCompletely();
 
@@ -25,7 +25,7 @@ namespace mRemoteNGTests.Connection
 		[TestCaseSource(nameof(GetInheritanceProperties))]
 		public void SavingDefaultInheritanceExportsAllProperties(PropertyInfo property)
         {
-			var saveTarget = new ConnectionInfoInheritance(new ConnectionInfo(), true);
+			var saveTarget = new ConnectionInfoInheritance(new object(), true);
 	        saveTarget.TurnOffInheritanceCompletely();
 	        DefaultConnectionInheritance.Instance.TurnOnInheritanceCompletely();
 
@@ -40,7 +40,7 @@ namespace mRemoteNGTests.Connection
         public void NewInheritanceInstancesCreatedWithDefaultInheritanceValues()
         {
             DefaultConnectionInheritance.Instance.Domain = true;
-            var inheritanceInstance = new ConnectionInfoInheritance(new ConnectionInfo());
+            var inheritanceInstance = new ConnectionInfoInheritance(new object());
             Assert.That(inheritanceInstance.Domain, Is.True);
         }
 
@@ -48,7 +48,7 @@ namespace mRemoteNGTests.Connection
 		public void NewInheritanceInstancesCreatedWithAllDefaultInheritanceValues(PropertyInfo property)
         {
             DefaultConnectionInheritance.Instance.TurnOnInheritanceCompletely();
-            var inheritanceInstance = new ConnectionInfoInheritance(new ConnectionInfo());
+            var inheritanceInstance = new ConnectionInfoInheritance(new object());
 
 			var valueInDestination = property.GetValue(inheritanceInstance);
 	        var valueInSource = property.GetValue(DefaultConnectionInheritance.Instance);
@@ -57,7 +57,7 @@ namespace mRemoteNGTests.Connection
 
 	    private static IEnumerable<PropertyInfo> GetInheritanceProperties()
 	    {
-		    return new ConnectionInfoInheritance(new ConnectionInfo(), true).GetProperties();
+		    return new ConnectionInfoInheritance(new object(), true).GetProperties();
 	    }
 	}
 }

mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs

@@ -51,8 +51,8 @@ namespace mRemoteNGTests.Connection.Protocol
 		private InterfaceControl BuildInterfaceControl(string extAppName, ProtocolBase sut)
 		{
 			var connectionWindow = new ConnectionWindow(new DockContent());
-            var connectionInfo = new ConnectionInfo {ExtApp = extAppName, Protocol = ProtocolType.IntApp};
-            return new InterfaceControl(connectionWindow, sut, connectionInfo);
+			var connectionInfo = new ConnectionInfo {ExtApp = extAppName};
+			return new InterfaceControl(connectionWindow, sut, connectionInfo);
 		}
 	}
 }

mRemoteNGTests/IntegrationTests/XmlCredentialSerializerLifeCycleTests.cs

@@ -1,14 +1,14 @@
-using mRemoteNG.Config.Serializers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security;
+using mRemoteNG.Config.Serializers;
 using mRemoteNG.Config.Serializers.CredentialSerializer;
 using mRemoteNG.Credential;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using NSubstitute;
 using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security;
 
 namespace mRemoteNGTests.IntegrationTests
 {

mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs

@@ -1,20 +1,20 @@
-using mRemoteNG.Config.Serializers.Xml;
+using System;
+using System.Linq;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Config.Serializers.Xml;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
 using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
-using mRemoteNGTests.TestHelpers;
 using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Text;
 
 
 namespace mRemoteNGTests.IntegrationTests
 {
-    public class XmlSerializationLifeCycleTests
+	public class XmlSerializationLifeCycleTests
     {
         private XmlConnectionsSerializer _serializer;
         private XmlConnectionsDeserializer _deserializer;
@@ -26,7 +26,7 @@ namespace mRemoteNGTests.IntegrationTests
         {
             _originalModel = SetupConnectionTreeModel();
             var cryptoProvider = _cryptoFactory.Build();
-            var nodeSerializer = new XmlConnectionNodeSerializer27(
+            var nodeSerializer = new XmlConnectionNodeSerializer26(
                 cryptoProvider, 
                 _originalModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());
@@ -77,7 +77,7 @@ namespace mRemoteNGTests.IntegrationTests
         {
             var cryptoProvider = _cryptoFactory.Build();
             cryptoProvider.KeyDerivationIterations = 5000;
-            var nodeSerializer = new XmlConnectionNodeSerializer27(
+            var nodeSerializer = new XmlConnectionNodeSerializer26(
                 cryptoProvider, 
                 _originalModel.RootNodes.OfType<RootNodeInfo>().First().PasswordString.ConvertToSecureString(),
                 new SaveFilter());
@@ -103,60 +103,6 @@ namespace mRemoteNGTests.IntegrationTests
             Assert.That(Guid.TryParse(deserializedConnectionInfo.ConstantID, out var guid));
         }
 
-        [Test]
-        public void AllPropertiesCorrectWhenSerializingThenDeserializing()
-        {
-            var originalConnectionInfo = new ConnectionInfo().RandomizeValues();
-            originalConnectionInfo.Inheritance.TurnOffInheritanceCompletely();
-            var serializedContent = _serializer.Serialize(originalConnectionInfo);
-            var deserializedModel = _deserializer.Deserialize(serializedContent);
-            var deserializedConnectionInfo = deserializedModel
-                .GetRecursiveChildList()
-                .First(info => info.GetTreeNodeType() == TreeNodeType.Connection);
-
-            var sb = new StringBuilder();
-            foreach (var property in originalConnectionInfo.GetSerializableProperties())
-            {
-                var originalValue = property.GetValue(originalConnectionInfo);
-                var deserializedValue = property.GetValue(deserializedConnectionInfo);
-                if (originalValue.Equals(deserializedValue))
-                    continue;
-
-                sb.AppendLine($"Property: {property.Name}");
-            }
-
-            Assert.That(sb.Length, Is.EqualTo(0), "Some properties are not being serialized properly:\n" + sb);
-        }
-
-        [Test]
-        public void AllInheritanceCorrectWhenSerializingThenDeserializing()
-        {
-            var originalConnectionInfo = new ConnectionInfo();
-            originalConnectionInfo.Inheritance.ToggleAllBooleanProperties(excludeProperties: nameof(ConnectionInfoInheritance.EverythingInherited));
-            var container = new ContainerInfo();
-            container.AddChild(originalConnectionInfo);
-
-            var serializedContent = _serializer.Serialize(container);
-            var deserializedModel = _deserializer.Deserialize(serializedContent);
-            var deserializedConnectionInfo = deserializedModel
-                .GetRecursiveChildList()
-                .First(info => info.GetTreeNodeType() == TreeNodeType.Connection);
-
-            var sb = new StringBuilder();
-            foreach (var property in originalConnectionInfo.Inheritance.GetProperties())
-            {
-                var originalValue = property.GetValue(originalConnectionInfo.Inheritance);
-                var deserializedValue = property.GetValue(deserializedConnectionInfo.Inheritance);
-
-                if (originalValue.Equals(deserializedValue))
-                    continue;
-
-                sb.AppendLine($"Property: Inheritance.{property.Name}");
-            }
-
-            Assert.That(sb.Length, Is.EqualTo(0), "Some properties are not being serialized properly:\n" + sb);
-        }
-
 
         private ConnectionTreeModel SetupConnectionTreeModel()
         {

mRemoteNGTests/Properties/Resources.Designer.cs

@@ -381,16 +381,6 @@ namespace mRemoteNGTests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap TestImage {
-            get {
-                object obj = ResourceManager.GetObject("TestImage", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Version: 1.75.6164.27544
         ///dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/v1.75Beta3/mRemoteNG-Installer-1.75.6179.28160.msi

mRemoteNGTests/Properties/Resources.resx

@@ -154,9 +154,6 @@
   <data name="dev_update_portable" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dev-update-portable.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="TestImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TestImage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="test_puttyConnectionManager_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\test_puttyConnectionManager_database.dat;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>

mRemoteNGTests/Security/AeadCryptographyProviderTests.cs

@@ -1,11 +1,11 @@
-using mRemoteNG.Security;
+using System;
+using System.Collections;
+using System.Security;
+using mRemoteNG.Security;
 using mRemoteNG.Security.Factories;
 using mRemoteNG.Security.SymmetricEncryption;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using System;
-using System.Collections;
-using System.Security;
 
 
 namespace mRemoteNGTests.Security
@@ -97,12 +97,6 @@ namespace mRemoteNGTests.Security
             Assert.That(cryptoProvider.CipherMode, Is.EqualTo(mode));
         }
 
-        [Test]
-        public void ProvidingEmptyEncryptionKeyThrowsException()
-        {
-            Assert.Throws<ArgumentException>(() => _cryptographyProvider.Encrypt(_plainText, new SecureString()));
-        }
-
 
         private class TestCaseSources
         {

mRemoteNGTests/TestHelpers/ConnectionInfoHelpers.cs

@@ -1,17 +1,93 @@
-using mRemoteNG.Connection;
-using mRemoteNG.Container;
+using System;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.Http;
+using mRemoteNG.Connection.Protocol.ICA;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Connection.Protocol.VNC;
 
 namespace mRemoteNGTests.TestHelpers
 {
-	internal static class ConnectionInfoHelpers
+    internal static class ConnectionInfoHelpers
 	{
+		private static readonly Random _random = new Random();
+
 		/// <summary>
 		/// Returns a <see cref="ConnectionInfo"/> object with randomized
 		/// values in all fields.
 		/// </summary>
 		internal static ConnectionInfo GetRandomizedConnectionInfo(bool randomizeInheritance = false)
 		{
-			var connectionInfo = new ConnectionInfo().RandomizeValues();
+			var connectionInfo = new ConnectionInfo
+			{
+				// string types
+				Name = RandomString(),
+				Hostname = RandomString(),
+				Description = RandomString(),
+				Domain = RandomString(),
+				ExtApp = RandomString(),
+				Icon = RandomString(),
+				LoadBalanceInfo = RandomString(),
+				MacAddress = RandomString(),
+				Panel = RandomString(),
+				Password = RandomString(),
+				PostExtApp = RandomString(),
+				PreExtApp = RandomString(),
+				PuttySession = RandomString(),
+				RDGatewayHostname = RandomString(),
+				RDGatewayUsername = RandomString(),
+				RDGatewayDomain = RandomString(),
+				RDGatewayPassword = RandomString(),
+				UserField = RandomString(),
+				Username = RandomString(),
+				VNCProxyIP = RandomString(),
+				VNCProxyPassword = RandomString(),
+				VNCProxyUsername = RandomString(),
+
+				// bool types
+				AutomaticResize = RandomBool(),
+				CacheBitmaps = RandomBool(),
+				DisplayThemes = RandomBool(),
+				DisplayWallpaper = RandomBool(),
+				EnableDesktopComposition = RandomBool(),
+				EnableFontSmoothing = RandomBool(),
+				IsContainer = RandomBool(),
+				IsDefault = RandomBool(),
+				IsQuickConnect = RandomBool(),
+				PleaseConnect = RandomBool(),
+				RDPAlertIdleTimeout = RandomBool(),
+				RedirectDiskDrives = RandomBool(),
+				RedirectKeys = RandomBool(),
+				RedirectPorts = RandomBool(),
+				RedirectPrinters = RandomBool(),
+				RedirectSmartCards = RandomBool(),
+				UseConsoleSession = RandomBool(),
+				UseCredSsp = RandomBool(),
+				VNCViewOnly = RandomBool(),
+
+				// ints
+				Port = RandomInt(),
+				RDPMinutesToIdleTimeout = RandomInt(),
+				VNCProxyPort = RandomInt(),
+				
+				// enums
+				Colors = RandomEnum<RdpProtocol.RDPColors>(),
+				ICAEncryptionStrength = RandomEnum<IcaProtocol.EncryptionStrength> (),
+				Protocol = RandomEnum<ProtocolType>(),
+				RDGatewayUsageMethod = RandomEnum<RdpProtocol.RDGatewayUsageMethod>(),
+				RDGatewayUseConnectionCredentials = RandomEnum<RdpProtocol.RDGatewayUseConnectionCredentials>(),
+				RDPAuthenticationLevel = RandomEnum<RdpProtocol.AuthenticationLevel>(),
+				RedirectSound = RandomEnum<RdpProtocol.RDPSounds>(),
+				RenderingEngine = RandomEnum<HTTPBase.RenderingEngine>(),
+				Resolution = RandomEnum<RdpProtocol.RDPResolutions>(),
+				SoundQuality = RandomEnum<RdpProtocol.RDPSoundQuality>(),
+				VNCAuthMode = RandomEnum<ProtocolVNC.AuthMode>(),
+				VNCColors = RandomEnum<ProtocolVNC.Colors>(),
+				VNCCompression = RandomEnum<ProtocolVNC.Compression>(),
+				VNCEncoding = RandomEnum<ProtocolVNC.Encoding>(),
+				VNCProxyType = RandomEnum<ProtocolVNC.ProxyType>(),
+				VNCSmartSizeMode = RandomEnum<ProtocolVNC.SmartSizeMode>(),
+			};
 
 			if (randomizeInheritance)
 				connectionInfo.Inheritance = GetRandomizedInheritance(connectionInfo);
@@ -19,24 +95,38 @@ namespace mRemoteNGTests.TestHelpers
 			return connectionInfo;
 		}
 
-		internal static ContainerInfo GetRandomizedContainerInfo(bool randomizeInheritance = false)
-		{
-			var containerInfo = new ContainerInfo().RandomizeValues();
-
-			if (randomizeInheritance)
-				containerInfo.Inheritance = GetRandomizedInheritance(containerInfo);
-
-			return containerInfo;
-		}
-
 		internal static ConnectionInfoInheritance GetRandomizedInheritance(ConnectionInfo parent)
 		{
 			var inheritance = new ConnectionInfoInheritance(parent, true);
 			foreach (var property in inheritance.GetProperties())
 			{
-				property.SetValue(inheritance, Randomizer.RandomBool());
+				property.SetValue(inheritance, RandomBool());
 			}
 			return inheritance;
 		}
+
+		internal static string RandomString()
+		{
+			return Guid.NewGuid().ToString("N");
+		}
+
+		internal static bool RandomBool()
+		{
+			return _random.Next() % 2 == 0;
+		}
+
+		internal static int RandomInt()
+		{
+			return _random.Next();
+		}
+
+		internal static T RandomEnum<T>() where T : struct, IConvertible
+		{
+			if (!typeof(T).IsEnum)
+				throw new ArgumentException("T must be an enum");
+
+			var values = Enum.GetValues(typeof(T));
+			return (T)values.GetValue(_random.Next(values.Length));
+		}
     }
 }

mRemoteNGTests/TestHelpers/Randomizer.cs

@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using Enum = System.Enum;
-
-namespace mRemoteNGTests.TestHelpers
-{
-	internal static class Randomizer
-    {
-        private static readonly Random Random = new Random();
-
-        internal static string RandomString(params string[] excludedStrings)
-        {
-            return GetNonExcludedValue(() => Guid.NewGuid().ToString("N"), excludedStrings);
-        }
-
-        internal static bool RandomBool(bool? excludedBool = null)
-        {
-            if (excludedBool.HasValue)
-                return !excludedBool.Value;
-
-            return Random.Next() % 2 == 0;
-        }
-
-        internal static int RandomInt(int minValue = int.MinValue, int maxValue = int.MaxValue, params int[] excludeInts)
-        {
-            return GetNonExcludedValue(() => Random.Next(minValue, maxValue), excludeInts);
-        }
-
-        internal static DateTime RandomDateTime(params DateTime[] excludeTimes)
-        {
-            var date = GetNonExcludedValue(() =>
-                new DateTime(
-                    RandomInt(minValue: 1990, maxValue: 2019),
-                    RandomInt(minValue: 1, maxValue: 13),
-                    RandomInt(minValue: 1, maxValue: 29),
-                    RandomInt(minValue: 0, maxValue: 24),
-                    RandomInt(minValue: 0, maxValue: 60),
-                    RandomInt(minValue: 0, maxValue: 60)),
-                excludeTimes);
-
-            return date;
-        }
-
-        internal static T RandomEnum<T>(params object[] excludeValues) where T : struct, IConvertible
-        {
-            if (!typeof(T).IsEnum)
-                throw new ArgumentException("T must be an enum");
-
-            return (T)RandomEnum(typeof(T), excludeValues);
-        }
-
-        internal static object RandomEnum(Type enumType, params object[] excludeValues)
-        {
-            if (!enumType.IsEnum)
-                throw new ArgumentException("enumType must be an enum");
-
-            var values = Enum.GetValues(enumType);
-            return GetNonExcludedValue(() => values.GetValue(Random.Next(values.Length)), excludeValues);
-        }
-
-        private static T GetNonExcludedValue<T>(Func<T> builder, params object[] excludedValues)
-        {
-            do
-            {
-                var value = builder();
-                if (!excludedValues.Contains(value))
-                    return value;
-            } while (true);
-        }
-
-        /// <summary>
-        /// Randomizes the primitive-type settable properties of the given object.
-        /// Returns the same object instance to enable fluent method calls. It will
-        /// never choose the value that the property current holds. For booleans, this
-        /// means they will always be toggled rather than truly randomized.
-        /// </summary>
-        internal static T RandomizeValues<T>(this T con)
-            where T : class
-        {
-            var opByType = new Dictionary<Type, Action<PropertyInfo, T>>
-            {
-                { typeof(int), (p, c) =>  p.SetValue(c, RandomInt(minValue: 0, excludeInts:(int)p.GetValue(c))) },
-                { typeof(bool), (p, c) =>  p.SetValue(c, !(bool)p.GetValue(c)) },
-                { typeof(string), (p, c) =>  p.SetValue(c, RandomString((string)p.GetValue(c))) },
-                { typeof(DateTime), (p, c) =>  p.SetValue(c, RandomDateTime((DateTime)p.GetValue(c))) },
-                { typeof(Enum), (p, c) =>  p.SetValue(c, RandomEnum(p.PropertyType, p.GetValue(c))) },
-            };
-
-            var settableProperties = con
-                .GetType()
-                .GetProperties()
-                .Where(p => p.GetSetMethod() != null);
-
-            foreach (var property in settableProperties)
-            {
-                if (opByType.TryGetValue(property.PropertyType, out var mutator))
-                    mutator(property, con);
-
-                else if (property.PropertyType.BaseType != null && 
-                         opByType.TryGetValue(property.PropertyType.BaseType, out var mutator2))
-                    mutator2(property, con);
-            }
-
-            return con;
-        }
-
-        /// <summary>
-        /// Toggles all <see cref="bool"/> settable properties
-        /// on the given object.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="obj"></param>
-        /// <param name="excludeProperties"></param>
-        /// <returns></returns>
-        internal static T ToggleAllBooleanProperties<T>(this T obj, params string[] excludeProperties)
-            where T : class
-        {
-            var settableBooleanProperties = obj
-                .GetType()
-                .GetProperties()
-                .Where(p => 
-                    p.GetSetMethod() != null && 
-                    p.PropertyType == typeof(bool) &&
-                    !excludeProperties.Contains(p.Name));
-
-            foreach (var property in settableBooleanProperties)
-            {
-                var currentValue = (bool)property.GetValue(obj);
-                property.SetValue(obj, !currentValue);
-            }
-
-            return obj;
-        }
-    }
-}

mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs

@@ -40,18 +40,15 @@
 		public TType RedirectKeys { get; set; }
 		public TType RedirectDiskDrives { get; set; }
 		public TType RedirectPrinters { get; set; }
-        public TType RedirectClipboard { get; set; }
-        public TType RedirectPorts { get; set; }
+		public TType RedirectPorts { get; set; }
 		public TType RedirectSmartCards { get; set; }
 		public TType RedirectSound { get; set; }
 		public TType SoundQuality { get; set; }
-		public TType RedirectAudioCapture { get; set; }
 		public TType PreExtApp { get; set; }
 		public TType PostExtApp { get; set; }
 		public TType MacAddress { get; set; }
-        public TType UserField { get; set; }
-        public TType Favorite { get; set; }
-        public TType VNCCompression { get; set; }
+		public TType UserField { get; set; }
+		public TType VNCCompression { get; set; }
 		public TType VNCEncoding { get; set; }
 		public TType VNCAuthMode { get; set; }
 		public TType VNCProxyType { get; set; }

mRemoteNGTests/Tools/Registry/WindowsRegistryTests.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Linq;
-using mRemoteNG.Tools.WindowsRegistry;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.Tools.Registry
-{
-    public class WindowsRegistryTests
-    {
-        private WindowsRegistry _registry;
-
-        [SetUp]
-        public void Setup()
-        {
-            _registry = new WindowsRegistry();
-        }
-
-        [Test]
-        public void CanGetSubkeyNames()
-        {
-            var subKeyNames = _registry.GetSubKeyNames(RegistryHive.CurrentUser, "Software");
-            Assert.That(subKeyNames, Does.Contain("Microsoft"));
-        }
-
-        [Test]
-        public void GetSubkeyNamesThrowsIfGivenNullKeyPath()
-        {
-            Assert.Throws<ArgumentNullException>(() => _registry.GetSubKeyNames(RegistryHive.CurrentUser, null));
-        }
-
-        [Test]
-        public void CanGetKeyValue()
-        {
-            var keyValue = _registry.GetKeyValue(RegistryHive.ClassesRoot, @".dll\PersistentHandler", "");
-            Assert.That(keyValue.FirstOrDefault(), Is.EqualTo("{098f2470-bae0-11cd-b579-08002b30bfeb}"));
-        }
-
-        [Test]
-        public void GetKeyValueThrowsIfGivenNullKeyPath()
-        {
-            Assert.Throws<ArgumentNullException>(() => _registry.GetKeyValue(RegistryHive.CurrentUser, null, ""));
-        }
-
-        [Test]
-        public void GetKeyValueThrowsIfGivenNullPropertyName()
-        {
-            Assert.Throws<ArgumentNullException>(() => _registry.GetKeyValue(RegistryHive.CurrentUser, "", null));
-        }
-    }
-}

mRemoteNGTests/Tree/SelectedConnectionDeletionConfirmerTests.cs

@@ -1,7 +1,7 @@
-using mRemoteNG.Connection;
+using System.Windows.Forms;
+using mRemoteNG.Connection;
 using mRemoteNG.Tree;
 using NUnit.Framework;
-using System.Windows.Forms;
 
 
 namespace mRemoteNGTests.Tree
@@ -30,12 +30,12 @@ namespace mRemoteNGTests.Tree
             Assert.That(deletionConfirmer.Confirm(_testConnectionInfo), Is.False);
         }
 
-        private DialogResult MockClickYes(string promptMessage)
+        private DialogResult MockClickYes(string promptMessage, string title, MessageBoxButtons buttons, MessageBoxIcon icon)
         {
             return DialogResult.Yes;
         }
 
-        private DialogResult MockClickNo(string promptMessage)
+        private DialogResult MockClickNo(string promptMessage, string title, MessageBoxButtons buttons, MessageBoxIcon icon)
         {
             return DialogResult.No;
         }

mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs

@@ -2,16 +2,14 @@
 using System.Threading;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
-using mRemoteNG.Tools.Clipboard;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
 using mRemoteNG.UI.Controls;
-using NSubstitute;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.UI.Controls
 {
-	public class ConnectionTreeTests
+    public class ConnectionTreeTests
 	{
 		private ConnectionTreeSearchTextFilter _filter;
 		private ConnectionTree _connectionTree;
@@ -75,9 +73,8 @@ namespace mRemoteNGTests.UI.Controls
 	        connectionTreeModel.AddRootNode(puttyRoot);
 
 	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
 
-			_connectionTree.SelectedObject = puttyRoot;
+	        _connectionTree.SelectedObject = puttyRoot;
 	        _connectionTree.AddConnection();
 
 	        Assert.That(puttyRoot.Children, Is.Empty);
@@ -94,9 +91,8 @@ namespace mRemoteNGTests.UI.Controls
 	        connectionTreeModel.AddRootNode(puttyRoot);
 
 	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
 
-			_connectionTree.SelectedObject = puttyRoot;
+	        _connectionTree.SelectedObject = puttyRoot;
 	        _connectionTree.AddFolder();
 
 	        Assert.That(puttyRoot.Children, Is.Empty);
@@ -110,9 +106,8 @@ namespace mRemoteNGTests.UI.Controls
 	        var root = new RootNodeInfo(RootNodeType.Connection);
 	        connectionTreeModel.AddRootNode(root);
 	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
 
-			_connectionTree.SelectedObject = root;
+	        _connectionTree.SelectedObject = root;
             _connectionTree.DuplicateSelectedNode();
 
 	        Assert.That(connectionTreeModel.RootNodes, Has.One.Items);
@@ -120,33 +115,14 @@ namespace mRemoteNGTests.UI.Controls
 
 	    [Test]
 	    [Apartment(ApartmentState.STA)]
-	    public void CanDuplicateConnectionNode()
-	    {
-		    var connectionTreeModel = new ConnectionTreeModel();
-		    var root = new RootNodeInfo(RootNodeType.Connection);
-			var con1 = new ConnectionInfo();
-			root.AddChild(con1);
-		    connectionTreeModel.AddRootNode(root);
-		    _connectionTree.ConnectionTreeModel = connectionTreeModel;
-		    _connectionTree.ExpandAll();
-
-			_connectionTree.SelectedObject = con1;
-		    _connectionTree.DuplicateSelectedNode();
-
-		    Assert.That(root.Children, Has.Exactly(2).Items);
-	    }
-
-		[Test]
-	    [Apartment(ApartmentState.STA)]
 	    public void CannotDuplicateRootPuttyNode()
 	    {
 	        var connectionTreeModel = new ConnectionTreeModel();
 	        var puttyRoot = new RootNodeInfo(RootNodeType.PuttySessions);
 	        connectionTreeModel.AddRootNode(puttyRoot);
 	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
 
-			_connectionTree.SelectedObject = puttyRoot;
+	        _connectionTree.SelectedObject = puttyRoot;
 	        _connectionTree.DuplicateSelectedNode();
 
 	        Assert.That(connectionTreeModel.RootNodes, Has.One.Items);
@@ -178,9 +154,8 @@ namespace mRemoteNGTests.UI.Controls
 	        var puttyRoot = new RootNodeInfo(RootNodeType.PuttySessions);
 	        connectionTreeModel.AddRootNode(puttyRoot);
 	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
 
-			_connectionTree.SelectedObject = null;
+            _connectionTree.SelectedObject = null;
 	        _connectionTree.DuplicateSelectedNode();
 
 	        Assert.That(connectionTreeModel.RootNodes, Has.One.Items);
@@ -219,105 +194,9 @@ namespace mRemoteNGTests.UI.Controls
 	        connectionTreeModel.AddRootNode(root);
 
 	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
-			_connectionTree.SelectedObject = null;
+	        _connectionTree.SelectedObject = null;
 
 	        Assert.DoesNotThrow(() => _connectionTree.RenameSelectedNode());
         }
-
-        [Test]
-        [Apartment(ApartmentState.STA)]
-        public void CopyHostnameCopiesTheHostnameOfTheSelectedConnection()
-        {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-			var con1 = new ConnectionInfo {Hostname = "MyHost"};
-			root.AddChild(con1);
-			connectionTreeModel.AddRootNode(root);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-			_connectionTree.ExpandAll();
-	        _connectionTree.SelectedObject = con1;
-
-	        var clipboard = Substitute.For<IClipboard>();
-			_connectionTree.CopyHostnameSelectedNode(clipboard);
-			clipboard.Received(1).SetText(con1.Hostname);
-        }
-
-        [Test]
-        [Apartment(ApartmentState.STA)]
-        public void CopyHostnameCopiesTheNodeNameOfTheSelectedContainer()
-        {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-	        var container = new ContainerInfo { Name = "MyFolder" };
-	        root.AddChild(container);
-	        connectionTreeModel.AddRootNode(root);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
-			_connectionTree.SelectedObject = container;
-
-	        var clipboard = Substitute.For<IClipboard>();
-			_connectionTree.CopyHostnameSelectedNode(clipboard);
-			clipboard.Received(1).SetText(container.Name);
-		}
-
-        [Test]
-        [Apartment(ApartmentState.STA)]
-        public void CopyHostnameDoesNotCopyAnythingIfNoNodeSelected()
-        {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-	        var con1 = new ConnectionInfo { Hostname = "MyHost" };
-	        root.AddChild(con1);
-	        connectionTreeModel.AddRootNode(root);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
-			_connectionTree.SelectedObject = null;
-
-			var clipboard = Substitute.For<IClipboard>();
-			_connectionTree.CopyHostnameSelectedNode(clipboard);
-			clipboard.DidNotReceiveWithAnyArgs().SetText("");
-        }
-
-        [Test]
-        [Apartment(ApartmentState.STA)]
-        public void CopyHostnameDoesNotCopyAnythingIfHostnameOfSelectedConnectionIsEmpty()
-        {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-	        var con1 = new ConnectionInfo { Hostname = string.Empty };
-	        root.AddChild(con1);
-	        connectionTreeModel.AddRootNode(root);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
-			_connectionTree.SelectedObject = con1;
-
-	        var clipboard = Substitute.For<IClipboard>();
-			_connectionTree.CopyHostnameSelectedNode(clipboard);
-			clipboard.DidNotReceiveWithAnyArgs().SetText("");
-		}
-
-        [Test]
-        [Apartment(ApartmentState.STA)]
-        public void CopyHostnameDoesNotCopyAnythingIfNameOfSelectedContainerIsEmpty()
-        {
-	        var connectionTreeModel = new ConnectionTreeModel();
-	        var root = new RootNodeInfo(RootNodeType.Connection);
-	        var con1 = new ContainerInfo { Name = string.Empty};
-	        root.AddChild(con1);
-	        connectionTreeModel.AddRootNode(root);
-
-	        _connectionTree.ConnectionTreeModel = connectionTreeModel;
-	        _connectionTree.ExpandAll();
-			_connectionTree.SelectedObject = con1;
-
-	        var clipboard = Substitute.For<IClipboard>();
-			_connectionTree.CopyHostnameSelectedNode(clipboard);
-			clipboard.DidNotReceiveWithAnyArgs().SetText("");
-		}
-	}
+    }
 }

mRemoteNGTests/UI/Controls/FilteredPropertyGridTests.cs

@@ -1,133 +0,0 @@
-using System;
-using System.Linq;
-using mRemoteNG.UI.Controls.FilteredPropertyGrid;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.UI.Controls
-{
-	public class FilteredPropertyGridTests
-	{
-		[Test]
-		public void AllPropertiesVisibleByDefault()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new {Prop1 = "hello"};
-			grid.SelectedObject = obj;
-
-			Assert.That(grid.VisibleProperties, Is.EquivalentTo(new []{ nameof(obj.Prop1) }));
-		}
-
-		[Test]
-		public void PropertiesOnTheHiddenPropertiesListAreNotShown()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello", Prop2 = "world" };
-			grid.HiddenProperties = new[] { nameof(obj.Prop1) };
-			grid.SelectedObject = obj;
-
-			Assert.That(grid.VisibleProperties, Is.EquivalentTo(new[] { nameof(obj.Prop2) }));
-		}
-
-		[Test]
-		public void OnlyPropertiesOnTheBrowsablePropertiesListAreShown()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello", Prop2 = "world" };
-			grid.BrowsableProperties = new[] { nameof(obj.Prop1) };
-			grid.SelectedObject = obj;
-
-			Assert.That(grid.VisibleProperties, Is.EquivalentTo(new[] { nameof(obj.Prop1) }));
-		}
-
-		[Test]
-		public void APropertyOnBothTheBrowsableAndHiddenListWillNotBeShown()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello", Prop2 = "world", Prop3 = "!" };
-			grid.BrowsableProperties = new[] { nameof(obj.Prop1), nameof(obj.Prop2) };
-			grid.HiddenProperties = new[] { nameof(obj.Prop1) };
-			grid.SelectedObject = obj;
-
-			Assert.That(grid.VisibleProperties, Is.EquivalentTo(new[] { nameof(obj.Prop2) }));
-		}
-
-		[Test]
-		public void ExceptionThrownWhenNonExistantPropertyFoundInBrowsablePropertiesList()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello" };
-			grid.SelectedObject = obj;
-
-			Assert.Throws<InvalidOperationException>(() =>
-				grid.BrowsableProperties = new[] {"NonExistantProperty"});
-		}
-
-		[Test]
-		public void HiddenPropertiesListCanHandleNonExistentProperties()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello" };
-			grid.SelectedObject = obj;
-
-			Assert.DoesNotThrow(() => grid.HiddenProperties = new[] { "NonExistantProperty" });
-		}
-
-		[Test]
-		public void GetVisibleGridItemsReturnsAllExpandedItems()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello", Prop2 = new{Prop3 = "world"} };
-			grid.SelectedObject = obj;
-
-			var visibleGridItems = grid.GetVisibleGridItems();
-
-			Assert.That(visibleGridItems.Select(i => i.Label), 
-				Is.EquivalentTo(new[]
-				{
-					nameof(obj.Prop1),
-					nameof(obj.Prop2)
-				}));
-		}
-
-		[Test]
-		public void CanSelectGridItem()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello", Prop2 = "world" };
-			grid.SelectedObject = obj;
-
-			grid.SelectGridItem(nameof(obj.Prop2));
-
-			Assert.That(grid.SelectedGridItem.PropertyDescriptor?.Name,
-				Is.EqualTo(nameof(obj.Prop2)));
-		}
-
-		[Test]
-		public void FindNextGridItemPropertyReturnsTheCorrectItem()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello", Prop2 = "world" };
-			grid.SelectedObject = obj;
-
-			grid.SelectGridItem(nameof(obj.Prop1));
-			var nextGridItem = grid.FindNextGridItemProperty(grid.SelectedGridItem);
-
-			Assert.That(nextGridItem?.PropertyDescriptor?.Name,
-				Is.EqualTo(nameof(obj.Prop2)));
-		}
-
-		[Test]
-		public void FindPreviousGridItemPropertyReturnsTheCorrectItem()
-		{
-			var grid = new FilteredPropertyGrid();
-			var obj = new { Prop1 = "hello", Prop2 = "world", Prop3 = "!" };
-			grid.SelectedObject = obj;
-
-			grid.SelectGridItem(nameof(obj.Prop3));
-			var nextGridItem = grid.FindPreviousGridItemProperty(grid.SelectedGridItem);
-
-			Assert.That(nextGridItem?.PropertyDescriptor?.Name,
-				Is.EqualTo(nameof(obj.Prop2)));
-		}
-	}
-}

mRemoteNGTests/UI/Controls/SecureTextBoxTestForm.Designer.cs

@@ -43,8 +43,8 @@ namespace mRemoteNGTests.UI.Controls
             // 
             // SecureTextBoxTestForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(256, 45);
             this.Controls.Add(this.secureTextBox1);
             this.Name = "SecureTextBoxTestForm";

mRemoteNGTests/UI/Controls/TestForm.Designer.cs

@@ -32,8 +32,8 @@
             // 
             // TestForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(284, 262);
             this.Name = "TestForm";
             this.Text = "TestForm";

mRemoteNGTests/UI/Controls/TextBoxExtensionsTestForm.Designer.cs

@@ -40,8 +40,8 @@
             // 
             // TextBoxExtensionsTestForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(220, 48);
             this.Controls.Add(this.textBox1);
             this.Name = "TextBoxExtensionsTestForm";

mRemoteNGTests/UI/DisplayPropertiesTests.cs

@@ -1,123 +0,0 @@
-using System;
-using System.Drawing;
-using mRemoteNG.UI;
-using mRemoteNG.UI.GraphicsUtilities;
-using mRemoteNGTests.Properties;
-using NSubstitute;
-using NUnit.Framework;
-
-namespace mRemoteNGTests.UI
-{
-    public class DisplayPropertiesTests
-    {
-        [Test]
-        public void ScaleHeightReturnsValueScaledByHeightScalingFactor()
-        {
-            var graphics = Substitute.For<IGraphicsProvider>();
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
-            var sut = new DisplayProperties(graphics);
-
-            var initialValue = 10;
-            var scaledValue = sut.ScaleHeight(initialValue);
-
-            Assert.That(scaledValue, Is.EqualTo(sut.ResolutionScalingFactor.Height * initialValue));
-        }
-
-        [Test]
-        public void ScaleWidthReturnsValueScaledByWidthScalingFactor()
-        {
-            var graphics = Substitute.For<IGraphicsProvider>();
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
-            var sut = new DisplayProperties(graphics);
-
-            var initialValue = 10;
-            var scaledValue = sut.ScaleWidth(initialValue);
-
-            Assert.That(scaledValue, Is.EqualTo(sut.ResolutionScalingFactor.Width * initialValue));
-        }
-
-        [Test]
-        public void ScaleSizeReturnsNewSizeWithCorrectlyScaledHeight()
-        {
-            var graphics = Substitute.For<IGraphicsProvider>();
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
-            var sut = new DisplayProperties(graphics);
-
-            var initialValue = new Size(12, 16);
-            var scaledValue = sut.ScaleSize(initialValue);
-
-            Assert.That(scaledValue.Height, Is.EqualTo(sut.ResolutionScalingFactor.Height * initialValue.Height));
-        }
-
-        [Test]
-        public void ScaleSizeReturnsNewSizeWithCorrectlyScaledWidth()
-        {
-            var graphics = Substitute.For<IGraphicsProvider>();
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
-            var sut = new DisplayProperties(graphics);
-
-            var initialValue = new Size(12, 16);
-            var scaledValue = sut.ScaleSize(initialValue);
-
-            Assert.That(scaledValue.Width, Is.EqualTo(sut.ResolutionScalingFactor.Width * initialValue.Width));
-        }
-
-        [Test]
-        public void ScaleImageReturnsNewImageWithCorrectlyScaledHeight()
-        {
-            var graphics = Substitute.For<IGraphicsProvider>();
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
-            var sut = new DisplayProperties(graphics);
-
-            var initialValue = Resources.TestImage;
-            var scaledValue = sut.ScaleImage(initialValue);
-
-            Assert.That(scaledValue.Height, Is.EqualTo(sut.ResolutionScalingFactor.Height * initialValue.Height));
-        }
-
-        [Test]
-        public void ScaleImageReturnsNewImageWithCorrectlyScaledWidth()
-        {
-            var graphics = Substitute.For<IGraphicsProvider>();
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 2));
-            var sut = new DisplayProperties(graphics);
-
-            var initialValue = Resources.TestImage;
-            var scaledValue = sut.ScaleImage(initialValue);
-
-            Assert.That(scaledValue.Width, Is.EqualTo(sut.ResolutionScalingFactor.Width * initialValue.Width));
-        }
-
-        [Test]
-        public void ResolutionScalingFactorAlwaysReturnsMostUpdatedValue()
-        {
-            var graphics = Substitute.For<IGraphicsProvider>();
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(4, 4));
-            var sut = new DisplayProperties(graphics);
-
-            graphics.GetResolutionScalingFactor().Returns(new SizeF(8, 8));
-            Assert.That(sut.ResolutionScalingFactor.Width, Is.EqualTo(8));
-        }
-
-        [Test]
-        public void AttemptingToScaleANullImageWillThrowAnException()
-        {
-            var sut = new DisplayProperties(Substitute.For<IGraphicsProvider>());
-            Assert.Throws<ArgumentNullException>(() => sut.ScaleImage((Image)null));
-        }
-
-        [Test]
-        public void AttemptingToScaleANullIconWillThrowAnException()
-        {
-            var sut = new DisplayProperties(Substitute.For<IGraphicsProvider>());
-            Assert.Throws<ArgumentNullException>(() => sut.ScaleImage((Icon)null));
-        }
-
-        [Test]
-        public void AttemptingToCallConstructorWithNullGraphicsProviderWillThrow()
-        {
-            // ReSharper disable once ObjectCreationAsStatement
-            Assert.Throws<ArgumentNullException>(() => new DisplayProperties(null));
-        }
-    }
-}

mRemoteNGTests/UI/Forms/OptionsFormSetupAndTeardown.cs

@@ -5,7 +5,7 @@ namespace mRemoteNGTests.UI.Forms
 {
     public class OptionsFormSetupAndTeardown
     {
-        protected FrmOptions _optionsForm;
+        protected frmOptions _optionsForm;
 
         [OneTimeSetUp]
         public void OnetimeSetup()
@@ -15,7 +15,7 @@ namespace mRemoteNGTests.UI.Forms
         [SetUp]
         public void Setup()
         {
-            _optionsForm = new FrmOptions();
+            _optionsForm = new frmOptions();
             _optionsForm.Show();
         }
 

mRemoteNGTests/UI/Forms/PasswordFormTests.cs

@@ -1,10 +1,10 @@
-using mRemoteNG.UI.Forms;
+using NUnit.Framework;
 using NUnit.Extensions.Forms;
-using NUnit.Framework;
+using mRemoteNG.UI.Forms;
 
 namespace mRemoteNGTests.UI.Forms
 {
-	[TestFixture]
+    [TestFixture]
     public class PasswordFormTests
     {
         PasswordForm _passwordForm;
@@ -27,7 +27,6 @@ namespace mRemoteNGTests.UI.Forms
         }
 
         [Test]
-		[SetUICulture("en-US")]
         public void PasswordFormText()
         {
             FormTester formTester = new FormTester("PasswordForm");

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs

@@ -12,14 +12,17 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.UI.Window.ConfigWindowTests
 {
-	public class ConfigWindowGeneralTests
+    public class ConfigWindowGeneralTests
     {
         private ConfigWindow _configWindow;
 
         [SetUp]
         public void Setup()
         {
-            _configWindow = new ConfigWindow();
+            _configWindow = new ConfigWindow
+            {
+                PropertiesVisible = true
+            };
         }
 
         [TestCaseSource(nameof(ConnectionInfoGeneralTestCases))]
@@ -54,92 +57,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
             Assert.That(_configWindow.VisibleObjectProperties, Is.EquivalentTo(expectedVisibleProperties));
         }
 
-		[Test]
-        public void SwitchFromInheritanceToConnectionPropertiesWhenClickingRootNode()
-        {
-			// connection with a normal parent container
-			var connection = new ConnectionInfo();
-			connection.SetParent(new ContainerInfo());
-
-			_configWindow.SelectedTreeNode = connection;
-			_configWindow.ShowInheritanceProperties();
-
-	        _configWindow.SelectedTreeNode = new RootNodeInfo(RootNodeType.Connection);
-			Assert.That(_configWindow.PropertiesVisible, Is.True, 
-				() => "The property mode should switch from inheritance to connection properties when clicking on the root node.");
-		}
-
-        [Test]
-        public void SwitchFromInheritanceToConnectionPropertiesWhenClickingRootPuttyNode()
-        {
-	        // connection with a normal parent container
-	        var connection = new ConnectionInfo();
-	        connection.SetParent(new ContainerInfo());
-
-	        _configWindow.SelectedTreeNode = connection;
-	        _configWindow.ShowInheritanceProperties();
-
-	        _configWindow.SelectedTreeNode = new RootPuttySessionsNodeInfo();
-	        Assert.That(_configWindow.PropertiesVisible, Is.True,
-		        () => "The property mode should switch from inheritance to connection properties when clicking on the root node.");
-        }
-
-		[Test]
-        public void SwitchFromInheritanceToConnectionPropertiesWhenClickingChildOfRootNode()
-        {
-	        // connection with a normal parent container
-			var root = new RootNodeInfo(RootNodeType.Connection);
-			var containerWhoseParentIsRoot = new ContainerInfo();
-	        var connection = new ConnectionInfo();
-	        root.AddChild(containerWhoseParentIsRoot);
-			containerWhoseParentIsRoot.AddChild(connection);
-
-	        _configWindow.SelectedTreeNode = connection;
-	        _configWindow.ShowInheritanceProperties();
-
-	        _configWindow.SelectedTreeNode = containerWhoseParentIsRoot;
-	        Assert.That(_configWindow.PropertiesVisible, Is.True,
-		        () => "The property mode should switch from inheritance to connection properties " +
-		              "when clicking on a container whose parent is the root node.");
-        }
-
-		[TestCaseSource(nameof(EveryNodeType))]
-        public void DefaultConnectionPropertiesCanBeShownRegardlessOfWhichNodeIsSelected(ConnectionInfo selectedObject)
-        {
-	        _configWindow.SelectedTreeNode = selectedObject;
-			Assert.That(_configWindow.CanShowDefaultProperties, Is.True);
-        }
-
-        [TestCaseSource(nameof(EveryNodeType))]
-        public void DefaultInheritancePropertiesCanBeShownRegardlessOfWhichNodeIsSelected(ConnectionInfo selectedObject)
-        {
-	        _configWindow.SelectedTreeNode = selectedObject;
-	        Assert.That(_configWindow.CanShowDefaultInheritance, Is.True);
-        }
-
-        [TestCaseSource(nameof(EveryNodeType))]
-		public void ConnectionPropertiesCanAlwaysBeShownUnlessNothingIsSelected(ConnectionInfo selectedObject)
-        {
-	        _configWindow.SelectedTreeNode = selectedObject;
-
-	        var selectedObjectNotNull = selectedObject != null;
-	        Assert.That(_configWindow.CanShowProperties, Is.EqualTo(selectedObjectNotNull));
-		}
-
-		[TestCaseSource(nameof(EveryNodeType))]
-		public void InheritancePropertiesAreVisibleInCertainCases(ConnectionInfo selectedObject)
-		{
-			_configWindow.SelectedTreeNode = selectedObject;
-
-			var shouldBeAvailable = selectedObject != null &&
-									!(selectedObject is RootNodeInfo) &&
-									!(selectedObject is PuttySessionInfo) &&
-									!(selectedObject.Parent is RootNodeInfo);
-
-			Assert.That(_configWindow.CanShowInheritance, Is.EqualTo(shouldBeAvailable));
-		}
-
-		private static IEnumerable<TestCaseData> ConnectionInfoGeneralTestCases()
+        private static IEnumerable<TestCaseData> ConnectionInfoGeneralTestCases()
         {
             var protocolTypes = typeof(ProtocolType).GetEnumValues().OfType<ProtocolType>();
             var testCases = new List<TestCaseData>();
@@ -162,56 +80,6 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
             return testCases;
         }
 
-		private static IEnumerable<TestCaseData> EveryNodeType()
-		{
-			var protocolTypes = typeof(ProtocolType).GetEnumValues().OfType<ProtocolType>().ToList();
-			var root = new RootNodeInfo(RootNodeType.Connection);
-			var container = new ContainerInfo();
-			var connectionsWithNormalParent = protocolTypes
-				.Select(protocolType =>
-				{
-					var c = new ConnectionInfo {Protocol = protocolType};
-					c.SetParent(container);
-					return new TestCaseData(c).SetName(protocolType + ", Connection, NormalParent");
-				});
-
-			var connectionsWithRootParent = protocolTypes
-				.Select(protocolType =>
-				{
-					var c = new ConnectionInfo { Protocol = protocolType };
-					c.SetParent(root);
-					return new TestCaseData(c).SetName(protocolType + ", Connection, RootParent");
-				});
-
-			var contianersWithNormalParent = protocolTypes
-				.Select(protocolType =>
-				{
-					var c = new ContainerInfo { Protocol = protocolType };
-					c.SetParent(container);
-					return new TestCaseData(c).SetName(protocolType + ", Connection, NormalParent");
-				});
-
-			var containersWithRootParent = protocolTypes
-				.Select(protocolType =>
-				{
-					var c = new ContainerInfo { Protocol = protocolType };
-					c.SetParent(root);
-					return new TestCaseData(c).SetName(protocolType + ", Connection, RootParent");
-				});
-
-			return connectionsWithNormalParent
-				.Concat(connectionsWithRootParent)
-				.Concat(contianersWithNormalParent)
-				.Concat(containersWithRootParent)
-				.Concat(new[]
-				{
-					new TestCaseData(root).SetName("RootNode"),
-					new TestCaseData(new RootPuttySessionsNodeInfo()).SetName("RootPuttyNode"), 
-					new TestCaseData(new PuttySessionInfo()).SetName("PuttyNode"), 
-					new TestCaseData(null).SetName("Null"), 
-				});
-		}
-
         internal static ConnectionInfo ConstructConnectionInfo(ProtocolType protocol, bool isContainer)
         {
             // build connection info. set certain connection properties so
@@ -246,7 +114,6 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                 nameof(ConnectionInfo.PostExtApp),
                 nameof(ConnectionInfo.MacAddress),
                 nameof(ConnectionInfo.UserField),
-                nameof(ConnectionInfo.Favorite),
             };
 
             if (!isContainer)
@@ -282,11 +149,9 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
                         nameof(ConnectionInfo.RedirectKeys),
                         nameof(ConnectionInfo.RedirectDiskDrives),
                         nameof(ConnectionInfo.RedirectPrinters),
-                        nameof(ConnectionInfo.RedirectClipboard),
                         nameof(ConnectionInfo.RedirectPorts),
                         nameof(ConnectionInfo.RedirectSmartCards),
                         nameof(ConnectionInfo.RedirectSound),
-                        nameof(ConnectionInfo.RedirectAudioCapture),
                     });
                     break;
                 case ProtocolType.VNC:

mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowSpecialTestsBase.cs

@@ -6,7 +6,7 @@ using NUnit.Framework;
 
 namespace mRemoteNGTests.UI.Window.ConfigWindowTests
 {
-	public abstract class ConfigWindowSpecialTestsBase
+    public abstract class ConfigWindowSpecialTestsBase
     {
         protected abstract ProtocolType Protocol { get; }
         protected bool TestAgainstContainerInfo { get; set; } = false;
@@ -20,7 +20,10 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
             ConnectionInfo = ConfigWindowGeneralTests.ConstructConnectionInfo(Protocol, TestAgainstContainerInfo);
             ExpectedPropertyList = ConfigWindowGeneralTests.BuildExpectedConnectionInfoPropertyList(Protocol, TestAgainstContainerInfo);
 
-            ConfigWindow = new ConfigWindow();
+            ConfigWindow = new ConfigWindow
+            {
+                PropertiesVisible = true,
+            };
         }
 
         public void RunVerification()

mRemoteNGTests/app.config

@@ -4,11 +4,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.16.0.0" newVersion="2.16.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

mRemoteNGTests/mRemoteNGTests.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -58,21 +57,21 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.4.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.4\lib\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
+      <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.2.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NSubstitute, Version=4.0.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <HintPath>..\packages\NSubstitute.4.0.0\lib\net46\NSubstitute.dll</HintPath>
+    <Reference Include="NSubstitute, Version=3.1.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
+      <HintPath>..\packages\NSubstitute.3.1.0\lib\net46\NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="NUnitForms">
       <HintPath>nUnitForms\bin\NUnitForms.dll</HintPath>
@@ -85,17 +84,14 @@
     <Reference Include="System.Data" />
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.16.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+      <HintPath>..\packages\DockPanelSuite.2.16.1\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -181,13 +177,11 @@
     <Compile Include="TestHelpers\ConnectionTreeModelBuilder.cs" />
     <Compile Include="Security\XmlCryptoProviderBuilderTests.cs" />
     <Compile Include="TestHelpers\FileTestHelpers.cs" />
-    <Compile Include="TestHelpers\Randomizer.cs" />
     <Compile Include="TestHelpers\SerializableConnectionInfoAllPropertiesOfType.cs" />
     <Compile Include="Tools\DisposableActionTests.cs" />
     <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
     <Compile Include="Tools\FullyObservableCollectionTests.cs" />
     <Compile Include="Tools\OptionalTests.cs" />
-    <Compile Include="Tools\Registry\WindowsRegistryTests.cs" />
     <Compile Include="Tree\ClickHandlers\TreeNodeCompositeClickHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeDragAndDropHandlerTests.cs" />
     <Compile Include="Tree\ConnectionTreeModelTests.cs" />
@@ -218,7 +212,6 @@
     <Compile Include="Tree\ClickHandlers\SwitchToConnectionClickHandlerTests.cs" />
     <Compile Include="Tree\SelectedConnectionDeletionConfirmerTests.cs" />
     <Compile Include="UI\Controls\ConnectionTreeTests.cs" />
-    <Compile Include="UI\Controls\FilteredPropertyGridTests.cs" />
     <Compile Include="UI\Controls\PageSequenceTests.cs" />
     <Compile Include="UI\Controls\SecureTextBoxTestForm.cs">
       <SubType>Form</SubType>
@@ -240,7 +233,6 @@
       <DependentUpon>TextBoxExtensionsTestForm.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Controls\TextBoxExtensionsTests.cs" />
-    <Compile Include="UI\DisplayPropertiesTests.cs" />
     <Compile Include="UI\Forms\OptionsFormSetupAndTeardown.cs" />
     <Compile Include="UI\Forms\PasswordFormTests.cs" />
     <Compile Include="UI\WindowListTests.cs" />
@@ -307,7 +299,6 @@
     <Content Include="Resources\beta-update.txt" />
     <Content Include="Resources\dev-update-portable.txt" />
     <Content Include="Resources\dev-update.txt" />
-    <None Include="Resources\TestImage.bmp" />
     <Content Include="Resources\update-portable.txt" />
     <Content Include="Resources\update.txt" />
   </ItemGroup>
@@ -337,12 +328,6 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

mRemoteNGTests/packages.config

@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.4" targetFramework="net46" />
-  <package id="Castle.Core" version="4.3.1" targetFramework="net46" />
-  <package id="DockPanelSuite" version="3.0.6" targetFramework="net46" />
+  <package id="BouncyCastle" version="1.8.1" targetFramework="net46" />
+  <package id="Castle.Core" version="4.2.0" targetFramework="net46" />
+  <package id="DockPanelSuite" version="2.16.1" targetFramework="net46" />
   <package id="log4net" version="2.0.8" targetFramework="net46" />
-  <package id="NSubstitute" version="4.0.0" targetFramework="net46" />
-  <package id="NUnit" version="3.11.0" targetFramework="net46" />
-  <package id="NUnit.Console" version="3.9.0" targetFramework="net46" />
-  <package id="NUnit.ConsoleRunner" version="3.9.0" targetFramework="net46" />
+  <package id="NSubstitute" version="3.1.0" targetFramework="net46" />
+  <package id="NUnit" version="3.9.0" targetFramework="net46" />
+  <package id="NUnit.Console" version="3.7.0" targetFramework="net46" />
+  <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net46" />
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net46" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.5" targetFramework="net46" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net46" />
+  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.3" targetFramework="net46" />
+  <package id="NUnit.Extension.VSProjectLoader" version="3.7.0" targetFramework="net46" />
   <package id="ObjectListView.Official" version="2.9.1" targetFramework="net46" />
   <package id="OpenCover" version="4.6.519" targetFramework="net46" />
   <package id="ReportGenerator" version="3.0.2" targetFramework="net46" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" />
+  <package id="System.Threading.Tasks.Extensions" version="4.4.0" targetFramework="net46" />
 </packages>

mRemoteV1.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 14.0.25420.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteV1", "mRemoteV1\mRemoteV1.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
@@ -61,7 +61,6 @@ Global
 		{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
@@ -73,7 +72,6 @@ Global
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.ActiveCfg = Release|x86
 		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Debug|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x86.ActiveCfg = Debug|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.ActiveCfg = Debug|x86
@@ -88,7 +86,6 @@ Global
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x86.ActiveCfg = Release|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x86.ActiveCfg = Debug|x86
@@ -108,7 +105,6 @@ Global
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|Any CPU
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|Any CPU
 		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU

mRemoteV1/.editorconfig

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

mRemoteV1/App/CompatibilityChecker.cs

@@ -1,11 +1,11 @@
 using Microsoft.Win32;
 using mRemoteNG.App.Info;
+using mRemoteNG.UI.Forms;
 using mRemoteNG.UI.TaskDialog;
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 using mRemoteNG.Messages;
-using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
@@ -21,8 +21,7 @@ namespace mRemoteNG.App
         {
             if (Settings.Default.OverrideFIPSCheck)
             {
-                messageCollector.AddMessage(MessageClass.InformationMsg, "OverrideFIPSCheck is set. Will skip check...",
-                                            true);
+                messageCollector.AddMessage(MessageClass.InformationMsg, "OverrideFIPSCheck is set. Will skip check...", true);
                 return;
             }
 
@@ -32,15 +31,7 @@ namespace mRemoteNG.App
             var errorText = string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
             messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);
 
-            //About to pop up a message, let's not block it...
-            FrmSplashScreen.getInstance().Close();
-
-            var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName,
-                                                                Language.strCompatibilityProblemDetected, errorText, "",
-                                                                "",
-                                                                Language.strCheckboxDoNotShowThisMessageAgain,
-                                                                ETaskDialogButtons.OkCancel, ESysIcons.Warning,
-                                                                ESysIcons.Warning);
+            var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, errorText, "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.OkCancel, ESysIcons.Warning, ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked && ShouldIStayOrShouldIGo == DialogResult.OK)
             {
                 messageCollector.AddMessage(MessageClass.ErrorMsg, "User requests that FIPS check be overridden", true);
@@ -64,8 +55,7 @@ namespace mRemoteNG.App
 
         private static bool FipsPolicyEnabledForServer2008AndNewer()
         {
-            var regKey =
-                Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy");
+            var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy");
             var fipsPolicy = regKey?.GetValue("Enabled");
             if (fipsPolicy == null) return false;
             fipsPolicy = Convert.ToInt32(fipsPolicy);
@@ -90,14 +80,9 @@ namespace mRemoteNG.App
             }
 
             if (proccesses.Length <= 0) return;
-            CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected,
-                                   string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected,
-                                                 Application.ProductName), "",
-                                   "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok,
-                                   ESysIcons.Warning,
-                                   ESysIcons.Warning);
+            CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected, Application.ProductName), "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok, ESysIcons.Warning, ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked)
                 Settings.Default.CompatibilityWarnLenovoAutoScrollUtility = false;
         }
     }
-}
+}

mRemoteV1/App/Export.cs

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

mRemoteV1/App/Import.cs

@@ -74,9 +74,7 @@ namespace mRemoteNG.App
 	        }
 		}
 
-        public static void ImportFromActiveDirectory(string ldapPath,
-                                                     ContainerInfo importDestinationContainer,
-                                                     bool importSubOu)
+        public static void ImportFromActiveDirectory(string ldapPath, ContainerInfo importDestinationContainer, bool importSubOu)
         {
             try
             {
@@ -91,9 +89,7 @@ namespace mRemoteNG.App
             }
         }
 
-        public static void ImportFromPortScan(IEnumerable<ScanHost> hosts,
-                                              ProtocolType protocol,
-                                              ContainerInfo importDestinationContainer)
+        public static void ImportFromPortScan(IEnumerable<ScanHost> hosts, ProtocolType protocol, ContainerInfo importDestinationContainer)
         {
             try
             {

mRemoteV1/App/Info/ConnectionsFileInfo.cs

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

mRemoteV1/App/Info/GeneralAppInfo.cs

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

mRemoteV1/App/Info/SettingsFileInfo.cs

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

mRemoteV1/App/Info/UpdateChannelInfo.cs

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

mRemoteV1/App/Initialization/ConnectionIconLoader.cs

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

mRemoteV1/App/Initialization/CredsAndConsSetup.cs

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

mRemoteV1/App/Initialization/MessageCollectorSetup.cs

@@ -8,8 +8,7 @@ namespace mRemoteNG.App.Initialization
 {
     public class MessageCollectorSetup
     {
-        public static void SetupMessageCollector(MessageCollector messageCollector,
-                                                 IList<IMessageWriter> messageWriterList)
+        public static void SetupMessageCollector(MessageCollector messageCollector, IList<IMessageWriter> messageWriterList)
         {
             messageCollector.CollectionChanged += (o, args) =>
             {
@@ -38,37 +37,34 @@ namespace mRemoteNG.App.Initialization
         private static IMessageWriter BuildTextLogMessageWriter()
         {
             return new MessageTypeFilterDecorator(
-                                                  new LogMessageTypeFilteringOptions(),
-                                                  new TextLogMessageWriter(Logger.Instance)
-                                                 );
+                new LogMessageTypeFilteringOptions(),
+                new TextLogMessageWriter(Logger.Instance)
+            );
         }
 
         private static IMessageWriter BuildNotificationPanelMessageWriter()
         {
+            
             return new OnlyLogMessageFilter(
-                                            new MessageTypeFilterDecorator(
-                                                                           new
-                                                                               NotificationPanelMessageFilteringOptions(),
-                                                                           new MessageFocusDecorator(
-                                                                                                     Windows.ErrorsForm,
-                                                                                                     new
-                                                                                                         NotificationPanelSwitchOnMessageFilteringOptions(),
-                                                                                                     new
-                                                                                                         NotificationPanelMessageWriter(Windows
-                                                                                                                                            .ErrorsForm)
-                                                                                                    )
-                                                                          )
-                                           );
+                new MessageTypeFilterDecorator(
+                    new NotificationPanelMessageFilteringOptions(),
+                    new MessageFocusDecorator(
+                        Windows.ErrorsForm,
+                        new NotificationPanelSwitchOnMessageFilteringOptions(),
+                        new NotificationPanelMessageWriter(Windows.ErrorsForm)
+                    )
+                )
+            );
         }
 
         private static IMessageWriter BuildPopupMessageWriter()
         {
             return new OnlyLogMessageFilter(
-                                            new MessageTypeFilterDecorator(
-                                                                           new PopupMessageFilteringOptions(),
-                                                                           new PopupMessageWriter()
-                                                                          )
-                                           );
+                new MessageTypeFilterDecorator(
+                    new PopupMessageFilteringOptions(),
+                    new PopupMessageWriter()
+                )
+            );
         }
     }
 }

mRemoteV1/App/Initialization/StartupDataLogger.cs

@@ -43,8 +43,7 @@ namespace mRemoteNG.App.Initialization
 
             try
             {
-                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem WHERE Primary=True")
-                    .Get())
+                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem WHERE Primary=True").Get())
                 {
                     var managementObject = (ManagementObject)o;
                     osVersion = Convert.ToString(managementObject.GetPropertyValue("Caption")).Trim();
@@ -55,7 +54,6 @@ namespace mRemoteNG.App.Initialization
             {
                 _messageCollector.AddExceptionMessage("Error retrieving operating system information from WMI.", ex);
             }
-
             var osData = string.Join(" ", osVersion, servicePack);
             return osData;
         }
@@ -67,7 +65,6 @@ namespace mRemoteNG.App.Initialization
             {
                 servicePack = $"Service Pack {servicePackNumber}";
             }
-
             return servicePack;
         }
 
@@ -76,8 +73,7 @@ namespace mRemoteNG.App.Initialization
             var architecture = string.Empty;
             try
             {
-                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_Processor WHERE DeviceID=\'CPU0\'")
-                    .Get())
+                foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_Processor WHERE DeviceID=\'CPU0\'").Get())
                 {
                     var managementObject = (ManagementObject)o;
                     var addressWidth = Convert.ToInt32(managementObject.GetPropertyValue("AddressWidth"));
@@ -88,7 +84,6 @@ namespace mRemoteNG.App.Initialization
             {
                 _messageCollector.AddExceptionMessage("Error retrieving operating system address width from WMI.", ex);
             }
-
             return architecture;
         }
 
@@ -115,8 +110,7 @@ namespace mRemoteNG.App.Initialization
 
         private void LogCultureData()
         {
-            var data =
-                $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}";
+            var data = $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}";
             _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
         }
     }

mRemoteV1/App/Logger.cs

@@ -4,12 +4,11 @@ using System.Windows.Forms;
 using log4net;
 using log4net.Appender;
 using log4net.Config;
-
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.App
 {
-    public class Logger
+	public class Logger
     {
         public static readonly Logger Instance = new Logger();
 
@@ -43,7 +42,6 @@ namespace mRemoteNG.App
                 fileAppender.File = path;
                 fileAppender.ActivateOptions();
             }
-
             Log = LogManager.GetLogger("Logger");
         }
 
@@ -58,8 +56,7 @@ namespace mRemoteNG.App
 
         private static string GetLogPathNormalEdition()
         {
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                                Application.ProductName);
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Application.ProductName);
         }
 
         private static string GetLogPathPortableEdition()

mRemoteV1/App/NativeMethods.cs

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

mRemoteV1/App/ProgramRoot.cs

@@ -1,8 +1,8 @@
-using System;
+using mRemoteNG.UI.Forms;
+using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Windows.Forms;
-using mRemoteNG.UI.Forms;
 
 namespace mRemoteNG.App
 {
@@ -24,11 +24,8 @@ namespace mRemoteNG.App
 
         private static void StartApplication()
         {
-            CatchAllUnhandledExceptions();
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            FrmSplashScreen frmSplashScreen = FrmSplashScreen.getInstance();
-            frmSplashScreen.Show();
             Application.Run(FrmMain.Default);
         }
 
@@ -67,38 +64,10 @@ namespace mRemoteNG.App
             var currentProcess = Process.GetCurrentProcess();
             foreach (var enumeratedProcess in Process.GetProcessesByName(currentProcess.ProcessName))
             {
-                if (enumeratedProcess.Id != currentProcess.Id &&
-                    enumeratedProcess.MainModule.FileName == currentProcess.MainModule.FileName &&
-                    enumeratedProcess.MainWindowHandle != IntPtr.Zero)
+                if (enumeratedProcess.Id != currentProcess.Id && enumeratedProcess.MainModule.FileName == currentProcess.MainModule.FileName && enumeratedProcess.MainWindowHandle != IntPtr.Zero)
                     windowHandle = enumeratedProcess.MainWindowHandle;
             }
-
             return windowHandle;
         }
-
-        private static void CatchAllUnhandledExceptions()
-        {
-            Application.ThreadException += ApplicationOnThreadException;
-            Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
-            AppDomain.CurrentDomain.UnhandledException += CurrentDomainOnUnhandledException;
-        }
-
-        private static void ApplicationOnThreadException(object sender, ThreadExceptionEventArgs e)
-        {
-            if (!FrmSplashScreen.getInstance().IsDisposed)
-                FrmSplashScreen.getInstance().Close();
-
-            var window = new UnhandledExceptionWindow(e.Exception, false);
-            window.ShowDialog(FrmMain.Default);
-        }
-
-        private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e)
-        {
-            if (!FrmSplashScreen.getInstance().IsDisposed)
-                FrmSplashScreen.getInstance().Close();
-
-            var window = new UnhandledExceptionWindow(e.ExceptionObject as Exception, e.IsTerminating);
-            window.ShowDialog(FrmMain.Default);
-        }
     }
 }

mRemoteV1/App/Runtime.cs

@@ -32,26 +32,15 @@ namespace mRemoteNG.App
             }
         }
 
-        /// <summary>
-        /// Feature flag to enable the credential manager feature
-        /// </summary>
-        public static bool UseCredentialManager => false;
-
         public static WindowList WindowList { get; set; }
         public static MessageCollector MessageCollector { get; } = new MessageCollector();
         public static NotificationAreaIcon NotificationAreaIcon { get; set; }
         public static ExternalToolsService ExternalToolsService { get; } = new ExternalToolsService();
-
-        public static SecureString EncryptionKey { get; set; } =
-            new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString();
-
+        public static SecureString EncryptionKey { get; set; } = new RootNodeInfo(RootNodeType.Connection).PasswordString.ConvertToSecureString();
         public static ICredentialRepositoryList CredentialProviderCatalog { get; } = new CredentialRepositoryList();
-
-        public static ConnectionsService ConnectionsService { get; } =
-            new ConnectionsService(PuttySessionsManager.Instance);
+        public static ConnectionsService ConnectionsService { get; } = new ConnectionsService(PuttySessionsManager.Instance);
 
         #region Connections Loading/Saving
-
         public static void LoadConnectionsAsync()
         {
             var t = new Thread(LoadConnectionsBGd);
@@ -107,19 +96,11 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
-                FrmSplashScreen.getInstance().Close();
-
                 if (Settings.Default.UseSQLServer)
                 {
                     MessageCollector.AddExceptionMessage(Language.strLoadFromSqlFailed, ex);
-                    var commandButtons = string.Join("|", Language.strCommandTryAgain,
-                                                     Language.strCommandOpenConnectionFile,
-                                                     string.Format(Language.strCommandExitProgram,
-                                                                   Application.ProductName));
-                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.strLoadFromSqlFailed,
-                                               Language.strLoadFromSqlFailedContent,
-                                               MiscTools.GetExceptionMessageRecursive(ex), "", "",
-                                               commandButtons, false, ESysIcons.Error, ESysIcons.Error);
+                    var commandButtons = string.Join("|", Language.strCommandTryAgain, Language.strCommandOpenConnectionFile, string.Format(Language.strCommandExitProgram, Application.ProductName));
+                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.strLoadFromSqlFailed, Language.strLoadFromSqlFailedContent, MiscTools.GetExceptionMessageRecursive(ex), "", "", commandButtons, false, ESysIcons.Error, ESysIcons.Error);
                     switch (CTaskDialog.CommandButtonResult)
                     {
                         case 0:
@@ -134,13 +115,9 @@ namespace mRemoteNG.App
                             return;
                     }
                 }
-
                 if (ex is FileNotFoundException && !withDialog)
                 {
-                    MessageCollector.AddExceptionMessage(
-                                                         string.Format(Language.strConnectionsFileCouldNotBeLoadedNew,
-                                                                       connectionFileName), ex,
-                                                         MessageClass.InformationMsg);
+                    MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), ex, MessageClass.InformationMsg);
 
                     string[] commandButtons =
                     {
@@ -156,13 +133,13 @@ namespace mRemoteNG.App
                         try
                         {
                             CTaskDialog.ShowTaskDialogBox(
-                                                          GeneralAppInfo.ProductName,
-                                                          Language.ConnectionFileNotFound,
-                                                          "", "", "", "", "",
-                                                          string.Join(" | ", commandButtons),
-                                                          ETaskDialogButtons.None,
-                                                          ESysIcons.Question,
-                                                          ESysIcons.Question);
+                                GeneralAppInfo.ProductName, 
+                                Language.ConnectionFileNotFound, 
+                                "", "", "", "", "", 
+                                string.Join(" | ", commandButtons), 
+                                ETaskDialogButtons.None, 
+                                ESysIcons.Question, 
+                                ESysIcons.Question);
 
                             switch (CTaskDialog.CommandButtonResult)
                             {
@@ -183,24 +160,17 @@ namespace mRemoteNG.App
                                     Application.Exit();
                                     answered = true;
                                     break;
-                            }
+                            }                               
                         }
                         catch (Exception exc)
                         {
-                            MessageCollector.AddExceptionMessage(
-                                                                 string
-                                                                     .Format(Language.strConnectionsFileCouldNotBeLoadedNew,
-                                                                             connectionFileName), exc,
-                                                                 MessageClass.InformationMsg);
+                            MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionFileName), exc, MessageClass.InformationMsg);
                         }
                     }
-
                     return;
                 }
 
-                MessageCollector.AddExceptionStackTrace(
-                                                        string.Format(Language.strConnectionsFileCouldNotBeLoaded,
-                                                                      connectionFileName), ex);
+                MessageCollector.AddExceptionStackTrace(string.Format(Language.strConnectionsFileCouldNotBeLoaded, connectionFileName), ex);
                 if (connectionFileName != ConnectionsService.GetStartupConnectionFileName())
                 {
                     LoadConnections(withDialog);
@@ -208,16 +178,12 @@ namespace mRemoteNG.App
                 else
                 {
                     MessageBox.Show(FrmMain.Default,
-                                    string.Format(Language.strErrorStartupConnectionFileLoad, Environment.NewLine,
-                                                  Application.ProductName,
-                                                  ConnectionsService.GetStartupConnectionFileName(),
-                                                  MiscTools.GetExceptionMessageRecursive(ex)),
-                                    @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                        string.Format(Language.strErrorStartupConnectionFileLoad, Environment.NewLine, Application.ProductName, ConnectionsService.GetStartupConnectionFileName(), MiscTools.GetExceptionMessageRecursive(ex)),
+                        @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     Application.Exit();
                 }
             }
         }
-
         #endregion
     }
 }

mRemoteV1/App/Shutdown.cs

@@ -5,7 +5,6 @@ using System.Windows.Forms;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
-
 // ReSharper disable ArrangeAccessorOwnerBody
 
 namespace mRemoteNG.App
@@ -26,10 +25,7 @@ namespace mRemoteNG.App
             ProgramRoot.CloseSingletonInstanceMutex();
         }
 
-        public static void Cleanup(Control quickConnectToolStrip,
-                                   ExternalToolsToolStrip externalToolsToolStrip,
-                                   MultiSshToolStrip multiSshToolStrip,
-                                   FrmMain frmMain)
+        public static void Cleanup(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
         {
             try
             {
@@ -62,13 +58,9 @@ namespace mRemoteNG.App
                 Runtime.ConnectionsService.SaveConnections();
         }
 
-        private static void SaveSettings(Control quickConnectToolStrip,
-                                         ExternalToolsToolStrip externalToolsToolStrip,
-                                         MultiSshToolStrip multiSshToolStrip,
-                                         FrmMain frmMain)
+        private static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain)
         {
-            Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip,
-                                                       frmMain);
+            Config.Settings.SettingsSaver.SaveSettings(quickConnectToolStrip, externalToolsToolStrip, multiSshToolStrip, frmMain);
         }
 
         private static void UnregisterBrowsers()

mRemoteV1/App/Startup.cs

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