update changelog for 1.75 alpha 2

Merge branch 'MR-874_incorrect_rdp_check_in_installer' into develop
Some more code cleanup
2026-02-18 06:21:41 +08:00 · 2016-08-03 12:40:56 -06:00 · 2016-08-03 12:16:31 -06:00 · 2016-08-03 12:10:36 -06:00 · 2016-08-03 12:08:03 -06:00 · 2016-08-03 12:07:13 -06:00
649 changed files with 65929 additions and 46916 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,13 @@
-Release/
-mRemoteV1/bin/
-mRemoteV1/obj/
-mRemoteV1/publish/
+**/bin/
+**/obj/
+**/[Rr]elease [Pp]ortable/
+**/[Dd]ebug [Pp]ortable/
+
 *.pfx
-*.suo
-*.vbproj.user
 Thumbs.db
-[Dd]ebug/
 _Re[Ss]harper.*
 *.resharper
 *.resharper.user
-*.suo
 *.cache
 *~
 *.swp
@@ -24,3 +21,267 @@ UpgradeLog.XML
 *.sdf
 *.opensdf
 *.ipch
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+*.msi
+Installer/Resources/License.rtf
+Installer/Fragments/FilesFragment.wxs
+Installer Projects/Installer/Resources/License.rtf
+Installer Projects/Installer/Fragments/FilesFragment.wxs
+Installer Projects/Installer/Fragments/HelpFilesFragment.wxs
+InstallerProjects/Installer/Fragments/FilesFragment.wxs
+InstallerProjects/Installer/Resources/License.rtf
+
+# user preference: .editorconfig - http://editorconfig.org/
+.editorconfig
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,8 +1,105 @@
-1.73 Beta 2 ():
+1.75 Alpha 2 (2016-08-03):
+
+  General Changes:
+  ----------------
+  Updated GeckoFx pacakge
+  Updated DockPanelSuite library to 2.10 Final
+  Japanese translation updated
+  MR-942: Refactored code relating to loading the connections file 
+
+  Features/Enhancements:
+  ----------------------
+  PR-133: Option to reconnect all currently opened connection tabs 
+  MR-917: Improved cryptographic support
+
+  Fixes:
+  ------
+  MR-910: Fixes to support Remote Desktop Gateways
+
+  
+  
+1.75 Alpha 1 (2016-07-08):
+
+  General Changes:
+  ----------------
+  Additional code cleanup
+  
+  
+  Fixes:
+  ------
+  MR-905: mRemoteNG crashes at startup (in FIPS policy check)
+  MR-902: mRemoteNG crashes after locking/unlocking the local system after loading a VNC connection
+  
+  
+1.74 (2016-06-28):
+
+  Supported Platforms/Components:
+  -------------------------------
+  Windows 7 SP1 (with RDP Client v8: KB2592687/KB2923545) or later
+  .NET Framework 4 or later
+  XULRunner is no longer required for Gecko support (see below)
+  
+  
+  General Changes:
+  ----------------
+  Converted source from Visual Basic to C Sharp
+  Lots of code refactoring/clean up/general stability changes
+  MR-714: Removed Keyboard shortcut functionality
+    - Introduced in 1.73 beta that was never officially released
+    - This caused stability issues
+    - May be re-added in a future release
+    - Removal does *NOT* impact the ability to send keyboard shortcuts to RDP sessions (when redirect key combinations is set to "yes")
+  MR-559: Removed RDP Sessions panel functionality. This required a library for which no trusted origin/source could be located
+  Removed a bunch of old code/libraries and replaced them accordingly
+  
+  
+  Security Updates:
+  -----------------
+  MR-775, MR-745: Updated PuTTY to 0.67
+  
+  
+  Features/Enhancements:
+  ----------------------
+  Updated to latest DockPanelSuite and enabled a slick new theme!
+  MR-145: Installer is now MSI based
+  MR-255: Updated RDP Client to version 8
+  MR-389: Updates to IE rendering engine
+    - Support for latest version of IE (9-11)
+    - Dropped support for IE 7 & IE 8
+  MR-850: Replaced XULRunner with GeckoFx
+    - No need to manually configure to have the Gecko rendering engine available now
+    - Install image is now significantly larger due to the inclusion of the Gecko Engine
+  MR-821: Initial Japanese translation included
+  Port Scan is now Asynchronous (and is significantly faster)
+  
+  
+  Fixes:
+  ------
+  MR-874: Added work-around to installer to ignore installation prerequisites
+  MR-884: Slow startup in some scnearios checking authenticode certificate
+  MR-872: Crash in External Tools when arguments aren't quoted
+  MR-854: crashes when right clicking on connection tab
+  MR-852: Option "Allow only a single instance of the application" non-functional
+  MR-836: Trying to delete a folder of connections only deletes 2 connections at a time
+  MR-824, MR-706: Suppress Script Errors when using the IE rendering engine
+  MR-822: Improve RDP error code messages
+  MR-640: Fixed Inheritance not working
+  MR-639: RDP: Connect to console session
+  MR-610, MR-582, MR-451: RDP: Protocol Error 3334 or exceptions with large number of connections open
+    - This problem appears largely resolved by most reports and testing
+    - Further workarounds/problem avoidance: Disable Bitmap Caching on all RDP session configuration
+  MR-429: Display issue on the Options -> Advanced panel
+  MR-385: Inheritance settings lost when moving item to the root of the tree
+  
+  
+  
+1.73 Beta 2 (NEVER RELEASED):
  Fixed issue MR-619 - Keyboard shortcuts stop working after locking the screen with Win+L
  Added support for importing files from PuTTY Connection Manager.
  Improved the import and export functionality.

+
+
 1.73 Beta 1 (2013-11-19):
  Added feature MR-16 - Add keyboard shortcuts to switch between tabs
  Added feature MR-141 - Add a default protocol option
@@ -19,7 +116,7 @@
  Fixed issue MR-556 - Export fails when overwriting an existing file
  Fixed issue MR-594 - Crash on startup if write access is denied to the IE browser emulation registry key
  Fixed issue MR-603 - Some configuration options are still shown even when inheritance is enabled
-  Added "Reset" to config panel context menu to allow resetting some config settings to their default value.
+  MR-590: Added "Reset" to config panel context menu to allow resetting some config settings to their default value.
  Added and improved menu icons.
  Removed misleading log messages about RD Gateway support.
  Removed invalid "Site" configuration option from PuTTY Saved Sessions.
@@ -27,10 +124,14 @@
  Fixed config panel showing settings from previously loaded connection file after loading a new one.
  Improved handling of variables in external tool arguments.

+
+
 1.72 (2013-11-13):
  Fixed issue MR-592 - Unable to run VBS script as an external tool
  Fixed issue MR-596 - Incorrect escaping of quotation marks in external tool arguments

+
+
 1.71 (2013-10-29):
  Fixed issue MR-574 - Crash when retrieving RDP session list if eolwtscom.dll is not registered
  Fixed issue MR-578 - Connections file is reset
@@ -40,12 +141,16 @@
  Improved error reporting when loading connections files.
  Removed warning message when mRemoteNG is started for the first time about new connections file being created.

+
+
 1.71 Release Candidate 2 (2013-10-16):
  Fixed issue MR-560 - Cannot Auto-Update With Open Connections: Unable to find an entry point named 'TaskDialogIndirect' in DLL 'ComCtl32'
  Fixed issue MR-565 - Double Folder keep heritage on the initial Folder
  Fixed issue MR-566 - Typo in German UI Automatic Update Settings
  Fixed duplicated folders possibly being named "New Connection" instead of the original folder's name.

+
+
 1.71 Release Candidate 1 (2013-10-01):
  Fixed issue MR-495 - Having a negative range in port scan creates memory exhaustion.
  Fixed issue MR-514 - Window Proxy test failed without close button
@@ -62,11 +167,15 @@
  Added Chinese (Traditional) translation.
  Added partial Greek and Hungarian translations.

+
+
 1.71 Beta 5 (2013-06-09):
  Fixed issue MR-491 - Could not start RDP Connection
  Fixed issue MR-499 - TS Gateway is not working in latest release 1.71
  Fixed typo in SQL queries.

+
+
 1.71 Beta 4 (2013-05-28):
  Added feature MR-435 - Add digital signature check to updater
  Fixed issue MR-255 - The version of the RDP AX client should be updated to 7
@@ -98,6 +207,8 @@
  Lowered required version of RDC from 6.1 to 6.0.
  Updated VncSharpNG to 1.3.4896.25007.

+
+
 1.71 Beta 3 (2013-03-20):
  Fixed issue MR-397 - Putty disappears from the screen
  Fixed issue MR-398 - Full Screen mode doesn't correctly make use of available space
@@ -109,6 +220,8 @@
  Fixed the category names in the themes tab of the options dialog on Windows XP not showing correctly.
  Fixed PuTTY saved sessions with spaces or special characters not being listed.

+
+
 1.71 Beta 2 (2013-03-19):
  Added feature MR-336 - Customizable background color for the windows/panels
  Added feature MR-345 - Two separate options for confirming closure of Tabs and Connection Panels
@@ -124,6 +237,8 @@
  Changed "Automatically get session information" to be disabled by default.
  RDP connections can now be switched to full screen mode when redirect key combinations is enabled.

+
+
 1.71 Beta 1 (2013-03-04):
  Added feature MR-329 - Create Option to disable the "Quick: " prefix
  Fixed issue MR-67 - Sort does not recursively sort
@@ -142,6 +257,8 @@
  If RDC 7.0 or higher is installed, the connection bar is no longer briefly shown when connecting to an RDP connection with redirect key combinations enabled.
  If RDC 8.0 or higher is installed, RDP connections automatically adjust their size when the window is resized or when toggling full screen mode.

+
+
 1.70 (2013-03-07):  
  Fixed issue MR-339 - Connection group collapses with just one click
  Fixed issue MR-340 - Object reference not set to an instance of an object.
@@ -150,11 +267,15 @@
  Fixed issue MR-355 - Moving sub folders to top level causes property loss
  Fixed tabs not closing on double-click when the active tab is a PuTTY connection.

+
+
 1.70 Release Candidate 2 (2013-02-25):
  Fixed issue MR-332 - Can't select different tab with one click after disconnecting existing tab
  Fixed issue MR-338 - PuTTYNG crashing on fresh install of mRemoteNG
  Re-enabled PuTTYNG integration enhancements on Windows 8

+
+
 1.70 Release Candidate 1 (2013-02-22):
  Fixed issue MR-183 - Error trying to save connections when using SQL - Invalid column name _parentConstantId
  Fixed issue MR-225 - Tabs do not open in a panel until multiple panels are displayed.
@@ -168,6 +289,8 @@
  Fixed "Decryption failed. Padding is invalid and cannot be removed." notification.
  Fixed KiTTY opening in a separate window when using a saved session.

+
+
 1.70 Beta 2 (2013-02-18):
  Fixed issue MR-47 - Silent Installation Prompts for Language
  Fixed issue MR-54 - Error When disconnecting from SSL channel RDP
@@ -210,6 +333,7 @@
  Improved the use of Tab and Shift-Tab to cycle through entries in the Config grid.
  Improved loading of XML files from older versions of mRemote/mRemoteNG.

+
 1.70 Beta 1 (2012-02-27):
  Fixed issue MR-77 - VerifyDatabaseVersion (Config.Connections.Save) failed. Version string portion was too short or too long.
  Fixed issue MR-78 - Renaming Connections
@@ -234,6 +358,8 @@
  Updated VncSharpNG to version 1.2.4440.36644.
  Added debugging symbols for VncSharpNG.

+
+
 1.69 (2011-12-09):
  Fixed issue #66 - Fresh Install Fails to Create Config
  Fixed issue #69 - Connection file gets erased
@@ -245,11 +371,15 @@
  Binaries are now digitally signed
  Added Credits, License, and Version History items to the Start Menu and made Start Menu item names localizable.

+
+
 1.68 (2011-07-07):
  Fixed issue #48 - VerifyDatabaseVersion fails with new (empty) database tables.
  Fixed issue #60 - Can't save connections file
  Fixed issue #62 - Connection file error upon launch.

+
+
 1.67 (2011-06-05):
  Fixed migration of external tools configuration and panel layout from Local to Roaming folder.
  Disable ICA Hotkeys for Citrix connections.  Fixes issue with international users.
@@ -281,9 +411,13 @@
  Fixed tab order of controls in Options dialog.
  Fixed bug 45 - Changing some settings in the config file may not save.

+
+
 1.66 (2011-05-02):
  Fixed connections not working

+
+
 1.65 (2011-05-02):
  Fixed Ctrl-Tab and Ctrl-Shift-Tab not working in any other applications while mRemoteNG is running
  Ctrl-Tab and Ctrl-Shift-Tab no longer work to switch tabs within mRemoteNG
@@ -291,6 +425,8 @@
  Fixed bug 38 - Application uses the wrong Application Data settings folder (in Local Settings)
  Added code to the installer to check that the user is in the 'Power Users' or 'Administrators' group

+
+
 1.64 (2011-04-27):
  Fixed bug 6 - VNC CTRL+key & keyboard combo mappings are broken
  Fixed bug 12 - Tab switch is not working in config panel
@@ -310,6 +446,8 @@
  Updated DockPanel Suite to version 2.5 RC1
  Updated VNCSharpNG to correct Ctrl and Alt key pass-through behavior

+
+
 1.63 (2010-02-02):
  New icon and logo
  Fixed problems moving or resizing the main window while PuTTY (SSH/telnet/rlogin/raw) connections are open
@@ -325,6 +463,8 @@
  Popups can now be allowed in Internet Explorer by holding Ctrl+Alt when clicking a link
  Added PuTTY Settings item to tab context menu

+
+
 1.62 (2010-01-19):
  Switched to VncSharp, an open source VNC component
  VNC is supported again except for the following features:
@@ -341,10 +481,14 @@
  Added RDP, VNC and ICA version numbers to Components Check page
  Fixed a bug with the inheritance buttons on the Config panel disappearing after awhile

+
+
 1.61 (2010-01-14):
  Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX
  This version of mRemoteNG does not support VNC

+
+
 1.60 (2010-01-09):
  Changed name to mRemoteNG
  Fixed menu bar not staying docked to left side
@@ -357,6 +501,8 @@
  Moved Check for Updates to the Help menu
  Changed website links in Help menu and About page to load within mRemoteNG instead of launching an external browser

+-----
+
 1.50:
  Added the following formats to the "Save Connections As" function:
    mRemote CSV (standard CSV file with all properties)
--- a/CREDITS.TXT
+++ b/CREDITS.TXT
@@ -1,14 +1,25 @@
 Contributors
 ============

+Current mRemoteNG dev team:
+David Sparer (github.com/sparerd)
+Hayato Iriumi (github.com/hiriumi)
+Sean Kaim (github.com/kmscode)
+
+Felix Deimel - mRemote original developer
+Riley McArdle - mRemoteNG original developer
+
+github.com/Brandhor
+
+
+Past Contributors
+=================
 Jason Barbier
 Wiktor Beryt
 Lionel Caignec
 Ruben d'Arco
-Felix Deimel
 Holger Henke
 Tom Hiller
-Riley McArdle
 Apisitt Rattana
 Andreas Rehm
 David Vidmar
@@ -21,6 +32,8 @@ Eugenio "Ryo567" Mart
 Mathieu Pape
 Emanuel Silva
 Robert Siwiec
+Hayato Iriumi
+Sebastien Thieury (github.com/SebThieu)


 Included Source Code
@@ -31,15 +44,22 @@ Copyright
 MIT License
 http://www.codeproject.com/KB/recipes/command_line.aspx

-DotNetVer
-Copyright <20> 2010 David Grinberg
-Copyright <20> 2010-2011 Brandon Hansen
-http://nsis.sourceforge.net/DotNetVer
+FilteredPropertyGrid
+Copyright <20> 2006 Azuria
+http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx

 Hotkey Selection Control for .NET
 Copyright <20> 2006 Thomas Backman
 http://www.codeproject.com/Articles/15085/A-simple-hotkey-selection-control-for-NET

+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
+

 Included Components
 ===================
@@ -54,31 +74,18 @@ Copyright
 Modified New BSD License
 http://www.mentalis.org/

-DockPanel Suite 2.3.1
-Copyright <20> 2007 Weifen Luo
+DockPanel Suite 2.10.0.beta2
+Copyright <20> 2015 @roken and @lextm (formerly Weifen Luo)
 MIT License
-http://sourceforge.net/projects/dockpanelsuite/
+https://github.com/dockpanelsuite/dockpanelsuite

-Emergent OnLine WTSCOM 2.0.6.0
-Copyright <20> 2001-2003 Emergent OnLine
-http://www.go-eol.com/
+GeckoFX 45
+Copyright <20> 2016 Tom Hindle
+Mozilla Public License
+https://bitbucket.org/geckofx/

-FilteredPropertyGrid 1.0.0.0
-Copyright <20> 2006 Azuria
-http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
-
-GeckoFX 1.8.1.4
-Copyright <20> 2008 Skybound Software
-Mozilla Public License 1.1
-http://www.geckofx.org/
-
-IPTextBox 1.1
-Copyright <20> 2006 Matthew Kleinwaks
-Copyright <20> 2008 Felix Deimel
-http://www.vbforums.com/showthread.php?t=430169
-
-log4net 1.2.10.0
-Copyright <20> 2001-2006 The Apache Software Foundation
+log4net 1.2.15.0
+Copyright <20> 2001-2015 The Apache Software Foundation
 Apache License Version 2.0
 http://logging.apache.org/log4net/

@@ -92,16 +99,8 @@ Copyright
 Modified New BSD License
 http://www.mentalis.org/

-MiniGeckoBrowser 1.0
-Copyright <20> 2008 Felix Deimel
-http://www.appjuice.org/
-
-MiniTabControl 1.0
-Copyright <20> 2008 Felix Deimel
-http://www.appjuice.org/
-
-PuTTY 0.62
-Copyright <20> 1997-2011 Simon Tatham
+PuTTY 0.67
+Copyright <20> 1997-2016 Simon Tatham
 MIT License
 http://www.chiark.greenend.org.uk/~sgtatham/putty/

@@ -116,12 +115,7 @@ Copyright
 Creative Commons Attribution 2.5 License
 http://www.famfamfam.com/

-Vista TaskDialog Wrapper and Emulator 1.0
-Copyright <20> 2007-2009 Hedley Muscroft
-Code Project Open License (CPOL)
-http://www.codeproject.com/KB/vista/Vista_TaskDialog_Wrapper.aspx
-
-VncSharp 1.0
+VncSharp 1.1
 Copyright <20> 2004-2009 David Humphrey
 GNU General Public License (GPL) Version 2
-http://cdot.senecac.on.ca/projects/vncsharp/
+https://github.com/humphd/VncSharp
--- a/Installer/Dependencies/PuTTYNG.exe
+++ b/Installer/Dependencies/PuTTYNG.exe
--- a/Installer/Dependencies/PuTTYNG.pdb
+++ b/Installer/Dependencies/PuTTYNG.pdb
--- a/Installer/Dependencies/eolwtscom.dll
+++ b/Installer/Dependencies/eolwtscom.dll
--- a/Installer/DotNetVer.nsh
+++ b/Installer/DotNetVer.nsh
@@ -1,296 +0,0 @@
-; ---------------------
-;      DotNetVer.nsh
-;      Written by: David Grinberg
-;      Homepage: http://ontheperiphery.veraida.com/
-;      Updated By: Brandon Hansen (http://www.remotehams.com/)
-; ---------------------
-;
-; LogicLib extensions for checking Microsoft .NET Framework versions and service packs.
-;
-; Latests Updates by Brandon Hansen, KG6YPI (RemoteHams.com)
-; Dec 26, 2011 - .NET Framework 4.0 detection fixes - client profile not being found
-; Dec 07, 2010 - .NET Framework 4.0 detection added by Brandon Hansen (KG6YPI)
-;
-; Usage examples:
-;
-; ${If} ${HasDotNet4.0}
-;    DetailPrint "Microsoft .NET Framework 4.0 installed."
-;    ${If} ${DOTNETVER_4_0} AtLeastDotNetServicePack 1
-;        DetailPrint "Microsoft .NET Framework 4.0 is at least SP1."
-;    ${Else}
-;        DetailPrint "Microsoft .NET Framework 4.0 SP1 not installed."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
-;        DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 1
-;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) available."
-;    ${EndIf}
-;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 0
-;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) not available."
-;    ${EndIf}
-; ${EndIf}
- 
- 
-!verbose push
-!verbose 3
- 
-!ifndef ___DOTNETVER__NSH___
-!define ___DOTNETVER__NSH___
- 
-!include LogicLib.nsh
-!include Util.nsh
- 
-# constants
- 
-!define DOTNETVER_1_0  "1.0"
-!define DOTNETVER_1_1  "1.1"
-!define DOTNETVER_2_0  "2.0"
-!define DOTNETVER_3_0  "3.0"
-!define DOTNETVER_3_5  "3.5"
-!define DOTNETVER_4_0  "4.0"
- 
-# variable declaration
- 
-Var /GLOBAL __DONTNET_FOUNDVER
- 
-!macro __DotNetVer_DeclareVars
-    !ifndef __DOTNETVER_VARS_DECLARED
-        !define __DOTNETVER_VARS_DECLARED
-        Var /GLOBAL __DOTNET_1.0
-        Var /GLOBAL __DOTNET_1.1
-        Var /GLOBAL __DOTNET_2.0
-        Var /GLOBAL __DOTNET_3.0
-        Var /GLOBAL __DOTNET_3.5
-        Var /GLOBAL __DOTNET_4.0
- 
-        Var /GLOBAL __DOTNETVER_1.0_SP
-        Var /GLOBAL __DOTNETVER_1.1_SP
-        Var /GLOBAL __DOTNETVER_2.0_SP
-        Var /GLOBAL __DOTNETVER_3.0_SP
-        Var /GLOBAL __DOTNETVER_3.5_SP
-        Var /GLOBAL __DOTNETVER_4.0_SP
- 
-        Var /GLOBAL __DOTNET_1.0_CLIENT
-        Var /GLOBAL __DOTNET_1.1_CLIENT
-        Var /GLOBAL __DOTNET_2.0_CLIENT
-        Var /GLOBAL __DOTNET_3.0_CLIENT
-        Var /GLOBAL __DOTNET_3.5_CLIENT
-        Var /GLOBAL __DOTNET_4.0_CLIENT
- 
-        Var /GLOBAL __DOTNET_1.0_FULL
-        Var /GLOBAL __DOTNET_1.1_FULL
-        Var /GLOBAL __DOTNET_2.0_FULL
-        Var /GLOBAL __DOTNET_3.0_FULL
-        Var /GLOBAL __DOTNET_3.5_FULL
-        Var /GLOBAL __DOTNET_4.0_FULL
- 
-        StrCpy $__DOTNET_1.0 0
-        StrCpy $__DOTNET_1.1 0
-        StrCpy $__DOTNET_2.0 0
-        StrCpy $__DOTNET_3.0 0
-        StrCpy $__DOTNET_3.5 0
-        StrCpy $__DOTNET_4.0 0
- 
-        StrCpy $__DOTNETVER_1.0_SP 0
-        StrCpy $__DOTNETVER_1.1_SP 0
-        StrCpy $__DOTNETVER_2.0_SP 0
-        StrCpy $__DOTNETVER_3.0_SP 0
-        StrCpy $__DOTNETVER_3.5_SP 0
-        StrCpy $__DOTNETVER_4.0_SP 0
- 
-        StrCpy $__DOTNET_1.0_CLIENT 0
-        StrCpy $__DOTNET_1.1_CLIENT 0
-        StrCpy $__DOTNET_2.0_CLIENT 0
-        StrCpy $__DOTNET_3.0_CLIENT 0
-        StrCpy $__DOTNET_3.5_CLIENT 0
-        StrCpy $__DOTNET_4.0_CLIENT 0
- 
-        StrCpy $__DOTNET_1.0_FULL 0
-        StrCpy $__DOTNET_1.1_FULL 0
-        StrCpy $__DOTNET_2.0_FULL 0
-        StrCpy $__DOTNET_3.0_FULL 0
-        StrCpy $__DOTNET_3.5_FULL 0
-        StrCpy $__DOTNET_4.0_FULL 0
- 
-  !endif
-!macroend
- 
- 
-# lazy initialization macro
- 
-!macro __DotNetVer_InitVars
-    # only calculate version once
-    StrCmp $__DONTNET_FOUNDVER "" dotnetver.noveryet
-        Return
- 
-    dotnetver.noveryet:
-    !insertmacro __DotNetVer_DeclareVars
- 
-    Push $0    ;registry count
-    Push $1    ;registry key
-    Push $2    ;version number
-    Push $3    ;installed
-    Push $4    ;service pack number
-    Push $8    ;strLen helper var
- 
-    StrCpy $0 0
- 
-    dotnetver.startenum:
- 
-    EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
-    StrCmp $1 "" dotnetver.done
- 
-    IntOp $0 $0 + 1
- 
-    StrCpy $2 $1 1 0
-    StrCmp $2 "v" +1 dotnetver.startenum
-    StrCpy $2 $1 3 1
- 
-    ; Check for .NET 1.0 to 3.5
-    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "Install"
-    ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "SP"
-    IntCmp $3 1 dotnetcheck.skipalt
-    ; Alternate check for versions that don't set the Install key
-    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1\Setup" "InstallSuccess"
-    dotnetcheck.skipalt:
-    ; This is a sanity check that works on .NET 1.0 to 3.5
-    ; if it fails check for dotnet 4
-    IntCmp $3 0 dotnetcheck.40
-    StrCmp $2 ${DOTNETVER_1_0} dotnetver.10
-    StrCmp $2 ${DOTNETVER_1_1} dotnetver.11
-    StrCmp $2 ${DOTNETVER_2_0} dotnetver.20
-    StrCmp $2 ${DOTNETVER_3_0} dotnetver.30
-    StrCmp $2 ${DOTNETVER_3_5} dotnetver.35
-    dotnetcheck.40:
-    StrCmp $2 ${DOTNETVER_4_0} dotnetver.40
-    StrCmp $2 "4" dotnetver.40
- 
-    Goto dotnetver.startenum
- 
-    dotnetver.10:
-        StrCpy $__DOTNET_1.0 1
-        StrCpy $__DOTNETVER_1.0_SP $4
-        StrCpy $__DOTNET_1.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.11:
-        StrCpy $__DOTNET_1.1 1
-        StrCpy $__DOTNETVER_1.1_SP $4
-        StrCpy $__DOTNET_1.1_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.20:
-        StrCpy $__DOTNET_2.0 1
-        StrCpy $__DOTNETVER_2.0_SP $4
-        StrCpy $__DOTNET_2.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.30:
-        StrCpy $__DOTNET_3.0 1
-        StrCpy $__DOTNETVER_3.0_SP $4
-        StrCpy $__DOTNET_3.0_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.35:
-        StrCpy $__DOTNET_3.5 1
-        StrCpy $__DOTNETVER_3.5_SP $4
-        StrCpy $__DOTNET_3.5_FULL 1
-        Goto dotnetver.startenum
-    dotnetver.40:
-        ; Check for .NET 4.0 (Full Profile)
-        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Install"
-        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "SP"
-	StrLen $8 $3
-        IntCmp $8 0 dotnetcheck.40c
-        IntCmp $3 0 dotnetcheck.40c
-        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Full
-        StrCmp $2 "4" dotnetver.40_Full
-        dotnetcheck.40c:
-        ; Check for .NET 4.0 (Client Profile)
-        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "Install"
-        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "SP"
-	StrLen $8 $3
-        IntCmp $8 0 dotnetver.startenum
-        IntCmp $3 0 dotnetver.startenum
-        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Client
-        StrCmp $2 "4" dotnetver.40_Client
-        Goto dotnetver.startenum
-    dotnetver.40_Full:
-        StrCpy $__DOTNET_4.0 1
-        StrCpy $__DOTNETVER_4.0_SP $4
-        StrCpy $__DOTNET_4.0_FULL 1
-        Goto dotnetcheck.40c ; continue looking for other profiles
-    dotnetver.40_Client:
-        StrCpy $__DOTNET_4.0 1
-        StrCpy $__DOTNETVER_4.0_SP $4
-        StrCpy $__DOTNET_4.0_CLIENT 1
-        Goto dotnetver.startenum
- 
-    dotnetver.done:
- 
-    StrCpy $__DONTNET_FOUNDVER "1"
- 
-    Pop $8
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-!macroend
- 
-!macro _HasDotNet _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-   !insertmacro _= `$__DOTNET_${_b}` `1` `${_t}` `${_f}`
-!macroend
- 
-!macro __DotNetVer_DefineTest Ver
-  !define HasDotNet${Ver} `"" HasDotNet ${Ver}`
-!macroend
- 
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_1}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_2_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_0}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_5}
-!insertmacro __DotNetVer_DefineTest ${DOTNETVER_4_0}
- 
-!macro _AtLeastDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _>= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define AtLeastDotNetServicePack `AtLeastDotNetServicePack`
- 
- 
-!macro _AtMostDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _<= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define AtMostDotNetServicePack `AtMostDotNetServicePack`
- 
- 
-!macro _IsDotNetServicePack _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
-!macroend
-!define IsDotNetServicePack `IsDotNetServicePack`
- 
-!macro _HasDotNetClientProfile _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNET_${_a}_CLIENT` `${_b}` `${_t}` `${_f}`
-!macroend
-!define HasDotNetClientProfile `HasDotNetClientProfile`
- 
-!macro _HasDotNetFullProfile _a _b _t _f
-    ${CallArtificialFunction} __DotNetVer_InitVars
- 
-    !insertmacro _= `$__DOTNET_${_a}_FULL` `${_b}` `${_t}` `${_f}`
-!macroend
-!define HasDotNetFullProfile `HasDotNetFullProfile`
- 
-# done
- 
-!endif # !___DOTNETVER__NSH___
- 
-!verbose pop
--- a/Installer/Language/czech.nsi
+++ b/Installer/Language/czech.nsi
@@ -1,22 +0,0 @@
-; Czech installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_CZECH} "mRemoteNG run CZECH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_CZECH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_CZECH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_CZECH} "Credits"
-LangString CopyingLinkName ${LANG_CZECH} "License"
-LangString UninstallLinkName ${LANG_CZECH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_CZECH} "Version History"
--- a/Installer/Language/dutch.nsi
+++ b/Installer/Language/dutch.nsi
@@ -1,22 +0,0 @@
-; Dutch installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_DUTCH} "mRemoteNG run DUTCH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_DUTCH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_DUTCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_DUTCH} "Credits"
-LangString CopyingLinkName ${LANG_DUTCH} "License"
-LangString UninstallLinkName ${LANG_DUTCH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_DUTCH} "Version History"
--- a/Installer/Language/english.nsi
+++ b/Installer/Language/english.nsi
@@ -1,22 +0,0 @@
-; English installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_ENGLISH} "Launch mRemoteNG Now"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_ENGLISH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_ENGLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_ENGLISH} "Credits"
-LangString CopyingLinkName ${LANG_ENGLISH} "License"
-LangString UninstallLinkName ${LANG_ENGLISH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_ENGLISH} "Version History"
--- a/Installer/Language/french.nsi
+++ b/Installer/Language/french.nsi
@@ -1,22 +0,0 @@
-; French installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_FRENCH} "mRemoteNG run FRENCH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_FRENCH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_FRENCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_FRENCH} "Credits"
-LangString CopyingLinkName ${LANG_FRENCH} "License"
-LangString UninstallLinkName ${LANG_FRENCH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_FRENCH} "Version History"
--- a/Installer/Language/german.nsi
+++ b/Installer/Language/german.nsi
@@ -1,22 +0,0 @@
-; German installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_GERMAN} "mRemoteNG jetzt Starten"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_GERMAN} "Installationsprogamm Sprache"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte w<>hlen Sie die Sprache f<>r das Installationsprogramm"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG ben<65>tigt das Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_GERMAN} "Sie m<>ssen Mitglied der Grupper 'Power Users' or 'Administratoren' sein, damit Sie mRemoteNG installieren k<>nnen."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_GERMAN} "Credits"
-LangString CopyingLinkName ${LANG_GERMAN} "License"
-LangString UninstallLinkName ${LANG_GERMAN} "Uninstall"
-LangString ChangeLogLinkName ${LANG_GERMAN} "Version History"
--- a/Installer/Language/languages.nsi
+++ b/Installer/Language/languages.nsi
@@ -1,31 +0,0 @@
-!define LanguageNameEnglish "English"
-!insertmacro MUI_LANGUAGE "English"
-!include "Language\english.nsi"
-
-!define LanguageNameCzech "Čeština"
-!insertmacro MUI_LANGUAGE "Czech"
-!include "Language\czech.nsi"
-
-!define LanguageNameGerman "Deutsch"
-!insertmacro MUI_LANGUAGE "German"
-!include "Language\german.nsi"
-
-!define LanguageNameSpanish "Español"
-!insertmacro MUI_LANGUAGE "Spanish"
-!include "Language\spanish.nsi"
-
-!define LanguageNameFrench "Français"
-!insertmacro MUI_LANGUAGE "French"
-!include "Language\french.nsi"
-
-!define LanguageNameDutch "Nederlands"
-!insertmacro MUI_LANGUAGE "Dutch"
-!include "Language\dutch.nsi"
-
-!define LanguageNamePolish "Polski"
-!insertmacro MUI_LANGUAGE "Polish"
-!include "Language\polish.nsi"
-
-!define LanguageNameThai "ภาษาไทย"
-!insertmacro MUI_LANGUAGE "Thai"
-!include "Language\thai.nsi"
--- a/Installer/Language/polish.nsi
+++ b/Installer/Language/polish.nsi
@@ -1,22 +0,0 @@
-; Polish installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_POLISH} "mRemoteNG run POLISH message"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_POLISH} "Installer Language"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of the installer"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_POLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_POLISH} "Credits"
-LangString CopyingLinkName ${LANG_POLISH} "License"
-LangString UninstallLinkName ${LANG_POLISH} "Uninstall"
-LangString ChangeLogLinkName ${LANG_POLISH} "Version History"
--- a/Installer/Language/spanish.nsi
+++ b/Installer/Language/spanish.nsi
@@ -1,22 +0,0 @@
-; Spanish installer translation
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_SPANISH} "Iniciando de mRemoteNG"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_SPANISH} "Lenguaje de Instalación"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_SPANISH} "Seleccione el lenguaje de instalación"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requiere Microsoft .NET Framework 3.0."
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_SPANISH} "Debe ser miembro del grupo 'Administradores' para poder instalar mRemoteNG."
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_SPANISH} "Créditos"
-LangString CopyingLinkName ${LANG_SPANISH} "Licencia"
-LangString UninstallLinkName ${LANG_SPANISH} "Desinstalar"
-LangString ChangeLogLinkName ${LANG_SPANISH} "Historial de Versiones"
--- a/Installer/Language/thai.nsi
+++ b/Installer/Language/thai.nsi
@@ -1,23 +0,0 @@
-; Thai installer translation
-; Contributed by Apisitt Rattana
-
-; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_THAI} "ขณะนี้กำลังติดตั้ง mRemoteNG"
-
-; Installer Language
-LangString InstallerLanguage ${LANG_THAI} "ภาษาสำหรับการติดตั้ง"
-
-; Select installer Language
-LangString SelectInstallerLanguage ${LANG_THAI} "กรุณาเลือกภาษาสำหรับการติดตั้ง"
-
-; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG มีความต้องการ  Microsoft .NET Framework 3.0. เป็นพื้นฐาน"
-
-; User needs to be Admin
-LangString RequiresAdminUser ${LANG_THAI} "คุณต้องเป็นสมาชิกในกลุ่มของ 'Power Users' หรือ 'Administrators' เพื่อการติดตั้ง mRemoteNG"
-
-; Start Menu items
-LangString CreditsLinkName ${LANG_THAI} "Credits"
-LangString CopyingLinkName ${LANG_THAI} "License"
-LangString UninstallLinkName ${LANG_THAI} "Uninstall"
-LangString ChangeLogLinkName ${LANG_THAI} "Version History"
--- a/Installer/RecycleBin.ico
+++ b/Installer/RecycleBin.ico
--- a/Installer/Setup_Install.ico
+++ b/Installer/Setup_Install.ico
--- a/Installer/mRemote.nsi
+++ b/Installer/mRemote.nsi
@@ -1,197 +0,0 @@
-!include "MUI.nsh"
-!include "WordFunc.nsh"
-!insertmacro VersionCompare
-
-!include "DotNetVer.nsh"
-!include "..\Release\Version.nsh"
-
-; This will be passed in using the /D switch by BUILD.CMD
-!ifdef PRODUCT_VERSION_TAG
-	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
-	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}-${PRODUCT_VERSION_TAG}"
-!else
-	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
-	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}"
-!endif
-
-; Basic Config
-Name "mRemoteNG ${PRODUCT_VERSION_FRIENDLY}"
-OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION_TAGGED}.exe"
-SetCompressor /SOLID lzma
-InstallDir "$PROGRAMFILES\mRemoteNG"
-InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
-RequestExecutionLevel admin
-
-; Version Information
-VIProductVersion ${PRODUCT_VERSION}
-VIAddVersionKey "CompanyName" "Next Generation Software"
-VIAddVersionKey "ProductName" "mRemoteNG"
-VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION}
-VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2013 Riley McArdle"
-VIAddVersionKey "FileDescription" "mRemoteNG ${PRODUCT_VERSION_FRIENDLY} Installer"
-VIAddVersionKey "FileVersion" ${PRODUCT_VERSION}
-
-; Design
-!define MUI_ICON "Setup_Install.ico"
-!define MUI_UNICON "RecycleBin.ico"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "header.bmp" ; optional
-!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
-!define MUI_HEADERIMAGE_UNBITMAP "header.bmp" ; optional
-!define MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH
-!define MUI_HEADER_TRANSPARENT_TEXT
-!define MUI_WELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
-!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP "welcomefinish.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-
-; Install Pages
-!insertmacro MUI_PAGE_LICENSE "..\COPYING.TXT"
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-
-; Finish Page
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_RUN "$INSTDIR\mRemoteNG.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstall Pages
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Get Languages
-!include "Language\languages.nsi"
-
-; Set finish page text
-!define MUI_FINISHPAGE_RUN_Text "$(LaunchMremoteNow)"
-
-Function .onInit
-	ClearErrors
-	UserInfo::GetName
-	IfErrors Win9x
-	Pop $0
-	UserInfo::GetAccountType
-	Pop $1
-	# GetOriginalAccountType will check the tokens of the original user of the
-	# current thread/process. If the user tokens were elevated or limited for
-	# this process, GetOriginalAccountType will return the non-restricted
-	# account type.
-	# On Vista with UAC, for example, this is not the same value when running
-	# with `RequestExecutionLevel user`. GetOriginalAccountType will return
-	# "admin" while GetAccountType will return "user".
-	StrCmp $1 "Admin" 0 +3
-		Goto doit
-	StrCmp $1 "Power" 0 +3
-		Goto doit
-	StrCmp $1 "User" 0 +3
-		Goto noop
-	StrCmp $1 "Guest" 0 +3
-		Goto noop
-	MessageBox MB_OK "Unknown error"
-	Goto doit
-
-	Win9x:
-	doit:
-		# We can install
-		IfSilent +2
-			Call SelectLanguage
-		Goto end
-	noop:
-		MessageBox MB_OK "$(RequiresAdminUser)"
-		Quit
-	end:
-FunctionEnd
-
-Function SelectLanguage
-	;Language selection dialog
-	Push ""
-	Push ${LANG_ENGLISH}
-	Push ${LanguageNameEnglish}
-	Push ${LANG_GERMAN}
-	Push ${LanguageNameGerman}
-	Push ${LANG_DUTCH}
-	Push ${LanguageNameDutch}
-	Push ${LANG_FRENCH}
-	Push ${LanguageNameFrench}
-	Push ${LANG_POLISH}
-	Push ${LanguageNamePolish}
-	Push ${LANG_SPANISH}
-	Push ${LanguageNameSpanish}
-	Push ${LANG_CZECH}
-	Push ${LanguageNameCzech}
-	Push ${LANG_THAI}
-	Push ${LanguageNameThai}
-	Push A ; A means auto count languages
-	       ; for the auto count to work the first empty push (Push "") must remain
-	LangDLL::LangDialog  "$(InstallerLanguage)" "$(SelectInstallerLanguage)"
-
-	Pop $LANGUAGE
-	StrCmp $LANGUAGE "cancel" 0 +2
-		Abort
-
-	; Check .NET version
-	${IfNot} ${HasDotNet3.0}
-		MessageBox MB_OK|MB_ICONEXCLAMATION "$(RequiresNetFramework)"
-		Quit
-	${EndIf}
-FunctionEnd
-
-Section "" ; Install
-	SetOutPath $INSTDIR
-	SetShellVarContext all
-	
-	; AddFiles
-	File /r /x "mRemoteNG.vshost.*" "..\mRemoteV1\bin\Release\*.*"
-	File /r "Dependencies\*.*"
-	File "..\*.txt"
-
-	; Uninstaller
-	WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-	; Register ActiveX components
-	RegDLL "$INSTDIR\eolwtscom.dll"
- 
-	; Start Menu
-	CreateDirectory "$SMPROGRAMS\mRemoteNG"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CreditsLinkName).lnk" "$INSTDIR\CREDITS.TXT"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CopyingLinkName).lnk" "$INSTDIR\COPYING.TXT"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(UninstallLinkName).lnk" "$INSTDIR\Uninstall.exe"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(ChangeLogLinkName).lnk" "$INSTDIR\CHANGELOG.TXT"
-
-	; Registry
-	WriteRegStr HKLM "Software\mRemoteNG" "InstallPath" $INSTDIR
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "mRemoteNG"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "Publisher" "Next Generation Software"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 7080
-
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION}
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMinor" ${PRODUCT_VERSION_MINOR}
-
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "NoModify" 1
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "NoRepair" 1
-SectionEnd
-
-Section "un.Uninstall"
-	; Unregister ActiveX components
-	UnregDLL "$INSTDIR\eolwtscom.dll"
-
-	; Delete Files
-	RMDIR /r $INSTDIR
-
-	; Start Menu
-	SetShellVarContext all
-	RMDir /r "$SMPROGRAMS\mRemoteNG"
-	SetShellVarContext current
-	RMDir /r "$SMPROGRAMS\mRemoteNG"
-
-	; Registry
-	DeleteRegValue HKLM "Software\mRemoteNG" "InstallPath"
-	DeleteRegKey /ifempty HKLM "Software\mRemoteNG"
-	DeleteRegKey /ifempty HKCU "Software\mRemoteNG"
-	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG"
-SectionEnd
--- a/Installer/welcomefinish.bmp
+++ b/Installer/welcomefinish.bmp
--- a/InstallerProjects/CustomActions/CustomAction.config
+++ b/InstallerProjects/CustomActions/CustomAction.config
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup useLegacyV2RuntimeActivationPolicy="true">
+
+        <!--
+          Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
+          the custom action should run on. If no versions are specified, the chosen version of the runtime
+          will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.
+
+          WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
+          problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
+          only the version(s) of the .NET Framework runtime that you have tested against.
+
+          Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.
+
+          In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies 
+          by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".
+
+          For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
+        -->
+
+        <supportedRuntime version="v4.0" />
+        <supportedRuntime version="v2.0.50727"/>
+
+    </startup>
+
+    <!--
+      Add additional configuration settings here. For more information on application config files,
+      see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
+    -->
+
+</configuration>
--- a/InstallerProjects/CustomActions/CustomActions.cs
+++ b/InstallerProjects/CustomActions/CustomActions.cs
@@ -0,0 +1,44 @@
+using Microsoft.Deployment.WindowsInstaller;
+
+namespace CustomActions
+{
+    public class CustomActions
+    {
+        [CustomAction]
+        public static ActionResult IsMinimumRdpVersionInstalled(Session session)
+        {
+            var rdpVersionChecker = new RdpVersionChecker(session);
+            rdpVersionChecker.Execute();
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult IsLegacyVersionInstalled(Session session)
+        {
+            session.Log("Begin IsLegacyVersionInstalled");
+            var uninstaller = new UninstallNsisVersions();
+            if (uninstaller.IsLegacymRemoteNgInstalled())
+            {
+                session["LEGACYVERSIONINSTALLED"] = "1";
+            }
+            else
+            {
+                session["LEGACYVERSIONINSTALLED"] = "0";
+            }
+
+            session.Log("End IsLegacyVersionInstalled");
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult UninstallLegacyVersion(Session session)
+        {
+            session.Log("Begin UninstallLegacyVersion");
+            var uninstaller = new UninstallNsisVersions();
+            uninstaller.GetLegacyUninstallString();
+            uninstaller.UninstallLegacyVersion(true);
+            session.Log("End UninstallLegacyVersion");
+            return ActionResult.Success;
+        }
+    }
+}
--- a/InstallerProjects/CustomActions/CustomActions.csproj
+++ b/InstallerProjects/CustomActions/CustomActions.csproj
@@ -2,18 +2,20 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
    <ProductVersion>8.0.30703</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0F615504-5F30-4CF2-8341-1DE7FEC95A23}</ProjectGuid>
+    <ProjectGuid>{5423D985-CB48-4344-B47F-E8C6D60C8B04}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SharedLibraryNG</RootNamespace>
-    <AssemblyName>SharedLibraryNG</AssemblyName>
+    <RootNamespace>CustomActions</RootNamespace>
+    <AssemblyName>CustomActions</AssemblyName>
    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
+    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
+    <TargetFrameworkProfile />
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
@@ -22,7 +24,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
@@ -30,26 +32,25 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Management" />
+    <Reference Include="Microsoft.Deployment.WindowsInstaller">
+      <Private>True</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="HotkeyControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="KeyboardHook.cs" />
+    <Compile Include="CustomActions.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Win32.cs" />
+    <Compile Include="InstalledWindowsUpdateGatherer.cs" />
+    <Compile Include="RdpVersionChecker.cs" />
+    <Compile Include="UninstallNsisVersions.cs" />
+    <Content Include="CustomAction.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <Import Project="$(WixCATargetsPath)" />
 </Project>
--- a/InstallerProjects/CustomActions/InstalledWindowsUpdateGatherer.cs
+++ b/InstallerProjects/CustomActions/InstalledWindowsUpdateGatherer.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Management;
+using System.Collections;
+
+namespace CustomActions
+{
+    public class InstalledWindowsUpdateGatherer
+    {
+        private readonly ManagementScope _managementScope;
+
+        public InstalledWindowsUpdateGatherer()
+        {
+            _managementScope = Connect();
+        }
+
+
+        public ManagementScope Connect()
+        {
+            try
+            {
+                return new ManagementScope(@"root\cimv2");
+            }
+            catch (ManagementException e)
+            {
+                Console.WriteLine($"Failed to connect: {e.Message}");
+                throw;
+            }
+        }
+
+        public ArrayList GetInstalledUpdates()
+        {
+            const string query = "SELECT * FROM Win32_QuickFixEngineering";
+            var installedUpdates = new ArrayList();
+            var searcher = new ManagementObjectSearcher(_managementScope, new ObjectQuery(query));
+            foreach(var o in searcher.Get())
+            {
+                var queryObj = (ManagementObject) o;
+                installedUpdates.Add(queryObj["HotFixID"]);
+            }
+            return installedUpdates;
+        }
+
+        public bool IsUpdateInstalled(string kb)
+        {
+            var updateIsInstalled = false;
+            var query = $"SELECT HotFixID FROM Win32_QuickFixEngineering WHERE HotFixID='{kb}'";
+            var searcher = new ManagementObjectSearcher(_managementScope, new ObjectQuery(query));
+            if (searcher.Get().Count > 0)
+                updateIsInstalled = true;
+            return updateIsInstalled;
+        }
+    }
+}
--- a/InstallerProjects/CustomActions/Properties/AssemblyInfo.cs
+++ b/InstallerProjects/CustomActions/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("HotfixInstalled")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("HotfixInstalled")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5423d985-cb48-4344-b47f-e8c6d60c8b04")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/InstallerProjects/CustomActions/RdpVersionChecker.cs
+++ b/InstallerProjects/CustomActions/RdpVersionChecker.cs
@@ -0,0 +1,42 @@
+using Microsoft.Deployment.WindowsInstaller;
+
+namespace CustomActions
+{
+    public class RdpVersionChecker
+    {
+        private readonly Session _session;
+        private const string MinimumVersionInstalledReturnVar = "MINIMUM_RDP_VERSION_INSTALLED";
+        private const string MinimumRdpKbVariable = "MINIMUM_RDP_KB";
+
+        public RdpVersionChecker(Session session)
+        {
+            _session = session;
+        }
+
+        public bool Execute()
+        {
+            _session.Log("Begin IsMinimumRdpVersionInstalled");
+            var minimumKb = _session[MinimumRdpKbVariable];
+            var isUpdateInstalled = IsUpdateInstalled(minimumKb);
+            SetReturnValue(isUpdateInstalled);
+            _session.Log("End IsMinimumRdpVersionInstalled");
+            return true;
+        }
+
+        private bool IsUpdateInstalled(string minimumKb)
+        {
+            _session.Log("Checking if '{0}' is installed", minimumKb);
+            var updateGatherer = new InstalledWindowsUpdateGatherer();
+            var isUpdateInstalled = updateGatherer.IsUpdateInstalled(minimumKb);
+            _session.Log("KB is installed = '{0}'", isUpdateInstalled);
+            return isUpdateInstalled;
+        }
+
+        private void SetReturnValue(bool isUpdateInstalled)
+        {
+            var updateInstalledVal = isUpdateInstalled ? "1" : "0";
+            _session[MinimumVersionInstalledReturnVar] = updateInstalledVal;
+            _session.Log($"Set property '{MinimumVersionInstalledReturnVar}' to '{updateInstalledVal}'");
+        }
+    }
+}
--- a/InstallerProjects/CustomActions/UninstallNSISVersions.cs
+++ b/InstallerProjects/CustomActions/UninstallNSISVersions.cs
@@ -0,0 +1,83 @@
+using System;
+using Microsoft.Win32;
+using System.Diagnostics;
+
+
+namespace CustomActions
+{
+    public class UninstallNsisVersions
+    {
+        private const string RegistryPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
+        private const string RegistryPathWow6432 = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
+        private RegistryKey _activeRegistryPath;
+
+
+        public UninstallNsisVersions()
+        {
+            GetLegacymRemoteNgRegistryKeyPath();
+        }
+
+        public void UninstallLegacyVersion(bool silent = false)
+        {
+            if (!IsLegacymRemoteNgInstalled())
+                return;
+            var uninstallString = GetLegacyUninstallString();
+            var forceNonTempUninstaller = $"_?={uninstallString.Replace("Uninstall.exe", "").Replace(@"""", "")}";
+            var silentUninstall = "";
+            if (silent)
+            {
+                silentUninstall = "/S";
+            }
+            var processStartInfo = new ProcessStartInfo(uninstallString)
+            {
+                UseShellExecute = true,
+                Arguments = $"{forceNonTempUninstaller} {silentUninstall}"
+            };
+            var uninstallProcess = Process.Start(processStartInfo);
+            while (uninstallProcess != null && uninstallProcess.HasExited == false)
+            {
+                Debug.WriteLine("Waiting for uninstaller to exit");
+            }
+        }
+
+        public bool IsLegacymRemoteNgInstalled()
+        {
+            return (_activeRegistryPath != null);
+        }
+
+        public string GetLegacyUninstallString()
+        {
+            return IsLegacymRemoteNgInstalled() ? _activeRegistryPath.GetValue("UninstallString").ToString() : "";
+        }
+
+        private void GetLegacymRemoteNgRegistryKeyPath()
+        {
+            GetUninstallKeyPath();
+            GetUninstallKeyPath6432();
+        }
+
+        private void GetUninstallKeyPath()
+        {
+            try
+            {
+                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(RegistryPath);
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+        }
+
+        private void GetUninstallKeyPath6432()
+        {
+            try
+            {
+                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(RegistryPathWow6432);
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+        }
+    }
+}
--- a/InstallerProjects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs
+++ b/InstallerProjects/Installer/CustomActions/CheckForInstalledWindowsUpdates.wxs
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment>
+    <CustomAction Id="CheckIfMinimumRdpInstalled" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsMinimumRdpVersionInstalled" />
+  </Fragment>
+</Wix>
--- a/InstallerProjects/Installer/CustomActions/UninstallLegacyVersions.wxs
+++ b/InstallerProjects/Installer/CustomActions/UninstallLegacyVersions.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment>
+    <CustomAction Id="CheckIfLegacyVersionInstalled" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsLegacyVersionInstalled" />
+	</Fragment>
+  <Fragment>
+    <CustomAction Id="UninstallLegacyVersion" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="UninstallLegacyVersion" />
+  </Fragment>
+</Wix>
--- a/InstallerProjects/Installer/Filters/Harvest_Filter.xslt
+++ b/InstallerProjects/Installer/Filters/Harvest_Filter.xslt
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+  <xsl:output method="xml" indent="yes" />
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, '.xml')]" use="@Id" />
+  <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, 'app.config')]" use="@Id" />
+  <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, 'vshost')]" use="@Id" />
+  <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, 'manifest')]" use="@Id" />
+  <xsl:key name="service-search" match="wix:Component[contains(wix:File/@Source, '.application')]" use="@Id" />
+  <xsl:key name="service-search" match="wix:Component[wix:File/@Source = '$(var.HarvestPath)\mRemoteNG.exe']" use="@Id" />
+  <xsl:key name="service-search" match="wix:Component[wix:File/@Source = '$(var.HarvestPath)\PuTTYNG.exe']" use="@Id" />
+  <xsl:template match="wix:Component[key('service-search', @Id)]" />
+  <xsl:template match="wix:ComponentRef[key('service-search', @Id)]" />
+</xsl:stylesheet>
--- a/InstallerProjects/Installer/Fragments/DirectoriesFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/DirectoriesFragment.wxs
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="$(var.PlatformProgramFilesFolder)">
+        <Directory Id="APPLICATIONROOTDIRECTORY" Name="$(var.ProductName)">
+        </Directory>
+      </Directory>
+
+      <Directory Id="DesktopFolder" Name="!(loc.Folders_Desktop)" />
+
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+      </Directory>
+    </Directory>
+	</Fragment>
+</Wix>
--- a/InstallerProjects/Installer/Fragments/MainExeFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/MainExeFragment.wxs
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment>
+    <Component Id="C.MainExe" Directory="APPLICATIONROOTDIRECTORY" Guid="*">
+      <File Id="MainExeFile" Source="$(var.SolutionDir)mRemoteV1\bin\$(var.Configuration)\mRemoteNG.exe" />
+    </Component>
+	</Fragment>
+</Wix>
--- a/InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <ComponentGroup Id="CG.ProjectInfoFiles" Directory="APPLICATIONROOTDIRECTORY">
+      <Component Id="C.Changelog" Guid="*">
+        <File Id="ChangelogFile" Name="Changelog.txt" Source="$(var.SolutionDir)CHANGELOG.TXT" KeyPath="yes" />
+      </Component>
+      <Component Id="C.Credits" Guid="*">
+        <File Id="CreditsFile" Name="Credits.txt" Source="$(var.SolutionDir)CREDITS.TXT" KeyPath="yes" />
+      </Component>
+      <Component Id="C.License" Guid="*">
+        <File Id="LicenseFile" Name="License.txt" Source="$(var.SolutionDir)COPYING.TXT" KeyPath="yes" />
+      </Component>
+      <Component Id="C.Readme" Guid="*">
+        <File Id="ReadmeFile" Name="Readme.txt" Source="$(var.SolutionDir)README.TXT" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+	</Fragment>
+</Wix>
--- a/InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/PuTTYNGFragment.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <DirectoryRef Id="APPLICATIONROOTDIRECTORY">
+      <Component Id="C.PuttyNGFile" Guid="*">
+        <File Id="PuttyNGFile" Name="PuTTYNG.exe" Source="$(var.HarvestPath)\PuTTYNG.exe" KeyPath="yes" />
+      </Component>
+    </DirectoryRef>
+	</Fragment>
+</Wix>
--- a/InstallerProjects/Installer/Fragments/ShortcutFragment.wxs
+++ b/InstallerProjects/Installer/Fragments/ShortcutFragment.wxs
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment Id="Fr.Shortcuts">
+    
+    <DirectoryRef Id="DesktopFolder">
+      <Component Id="C.DesktopShortcut" Guid="F78E5A16-A2F7-4BD9-9250-CBF3016CCCDA">
+        <Shortcut Id="DesktopShortcut" Name="$(var.ProductName)" Target="[APPLICATIONROOTDIRECTORY][MAINEXE]" WorkingDirectory="APPLICATIONROOTDIRECTORY" 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="[APPLICATIONROOTDIRECTORY][MAINEXE]" WorkingDirectory="APPLICATIONROOTDIRECTORY" Icon="mRemoteNG.ico" />
+        <Shortcut Id="CreditsShortcut" Name="Credits" Target="[APPLICATIONROOTDIRECTORY]Credits.txt" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+        <Shortcut Id="LicenseShortcut" Name="License" Target="[APPLICATIONROOTDIRECTORY]License.txt" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+        <Shortcut Id="ReadmeShortcut" Name="Readme" Target="[APPLICATIONROOTDIRECTORY]Readme.txt" WorkingDirectory="APPLICATIONROOTDIRECTORY" />
+        <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="ApplicationStartMenuShortcut" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+    
+	</Fragment>
+</Wix>
--- a/InstallerProjects/Installer/Includes/Config.wxi
+++ b/InstallerProjects/Installer/Includes/Config.wxi
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <?define ProductName = "mRemoteNG" ?>
+  <?define Company = "Next Generation Software" ?>
+  <?define UpgradeCode = "dd678a54-ca75-4791-8dfe-d818095684f8" ?>
+  <?define ProductCode = "*" ?>
+  <?define ProductVersion = "!(bind.FileVersion.MainExeFile)" ?>
+  <?define MajorVersion = "!(bind.property.ProductVersion.Major)" ?>
+  <?define MinorVersion = "!(bind.property.ProductVersion.Minor)" ?>
+  <?define BuildVersion = "!(bind.property.ProductVersion.Build)" ?>
+  <?define RevisionVersion = "!(bind.property.ProductVersion.Revision)" ?>
+  <?define ProductLanguage = 1033 ?>
+  <?define ExeProcessName = "$(var.ProductName).exe" ?>
+  
+  <?define RequiredDotNetFrameworkMajorVersion = "4" ?>
+  <?define RequiredDotNetFrameworkMinorVersion = "0" ?>
+  <?define RequiredDotNetFrameworkServicePackLevel = "" ?>
+  <?define RequiredDotNetFrameworkVersion = "$(var.RequiredDotNetFrameworkMajorVersion).$(var.RequiredDotNetFrameworkMinorVersion)" ?>
+  <?define Rdp80Kb = "KB2592687" ?>
+  <?define Rdp81Kb = "KB2923545" ?>
+  <?define MinimumRdpKb = $(var.Rdp80Kb) ?>
+  <?define IGNOREPREREQUISITES = 0 ?>
+  
+  <?if $(var.Platform) = x64 ?>
+    <?define ProductNameWithPlatform = "$(var.ProductName) (64 bit)" ?>
+    <?define Win64 = "yes" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+  <?else ?>
+    <?define ProductNameWithPlatform = "$(var.ProductName)" ?>
+    <?define Win64 = "no" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+  <?endif ?>
+</Include>
--- a/InstallerProjects/Installer/Installer.wixproj
+++ b/InstallerProjects/Installer/Installer.wixproj
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>f0168b9f-6815-40df-ba53-46cee7683b68</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>mRemoteNG-Installer</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug Portable' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug Portable;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release Portable' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release Portable;</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="CustomActions\CheckForInstalledWindowsUpdates.wxs" />
+    <Compile Include="CustomActions\UninstallLegacyVersions.wxs" />
+    <Compile Include="Fragments\FilesFragment.wxs" />
+    <Compile Include="Fragments\DirectoriesFragment.wxs" />
+    <Compile Include="Fragments\MainExeFragment.wxs" />
+    <Compile Include="Fragments\MiscTextFilesFragment.wxs" />
+    <Compile Include="Fragments\PuTTYNGFragment.wxs" />
+    <Compile Include="Fragments\ShortcutFragment.wxs" />
+    <Compile Include="mRemoteNGV1.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Dependencies\PuTTYNG.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Filters\Harvest_Filter.xslt" />
+    <Content Include="Includes\Config.wxi" />
+    <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" />
+    <Folder Include="CustomDialogs" />
+    <Folder Include="Fragments" />
+    <Folder Include="Includes" />
+    <Folder Include="Localizations" />
+    <Folder Include="Filters" />
+    <Folder Include="bin" />
+    <Folder Include="Dependencies" />
+    <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>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\mRemoteV1\mRemoteV1.csproj">
+      <Name>mRemoteV1</Name>
+      <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>
+      </DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>APPLICATIONROOTDIRECTORY</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+    -->
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <LinkerAdditionalOptions>
+    </LinkerAdditionalOptions>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+    <Cultures>en-US</Cultures>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <Cultures>en-US</Cultures>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|x86' ">
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>REM Clean the TargetDir
+rmdir /S /Q "$(TargetDir)"
+
+echo $(ConfigurationName) &gt; buildenv.tmp
+
+REM Harvest bin directory of the mRemoteV1 project
+call "$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -dr APPLICATIONROOTDIRECTORY -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt" -v
+
+REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
+call "$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>set /p buildenv=&lt;buildenv.tmp
+
+REM Sign MSI
+IF EXIST C:\mRemoteNG_code_signing_cert.pfx (
+    IF %25buildenv: Portable=%25==Release (
+        powershell "&amp;""$(SolutionDir)Tools\signfiles.ps1""" %27%25cd%25%27
+    )
+)
+
+REM Rename MSI to include version number
+powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\rename_installer_with_version.ps1" $(SolutionDir)
+
+REM Copy MSI to Release folder
+IF %25buildenv: Portable=%25==Release (powershell -ExecutionPolicy Bypass -File  "$(SolutionDir)Tools\copy_release_installer.ps1" $(TargetDir) $(SolutionDir)Release)</PostBuildEvent>
+  </PropertyGroup>
+</Project>
--- a/InstallerProjects/Installer/Localizations/cs-CZ.wxl
+++ b/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>
--- a/InstallerProjects/Installer/Localizations/de-DE.wxl
+++ b/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>
--- a/InstallerProjects/Installer/Localizations/en-US.wxl
+++ b/InstallerProjects/Installer/Localizations/en-US.wxl
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-US" Language="1033" 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 [REQUIREDDOTNETFRAMEWORKVERSION] or higher.</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>
--- a/InstallerProjects/Installer/Localizations/ja-JP.wxl
+++ b/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>
--- a/InstallerProjects/Installer/Localizations/ru-RU.wxl
+++ b/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>
--- a/InstallerProjects/Installer/Resources/Pandoc/COPYING.rtf
+++ b/InstallerProjects/Installer/Resources/Pandoc/COPYING.rtf
@@ -0,0 +1,85 @@
+{\rtf1\ansi\deff0{\fonttbl{\f0 \fswiss Helvetica;}{\f1 Courier;}}
+{\colortbl;\red255\green0\blue0;\red0\green0\blue255;}
+\widowctrl\hyphauto
+
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 GNU GENERAL PUBLIC LICENSE\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Version 2, June 1991\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Copyright (C) 1989, 1991 Free Software Foundation, Inc.\line 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs32 Preamble\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software\u8211-to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation\u8217's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also, for each author\u8217's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors\u8217' reputations.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone\u8217's free use or not licensed at all.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The precise terms and conditions for copying, distribution and modification follow.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs32 GNU GENERAL PUBLIC LICENSE\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 0.\tx360\tab This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The \u8220"Program\u8221", below, refers to any such program or work, and a \u8220"work based on the Program\u8221" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term \u8220"modification\u8221".) Each licensee is addressed as \u8220"you\u8221".\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 1.\tx360\tab You may copy and distribute verbatim copies of the Program\u8217's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 2.\tx360\tab You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 a)\tx360\tab You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 b)\tx360\tab You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 c)\tx360\tab If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)\sa180\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 3.\tx360\tab You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 a)\tx360\tab Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 b)\tx360\tab Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,\par}
+{\pard \ql \f0 \sa180 \li720 \fi-360 c)\tx360\tab Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)\sa180\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 4.\tx360\tab You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 5.\tx360\tab You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 6.\tx360\tab Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients\u8217' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 7.\tx360\tab If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 8.\tx360\tab If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 9.\tx360\tab The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par}
+{\pard \ql \f0 \sa180 \li360 \fi0 Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and \u8220"any later version\u8221", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 10.\tx360\tab If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 NO WARRANTY\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 11.\tx360\tab BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \u8220"AS IS\u8221" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par}
+{\pard \ql \f0 \sa180 \li360 \fi-360 12.\tx360\tab IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\sa180\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 END OF TERMS AND CONDITIONS\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \b \fs32 How to Apply These Terms to Your New Programs\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the \u8220"copyright\u8221" line and a pointer to where the full notice is found.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 <one line to give the program's name and a brief idea of what it does.>\line
+Copyright (C) <year>  <name of author>\line
+\line
+This program is free software; you can redistribute it and/or modify\line
+it under the terms of the GNU General Public License as published by\line
+the Free Software Foundation; either version 2 of the License, or\line
+(at your option) any later version.\line
+\line
+This program is distributed in the hope that it will be useful,\line
+but WITHOUT ANY WARRANTY; without even the implied warranty of\line
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\line
+GNU General Public License for more details.\line
+\line
+You should have received a copy of the GNU General Public License\line
+along with this program; if not, write to the Free Software\line
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 Also add information on how to contact you by electronic and paper mail.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 If the program is interactive, make it output a short notice like this when it starts in an interactive mode:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Gnomovision version 69, Copyright (C) year  name of author\line
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\line
+This is free software, and you are welcome to redistribute it\line
+under certain conditions; type `show c' for details.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 The hypothetical commands {\f1 show w' and}show c\u8217' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than {\f1 show w' and}show c\u8217'; they could even be mouse-clicks or menu items\u8211-whatever suits your program.\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 You should also get your employer (if you work as a programmer) or your school, if any, to sign a \u8220"copyright disclaimer\u8221" for the program, if necessary. Here is a sample; alter the names:\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \f1 Yoyodyne, Inc., hereby disclaims all copyright interest in the program\line
+`Gnomovision' (which makes passes at compilers) written by James Hacker.\line
+\line
+<signature of Ty Coon>, 1 April 1989\line
+Ty Coon, President of Vice\par}
+{\pard \ql \f0 \sa180 \li0 \fi0 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.\par}
+}
--- a/InstallerProjects/Installer/Resources/Pandoc/COPYRIGHT.txt
+++ b/InstallerProjects/Installer/Resources/Pandoc/COPYRIGHT.txt
@@ -0,0 +1,108 @@
+Pandoc
+Copyright (C) 2006-2016 John MacFarlane <jgm at berkeley dot edu>
+
+This code is released under the [GPL], version 2 or later:
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+The GNU General Public License is available in the file COPYING in
+the source distribution.  On Debian systems, the complete text of the
+GPL can be found in `/usr/share/common-licenses/GPL`.
+
+[GPL]: http://www.gnu.org/copyleft/gpl.html
+
+Pandoc's complete source code is available from the [Pandoc home page].
+
+[Pandoc home page]: http://pandoc.org
+
+Pandoc includes some code from other authors.  The copyright and license
+statements for these sources are included below.  All are GPL-compatible
+licenses.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Writers/Texinfo.hs
+Copyright (C) 2008-2015 John MacFarlane and Peter Wang
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Writers/OpenDocument.hs
+Copyright (C) 2008-2015 Andrea Rossato and John MacFarlane
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Writers/Org.hs
+Copyright (C) 2010-2015 Puneeth Chaganti and John MacFarlane
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Readers/Textile.hs
+Copyright (C) 2010-2015 Paul Rivier and John MacFarlane
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+src/Text/Pandoc/Readers/Org.hs
+tests/Tests/Readers/Org.hs
+Copyright (C) 2014-2015 Albert Krewinkel
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+data/LaTeXMathML.js
+Adapted by Jeff Knisely and Douglas Woodall from
+ASCIIMathML.js v. 1.4.7
+Copyright (C) 2005 Peter Jipsen
+
+Released under the GNU General Public License version 2 or later.
+
+----------------------------------------------------------------------
+data/MathMLinHTML.js
+Copyright (C) 2004 Peter Jipsen http://www.chapman.edu/~jipsen
+
+Released under the GNU General Public License version 2 or later.
+
+------------------------------------------------------------------------
+The dzslides template contains javascript and CSS from Paul Rouget's
+dzslides template.
+http://github.com/paulrouget/dzslides
+
+Released under the Do What the Fuck You Want To Public License.
+
+------------------------------------------------------------------------
+Pandoc embeds a lua interpreter (via hslua).
+
+Copyright © 1994–2015 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/InstallerProjects/Installer/Resources/Pandoc/pandoc.exe
+++ b/InstallerProjects/Installer/Resources/Pandoc/pandoc.exe
--- a/InstallerProjects/Installer/Resources/header.bmp
+++ b/InstallerProjects/Installer/Resources/header.bmp
--- a/InstallerProjects/Installer/Resources/mRemoteNG.ico
+++ b/InstallerProjects/Installer/Resources/mRemoteNG.ico
--- a/InstallerProjects/Installer/Resources/welcome.bmp
+++ b/InstallerProjects/Installer/Resources/welcome.bmp
--- a/InstallerProjects/Installer/mRemoteNGV1.wxs
+++ b/InstallerProjects/Installer/mRemoteNGV1.wxs
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+  <Product Name="$(var.ProductNameWithPlatform)" Manufacturer="Next Generation Software"
+           Version="$(var.ProductVersion)"
+           Id="$(var.ProductCode)" 
+           UpgradeCode="$(var.UpgradeCode)" 
+           Language="1033">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <MajorUpgrade DowngradeErrorMessage="!(loc.Upgrade_NewerVersionInstalled)" Schedule="afterInstallExecute" />
+    <MediaTemplate EmbedCab="yes" />
+    <Binary Id="CustomActions.CA.dll" SourceFile="$(var.SolutionDir)InstallerProjects\CustomActions\bin\$(var.Configuration)\CustomActions.CA.dll" />
+    <Property Id="ARPPRODUCTICON" Value="mRemoteNG.ico" />
+    <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
+    <Property Id="MAINEXE" Value="$(var.ExeProcessName)" />
+    <Property Id="APPLICATIONROOTDIRECTORY">
+      <RegistrySearch Id='mRemoteNGRegistry' Type='raw' Root='HKLM' Key='Software\mRemoteNG' Name='InstallDir' />
+    </Property>
+    <Property Id='MINIMUM_RDP_KB' Value='$(var.MinimumRdpKb)' />
+    <Property Id='MINIMUM_RDP_VERSION_INSTALLED' Value='0' Secure='yes' />
+    <Property Id='REQUIREDDOTNETFRAMEWORKVERSION' Value='$(var.RequiredDotNetFrameworkVersion)' />
+    <Property Id='LEGACYVERSIONINSTALLED' Value='0' />
+    <PropertyRef Id="NETFRAMEWORK40FULL" />
+    <PropertyRef Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
+    <Icon Id="mRemoteNG.ico" SourceFile="Resources\mRemoteNG.ico" />
+
+
+    <InstallUISequence>
+      <Custom Action="CheckIfMinimumRdpInstalled" After="AppSearch">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
+      <LaunchConditions After="SetWIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
+      <Custom Action="CheckIfLegacyVersionInstalled" After="LaunchConditions" />
+      <Custom Action="UninstallLegacyVersion" After="CheckIfLegacyVersionInstalled">(NOT Installed) AND (LEGACYVERSIONINSTALLED = 1)</Custom>
+    </InstallUISequence>
+    
+    
+    <!-- Need to be admin to install -->
+    <Condition Message="!(loc.Install_NeedToBeAdminToInstall)">
+      Privileged
+    </Condition>
+    <!-- Windows 7 or higher required -->
+    <Condition Message="!(loc.Install_OSVersionRequirement)">
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 601) OR (VersionNT64 >= 601)]]>
+    </Condition>
+    <!-- If Windows 7, SP 1 is required -->
+    <Condition Message="!(loc.Install_Win7RequiresSP1)">
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND ServicePackLevel >= 1)]]>
+    </Condition>
+    <!-- .Net Framework Version Condition -->
+    <Condition Message="!(loc.Install_NeedDotNetFrameworkVersion)">
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED = 1]]>
+    </Condition>
+    <!-- If Win7, require RDP 8.0 update (KB2592687) -->
+    <Condition Message="!(loc.Install_RDP80Requirement)">
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND (MINIMUM_RDP_VERSION_INSTALLED = 1))]]>
+    </Condition>
+    
+    
+
+    <Feature Id="F.Complete" Title="!(loc.Feature_Complete)" Display="expand" AllowAdvertise="no" Level="1">
+      <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="APPLICATIONROOTDIRECTORY" Level="1">
+        <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
+        <ComponentRef Id="C.MainExe" Primary="yes" />
+        <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.PuttyNG" Title="PuTTYNG" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.PuttyNGFile" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.DesktopShortcut" Title="!(loc.Feature_DesktopShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.DesktopShortcut" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
+      </Feature>
+    </Feature>
+
+    
+    <UIRef Id="WixUI_FeatureTree"/>
+    <WixVariable Id="WixUILicenseRtf" Value="Resources\License.rtf" />
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\welcome.bmp" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\header.bmp" />
+  </Product>
+</Wix>
--- a/27
+++ b/27
@@ -0,0 +1,27 @@
+node('windows') {
+	def jobDir = pwd()
+	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
+	def vsToolsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools"
+	def vsExtensionsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow"
+	
+	stage 'Checkout Branch'
+	checkout([
+		$class: 'GitSCM',
+		branches: scm.branches,
+		userRemoteConfigs: scm.userRemoteConfigs
+	])
+
+	stage 'Restore NuGet Packages'
+	def nugetPath = "C:\\nuget.exe"
+	bat "${nugetPath} restore ${solutionFilePath}"
+
+	stage 'Build mRemoteNG (Normal)'
+	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+
+	stage 'Build mRemoteNG (Portable)'
+	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && msbuild.exe /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\""
+
+	stage 'Run Unit Tests'
+	def nunitTestAdapterPath = "C:\\Users\\Administrator\\AppData\\Local\\Microsoft\\VisualStudio\\14.0\\Extensions"
+	bat "\"${vsToolsDir}\\VsDevCmd.bat\" && VSTest.Console.exe /TestAdapterPath:${nunitTestAdapterPath} \"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\""
+}
--- a/Local.testsettings
+++ b/Local.testsettings
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestSettings name="Local" id="2a25bb82-f5ff-4a67-b5e9-c6aaa54d1e80" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <Description>These are default test settings for a local test run.</Description>
-  <Deployment enabled="false" />
-  <Execution>
-    <TestTypeSpecific />
-    <AgentRule name="Execution Agents">
-    </AgentRule>
-  </Execution>
-</TestSettings>
--- a/README.MD
+++ b/README.MD
@@ -0,0 +1,34 @@
+[![Twitter Follow](https://img.shields.io/twitter/follow/mRemoteNG.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=mRemoteNG)
+
+
+[![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat)
+
+[![Build Status](http://ec2-52-39-111-114.us-west-2.compute.amazonaws.com:8080/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](http://ec2-52-39-111-114.us-west-2.compute.amazonaws.com:8080/job/mRemoteNG/job/mRemoteNG/job/develop/)
+[![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.74/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.74)
+
+
+mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
+
+It allows you to store all your remote connections in a simple yet powerful interface.
+
+Currently these protocols are supported:
+
+ * RDP (Remote Desktop)
+ * VNC (Virtual Network Computing)
+ * ICA (Independent Computing Architecture)
+ * SSH (Secure Shell)
+ * Telnet (TELecommunication NETwork)
+ * HTTP/S (Hypertext Transfer Protocol)
+ * Rlogin (Rlogin)
+ * RAW
+
+mRemoteNG can be installed on Windows 7 or later.
+
+Windows 7 systems require RDP version 8:   
+https://support.microsoft.com/en-us/kb/2592687   
+OR   
+https://support.microsoft.com/en-us/kb/2923545   
+
+Windows 8+ support RDP version 8+ out of the box.
+
+RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).
--- a/Readme.txt
+++ b/Readme.txt
@@ -11,4 +11,15 @@ Currently these protocols are supported:
 * Telnet (TELecommunication NETwork)
 * HTTP/S (Hypertext Transfer Protocol)
 * Rlogin (Rlogin)
- * RAW
+ * RAW
+
+mRemoteNG can be installed on Windows 7 or later.
+
+Windows 7 systems require RDP version 8:   
+https://support.microsoft.com/en-us/kb/2592687   
+OR   
+https://support.microsoft.com/en-us/kb/2923545   
+
+Windows 8+ support RDP version 8+ out of the box.
+
+RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).
--- a/SharedLibraryNG/HotkeyControl.cs
+++ b/SharedLibraryNG/HotkeyControl.cs
@@ -1,331 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-//
-// Hotkey selection control, written by serenity@exscape.org, 2006-08-03
-// Please mail me if you find a bug.
-//
-
-namespace SharedLibraryNG
-{
-    /// <summary>
-    /// A simple control that allows the user to select pretty much any valid hotkey combination
-    /// </summary>
-    public class HotkeyControl : TextBox
-    {
-	    private const string KeySeparator = " + ";
-
-        // These variables store the current hotkey and modifier(s)
-        private Keys _keyCode = Keys.None;
-        private Keys _modifiers = Keys.None;
-
-        // ArrayLists used to enforce the use of proper modifiers.
-        // Shift+A isn't a valid hotkey, for instance, as it would screw up when the user is typing.
-        private readonly ArrayList _needNonShiftModifier;
-        private readonly ArrayList _needNonAltGrModifier;
-
-        private readonly ContextMenu _emptyContextMenu = new ContextMenu();
-
-        /// <summary>
-        /// Used to make sure that there is no right-click menu available
-        /// </summary>
-        public override ContextMenu ContextMenu
-        {
-            get
-            {
-                return _emptyContextMenu;
-            }
-			// ReSharper disable once ValueParameterNotUsed
-			set
-            {
-                base.ContextMenu = _emptyContextMenu;
-            }
-        }
-
-        /// <summary>
-        /// Forces the control to be non-multiline
-        /// </summary>
-        public override bool Multiline
-        {
-            get
-            {
-                return base.Multiline;
-            }
-			// ReSharper disable once ValueParameterNotUsed
-            set
-            {
-                // Ignore what the user wants; force Multiline to false
-                base.Multiline = false;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new HotkeyControl
-        /// </summary>
-        public HotkeyControl()
-        {
-            // Handle events that occurs when keys are pressed
-            KeyUp += HotkeyControl_KeyUp;
-
-            // Fill the ArrayLists that contain all invalid hotkey combinations
-            _needNonShiftModifier = new ArrayList();
-            _needNonAltGrModifier = new ArrayList();
-            PopulateModifierLists();
-        }
-
-		protected override void OnCreateControl()
-		{
-			base.OnCreateControl();
-
-			ContextMenu = _emptyContextMenu; // Disable right-clicking
-			Multiline = false;
-			Text = "None";
-		}
-
-        /// <summary>
-        /// Populates the ArrayLists specifying disallowed hotkeys
-        /// such as Shift+A, Ctrl+Alt+4 (would produce a dollar sign) etc
-        /// </summary>
-        private void PopulateModifierLists()
-        {
-            // Shift + 0 - 9, A - Z
-            for (var k = Keys.D0; k <= Keys.Z; k++)
-                _needNonShiftModifier.Add((int)k);
-
-            // Shift + Numpad keys
-            for (var k = Keys.NumPad0; k <= Keys.NumPad9; k++)
-                _needNonShiftModifier.Add((int)k);
-
-            // Shift + Misc (,;<./ etc)
-            for (var k = Keys.Oem1; k <= Keys.OemBackslash; k++)
-                _needNonShiftModifier.Add((int)k);
-
-            // Misc keys that we can't loop through
-            _needNonShiftModifier.Add((int)Keys.Insert);
-            _needNonShiftModifier.Add((int)Keys.Help);
-            _needNonShiftModifier.Add((int)Keys.Multiply);
-            _needNonShiftModifier.Add((int)Keys.Add);
-            _needNonShiftModifier.Add((int)Keys.Subtract);
-            _needNonShiftModifier.Add((int)Keys.Divide);
-            _needNonShiftModifier.Add((int)Keys.Decimal);
-            _needNonShiftModifier.Add((int)Keys.Return);
-            _needNonShiftModifier.Add((int)Keys.Escape);
-            _needNonShiftModifier.Add((int)Keys.NumLock);
-            _needNonShiftModifier.Add((int)Keys.Scroll);
-            _needNonShiftModifier.Add((int)Keys.Pause);
-
-            // Ctrl+Alt + 0 - 9
-            for (var k = Keys.D0; k <= Keys.D9; k++)
-                _needNonAltGrModifier.Add((int)k);
-        }
-
-        /// <summary>
-        /// Fires when all keys are released. If the current hotkey isn't valid, reset it.
-        /// Otherwise, do nothing and keep the text and hotkey as it was.
-        /// </summary>
-        void HotkeyControl_KeyUp(object sender, KeyEventArgs e)
-        {
-			if (_keyCode == Keys.None && ModifierKeys == Keys.None) ResetHotkey();
-        }
-
-        /// <summary>
-        /// Handles some misc keys, such as Ctrl+Delete and Shift+Insert
-        /// </summary>
-        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
-        {
-			var keyCode = keyData & Keys.KeyCode;
-			var modifiers = keyData & Keys.Modifiers;
-
-			if (keyData == Keys.Back || keyData == Keys.Delete)
-            {
-                ResetHotkey();
-                return true;
-            }
-
-			_keyCode = keyCode;
-			_modifiers = modifiers;
-			Redraw();
-
-			return true;
-        }
-
-        /// <summary>
-        /// Clears the current hotkey and resets the TextBox
-        /// </summary>
-        public void ResetHotkey()
-        {
-            _keyCode = Keys.None;
-            _modifiers = Keys.None;
-			Text = "None";
-        }
-
-        /// <summary>
-        /// Used to get/set the hotkey (e.g. Keys.A)
-        /// </summary>
-        public Keys KeyCode
-        {
-            get
-            {
-                return _keyCode;
-            }
-            set
-            {
-                _keyCode = value;
-                Redraw(false);
-            }
-        }
-
-        /// <summary>
-        /// Used to get/set the modifier keys (e.g. Keys.Alt | Keys.Control)
-        /// </summary>
-        public Keys HotkeyModifiers
-        {
-            get
-            {
-                return _modifiers;
-            }
-            set
-            {
-                _modifiers = value;
-                Redraw(false);
-            }
-        }
-
-	    /// <summary>
-        /// Redraws the TextBox when necessary.
-        /// </summary>
-        /// <param name="validate">Specifies whether this function was called by the Hotkey/HotkeyModifiers properties or by the user.</param>
-        private void Redraw(bool validate = true)
-        {
-            // Only validate input if it comes from the user
-            if (validate)
-            {
-                // No modifier or shift only, AND a hotkey that needs another modifier
-	            if ((_modifiers == Keys.Shift || _modifiers == Keys.None) &&
-	                _needNonShiftModifier.Contains((int) _keyCode))
-	            {
-		            if (_modifiers == Keys.None)
-		            {
-			            // Set Ctrl+Alt as the modifier unless Ctrl+Alt+<key> won't work...
-			            if (_needNonAltGrModifier.Contains((int) _keyCode) == false)
-				            _modifiers = Keys.Alt | Keys.Control;
-			            else // ... in that case, use Shift+Alt instead.
-				            _modifiers = Keys.Alt | Keys.Shift;
-		            }
-		            else
-		            {
-			            // User pressed Shift and an invalid key (e.g. a letter or a number),
-			            // that needs another set of modifier keys
-			            _keyCode = Keys.None;
-			            Text = _modifiers + " + Invalid Key";
-			            return;
-		            }
-	            }
-	            // Check all Ctrl+Alt keys
-	            if ((_modifiers == (Keys.Alt | Keys.Control)) &&
-	                _needNonAltGrModifier.Contains((int) _keyCode))
-	            {
-		            // Ctrl+Alt+4 etc won't work; reset hotkey and tell the user
-		            _keyCode = Keys.None;
-		            Text = _modifiers + " + Invalid Key";
-		            return;
-	            }
-            }
-
-			// Don't allow modifiers keys for _keyCode
-			if (_keyCode == Keys.ShiftKey ||
-				_keyCode == Keys.LShiftKey ||
-				_keyCode == Keys.RShiftKey ||
-				_keyCode == Keys.ControlKey ||
-				_keyCode == Keys.LControlKey ||
-				_keyCode == Keys.RControlKey ||
-				_keyCode == Keys.Menu ||
-				_keyCode == Keys.LMenu ||
-				_keyCode == Keys.RMenu ||
-				_keyCode == Keys.LWin ||
-				_keyCode == Keys.RWin)
-				_keyCode = Keys.None;
-
-			if (_modifiers == Keys.None)
-            {
-                if (_keyCode == Keys.None)
-                {
-                    ResetHotkey();
-                    return;
-                }
-
-                // We get here if we've got a hotkey that is valid without a modifier,
-                // like F1-F12, Media-keys etc.
-                Text = _keyCode.ToString();
-                return;
-            }
-
-			Text = string.Join(KeySeparator, new[] { KeysToString(_modifiers), KeysToString(_keyCode) });
-        }
-
-	    public static string KeysToString(Keys keys)
-	    {
-			if (keys == Keys.None) return "None";
-
-		    var modifiers = (keys & Keys.Modifiers);
-		    var keyCode = (keys & Keys.KeyCode);
-
-		    var strings = new List<string>();
-
-			if (modifiers != 0)
-			{
-				var modifierStrings = new List<string>(modifiers.ToString().Replace(", ", ",").Split(','));
-				modifierStrings.Sort(new KeyModifierComparer());
-				strings.AddRange(modifierStrings);
-			}
-
-			if (keyCode != 0)
-			{
-				var keyString = keyCode.ToString();
-				var keyHashtable = new Dictionary<string, string>
-					{
-						{"Next", "PageDown"},
-						{"Oemcomma", ","},
-						{"OemMinus", "-"},
-						{"OemOpenBrackets", "["},
-						{"OemPeriod", "."},
-						{"Oemplus", "="},
-						{"OemQuestion", "/"},
-						{"Oemtilde", "`"},
-						{"D0", "0"},
-						{"D1", "1"},
-						{"D2", "2"},
-						{"D3", "3"},
-						{"D4", "4"},
-						{"D5", "5"},
-						{"D6", "6"},
-						{"D7", "7"},
-						{"D8", "8"},
-						{"D9", "9"},
-					};
-				if (keyHashtable.ContainsKey(keyString)) keyString = keyHashtable[keyString];
-				strings.Add(keyString);
-			}
-
-			return string.Join(KeySeparator, strings.ToArray());
-	    }
-
-	    private class KeyModifierComparer : IComparer<string>
-	    {
-		    private static readonly List<string> ModifierOrder = new List<string>
-			    {
-				    "control",
-				    "alt",
-				    "shift",
-			    };
-
-			public int Compare(string x, string y)
-			{
-				var xIndex = ModifierOrder.IndexOf(x.ToLowerInvariant());
-				var yIndex = ModifierOrder.IndexOf(y.ToLowerInvariant());
-				return xIndex - yIndex;
-			}
-		}
-    }
-}
--- a/SharedLibraryNG/KeyboardHook.cs
+++ b/SharedLibraryNG/KeyboardHook.cs
@@ -1,258 +0,0 @@
-//
-// Based on code from Stephen Toub's MSDN blog at
-// http://blogs.msdn.com/b/toub/archive/2006/05/03/589423.aspx
-//
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-
-namespace SharedLibraryNG
-{
-    public class KeyboardHook
-    {
-        // ReSharper disable InconsistentNaming
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool PostMessage(IntPtr hWnd, Int32 Msg, IntPtr wParam, HookKeyMsgData lParam);
-        // ReSharper restore InconsistentNaming
-
-        [Flags]
-        public enum ModifierKeys
-        {
-            None = 0x0000,
-            Shift = 0x0001,
-            LeftShift = 0x002,
-            RightShift = 0x004,
-            Control = 0x0008,
-            LeftControl = 0x010,
-            RightControl = 0x20,
-            Alt = 0x0040,
-            LeftAlt = 0x0080,
-            RightAlt = 0x0100,
-            Win = 0x0200,
-            LeftWin = 0x0400,
-            RightWin = 0x0800,
-        }
-
-        protected class KeyNotificationEntry
-			: IEquatable<KeyNotificationEntry>
-        {
-            public IntPtr WindowHandle;
-            public Int32 KeyCode;
-            public ModifierKeys ModifierKeys;
-            public Boolean Block;
-
-            public bool Equals(KeyNotificationEntry obj)
-            {
-                return (WindowHandle == obj.WindowHandle &&
-                        KeyCode == obj.KeyCode &&
-                        ModifierKeys == obj.ModifierKeys &&
-                        Block == obj.Block);
-            }
-        }
-
-        public const string HookKeyMsgName = "HOOKKEYMSG-{56BE0940-34DA-11E1-B308-C6714824019B}";
-	    private static Int32 _hookKeyMsg;
-        public static Int32 HookKeyMsg
-        {
-            get
-            {
-	            if (_hookKeyMsg == 0)
-	            {
-					_hookKeyMsg = Win32.RegisterWindowMessage(HookKeyMsgName).ToInt32();
-					if (_hookKeyMsg == 0)
-						throw new Win32Exception(Marshal.GetLastWin32Error());
-				}
-	            return _hookKeyMsg;
-            }
-        }
-
-        // this is a custom structure that will be passed to
-        // the requested hWnd via a WM_APP_HOOKKEYMSG message
-        [StructLayout(LayoutKind.Sequential)]
-        public class HookKeyMsgData
-        {
-            public Int32 KeyCode;
-            public ModifierKeys ModifierKeys;
-            public Boolean WasBlocked;
-        }
-
-        private static int _referenceCount;
-        private static IntPtr _hook;
-        private static readonly Win32.LowLevelKeyboardProcDelegate LowLevelKeyboardProcStaticDelegate = LowLevelKeyboardProc;
-        private static readonly List<KeyNotificationEntry> NotificationEntries = new List<KeyNotificationEntry>();
-        
-        public KeyboardHook()
-        {
-            _referenceCount++;
-            SetHook();
-        }
-
-        ~KeyboardHook()
-        {
-            _referenceCount--;
-            if (_referenceCount < 1) UnsetHook();
-        }
-
-        private static void SetHook()
-        {
-            if (_hook != IntPtr.Zero) return;
-
-            var curProcess = Process.GetCurrentProcess();
-            var curModule = curProcess.MainModule;
-
-            var hook = Win32.SetWindowsHookEx(Win32.WH_KEYBOARD_LL, LowLevelKeyboardProcStaticDelegate, Win32.GetModuleHandle(curModule.ModuleName), 0);
-            if (hook == IntPtr.Zero)
-                throw new Win32Exception(Marshal.GetLastWin32Error());
-
-            _hook = hook;
-        }
-
-        private static void UnsetHook()
-        {
-            if (_hook == IntPtr.Zero) return;
-
-            Win32.UnhookWindowsHookEx(_hook);
-            _hook = IntPtr.Zero;
-        }
-
-        private static IntPtr LowLevelKeyboardProc(Int32 nCode, IntPtr wParam, Win32.KBDLLHOOKSTRUCT lParam)
-        {
-            var wParamInt = wParam.ToInt32();
-            var result = 0;
-
-            if (nCode == Win32.HC_ACTION)
-            {
-                switch (wParamInt)
-                {
-                    case Win32.WM_KEYDOWN:
-                    case Win32.WM_SYSKEYDOWN:
-                    case Win32.WM_KEYUP:
-                    case Win32.WM_SYSKEYUP:
-                        result = OnKey(wParamInt, lParam);
-                        break;
-                }
-            }
-
-            if (result != 0) return new IntPtr(result);
-
-            return Win32.CallNextHookEx(_hook, nCode, wParam, lParam);
-        }
-
-        private static int OnKey(Int32 msg, Win32.KBDLLHOOKSTRUCT key)
-        {
-            var result = 0;
-
-            foreach (var notificationEntry in NotificationEntries)
-                if (GetFocusWindow() == notificationEntry.WindowHandle && notificationEntry.KeyCode == key.vkCode)
-                {
-                    var modifierKeys = GetModifierKeyState();
-					if (!ModifierKeysMatch(notificationEntry.ModifierKeys, modifierKeys)) continue;
-
-                    var wParam = new IntPtr(msg);
-                    var lParam = new HookKeyMsgData
-                    {
-                        KeyCode = key.vkCode,
-                        ModifierKeys = modifierKeys,
-                        WasBlocked = notificationEntry.Block,
-                    };
-
-                    if (!PostMessage(notificationEntry.WindowHandle, HookKeyMsg, wParam, lParam))
-                        throw new Win32Exception(Marshal.GetLastWin32Error());
-
-                    if (notificationEntry.Block) result = 1;
-                }
-
-            return result;
-        }
-
-        private static IntPtr GetFocusWindow()
-        {
-            var guiThreadInfo = new Win32.GUITHREADINFO();
-            if (!Win32.GetGUIThreadInfo(0, guiThreadInfo))
-                throw new Win32Exception(Marshal.GetLastWin32Error());
-			return Win32.GetAncestor(guiThreadInfo.hwndFocus, Win32.GA_ROOT);
-        }
-
-        protected static Dictionary<Int32, ModifierKeys> ModifierKeyTable = new Dictionary<Int32, ModifierKeys>
-        {
-            { Win32.VK_SHIFT, ModifierKeys.Shift },
-            { Win32.VK_LSHIFT, ModifierKeys.LeftShift },
-            { Win32.VK_RSHIFT, ModifierKeys.RightShift },
-            { Win32.VK_CONTROL, ModifierKeys.Control },
-            { Win32.VK_LCONTROL, ModifierKeys.LeftControl },
-            { Win32.VK_RCONTROL, ModifierKeys.RightControl },
-            { Win32.VK_MENU, ModifierKeys.Alt },
-            { Win32.VK_LMENU, ModifierKeys.LeftAlt },
-            { Win32.VK_RMENU, ModifierKeys.RightAlt },
-            { Win32.VK_LWIN, ModifierKeys.LeftWin },
-            { Win32.VK_RWIN, ModifierKeys.RightWin },
-        };
-
-        public static ModifierKeys GetModifierKeyState()
-        {
-            var modifierKeyState = ModifierKeys.None;
-
-            foreach (KeyValuePair<Int32, ModifierKeys> pair in ModifierKeyTable)
-            {
-                if ((Win32.GetAsyncKeyState(pair.Key) & Win32.KEYSTATE_PRESSED) != 0) modifierKeyState |= pair.Value;
-            }
-
-	        if ((modifierKeyState & ModifierKeys.LeftWin) != 0) modifierKeyState |= ModifierKeys.Win;
-			if ((modifierKeyState & ModifierKeys.RightWin) != 0) modifierKeyState |= ModifierKeys.Win;
-
-            return modifierKeyState;
-        }
-
-		public static Boolean ModifierKeysMatch(ModifierKeys requestedKeys, ModifierKeys pressedKeys)
-		{
-			if ((requestedKeys & ModifierKeys.Shift) != 0) pressedKeys &= ~(ModifierKeys.LeftShift | ModifierKeys.RightShift);
-			if ((requestedKeys & ModifierKeys.Control) != 0) pressedKeys &= ~(ModifierKeys.LeftControl | ModifierKeys.RightControl);
-			if ((requestedKeys & ModifierKeys.Alt) != 0) pressedKeys &= ~(ModifierKeys.LeftAlt | ModifierKeys.RightAlt);
-			if ((requestedKeys & ModifierKeys.Win) != 0) pressedKeys &= ~(ModifierKeys.LeftWin | ModifierKeys.RightWin);
-			return requestedKeys == pressedKeys;
-		}
-
-        public static void RequestKeyNotification(IntPtr windowHandle, Int32 keyCode, Boolean block)
-        {
-            RequestKeyNotification(windowHandle, keyCode, ModifierKeys.None, block);
-        }
-
-        public static void RequestKeyNotification(IntPtr windowHandle, Int32 keyCode, ModifierKeys modifierKeys = ModifierKeys.None, Boolean block = false)
-        {
-            var newNotificationEntry = new KeyNotificationEntry
-            {
-                WindowHandle = windowHandle,
-                KeyCode = keyCode,
-                ModifierKeys = modifierKeys,
-                Block = block,
-            };
-
-            foreach (var notificationEntry in NotificationEntries)
-                if (notificationEntry == newNotificationEntry) return;
-
-            NotificationEntries.Add(newNotificationEntry);
-        }
-
-		public static void CancelKeyNotification(IntPtr windowHandle, Int32 keyCode, Boolean block)
-		{
-			CancelKeyNotification(windowHandle, keyCode, ModifierKeys.None, block);
-		}
-
-		public static void CancelKeyNotification(IntPtr windowHandle, Int32 keyCode, ModifierKeys modifierKeys = ModifierKeys.None, Boolean block = false)
-		{
-			var notificationEntry = new KeyNotificationEntry
-			{
-				WindowHandle = windowHandle,
-				KeyCode = keyCode,
-				ModifierKeys = modifierKeys,
-				Block = block,
-			};
-
-			NotificationEntries.Remove(notificationEntry);
-		}
-    }
-}
--- a/SharedLibraryNG/Win32.cs
+++ b/SharedLibraryNG/Win32.cs
@@ -1,171 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace SharedLibraryNG
-{
-    // ReSharper disable InconsistentNaming
-    public static class Win32
-    {
-        #region Functions
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SetWindowsHookEx(int idHook, LowLevelKeyboardProcDelegate lpfn, IntPtr hMod, Int32 dwThreadId);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool UnhookWindowsHookEx(IntPtr hhk);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, KBDLLHOOKSTRUCT lParam);
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr GetModuleHandle(string lpModuleName);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr RegisterWindowMessage(string lpString);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool GetGUIThreadInfo(Int32 idThread, GUITHREADINFO lpgui);
-
-		[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-		public static extern IntPtr GetAncestor(IntPtr hwnd, UInt32 gaFlags);
-
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern Int16 GetAsyncKeyState(Int32 vKey);
-
-        #endregion
-
-        #region Delegates
-
-        public delegate IntPtr LowLevelKeyboardProcDelegate(Int32 nCode, IntPtr wParam, KBDLLHOOKSTRUCT lParam);
-
-        #endregion
-
-        #region Structures
-
-        [StructLayout(LayoutKind.Sequential)]
-        public class KBDLLHOOKSTRUCT
-        {
-            public Int32 vkCode;
-            public Int32 scanCode;
-            public Int32 flags;
-            public Int32 time;
-            public IntPtr dwExtraInfo;
-        };
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct RECT
-        {
-            public int left;
-            public int top;
-            public int right;
-            public int bottom;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public class GUITHREADINFO
-        {
-            public GUITHREADINFO()
-            {
-                cbSize = Convert.ToInt32(Marshal.SizeOf(this));
-            }
-
-            public Int32 cbSize;
-            public Int32 flags;
-            public IntPtr hwndActive;
-            public IntPtr hwndFocus;
-            public IntPtr hwndCapture;
-            public IntPtr hwndMenuOwner;
-            public IntPtr hwndMoveSize;
-            public IntPtr hwndCaret;
-            public RECT rcCaret;
-        }
-
-        #endregion
-
-        #region Constants
-
-		// GetAncestor
-	    public const int GA_ROOT = 2;
-
-        // SetWindowsHookEx
-        public const int WH_KEYBOARD_LL = 13;
-
-        // LowLevelKeyboardProcDelegate
-        public const int HC_ACTION = 0;
-
-        // SendMessage
-        public const int WM_KEYDOWN = 0x0100;
-        public const int WM_KEYUP = 0x0101;
-        public const int WM_SYSKEYDOWN = 0x0104;
-        public const int WM_SYSKEYUP = 0x0105;
-
-        // GetAsyncKeyState
-        public const int KEYSTATE_PRESSED = 0x8000;
-
-        #region Virtual Keys
-        public const int VK_CANCEL = 0x0003;
-        public const int VK_BACK = 0x0008;
-        public const int VK_TAB = 0x0009;
-        public const int VK_CLEAR = 0x000C;
-        public const int VK_RETURN = 0x000D;
-        public const int VK_PAUSE = 0x0013;
-        public const int VK_ESCAPE = 0x001B;
-        public const int VK_SNAPSHOT = 0x002C;
-        public const int VK_INSERT = 0x002D;
-        public const int VK_DELETE = 0x002E;
-        public const int VK_HOME = 0x0024;
-        public const int VK_END = 0x0023;
-        public const int VK_PRIOR = 0x0021;
-        public const int VK_NEXT = 0x0022;
-        public const int VK_LEFT = 0x0025;
-        public const int VK_UP = 0x0026;
-        public const int VK_RIGHT = 0x0027;
-        public const int VK_DOWN = 0x0028;
-        public const int VK_SELECT = 0x0029;
-        public const int VK_PRINT = 0x002A;
-        public const int VK_EXECUTE = 0x002B;
-        public const int VK_HELP = 0x002F;
-        public const int VK_LWIN = 0x005B;
-        public const int VK_RWIN = 0x005C;
-        public const int VK_APPS = 0x005D;
-        public const int VK_F1 = 0x0070;
-        public const int VK_F2 = 0x0071;
-        public const int VK_F3 = 0x0072;
-        public const int VK_F4 = 0x0073;
-        public const int VK_F5 = 0x0074;
-        public const int VK_F6 = 0x0075;
-        public const int VK_F7 = 0x0076;
-        public const int VK_F8 = 0x0077;
-        public const int VK_F9 = 0x0078;
-        public const int VK_F10 = 0x0079;
-        public const int VK_F11 = 0x007A;
-        public const int VK_F12 = 0x007B;
-        public const int VK_SHIFT = 0x0010;
-        public const int VK_LSHIFT = 0x00A0;
-        public const int VK_RSHIFT = 0x00A1;
-        public const int VK_CONTROL = 0x0011;
-        public const int VK_LCONTROL = 0x00A2;
-        public const int VK_RCONTROL = 0x00A3;
-        public const int VK_MENU = 0x0012;
-        public const int VK_LMENU = 0x00A4;
-        public const int VK_RMENU = 0x00A5;
-
-        public const int VK_OEM_1 = 0x00BA;
-        public const int VK_OEM_2 = 0x00BF;
-        public const int VK_OEM_3 = 0x00C0;
-        public const int VK_OEM_4 = 0x00DB;
-        public const int VK_OEM_5 = 0x00DC;
-        public const int VK_OEM_6 = 0x00DD;
-        public const int VK_OEM_7 = 0x00DE;
-        public const int VK_OEM_8 = 0x00DF;
-        public const int VK_OEM_102 = 0x00E2;
-
-        #endregion
-
-        #endregion
-
-        // ReSharper restore InconsistentNaming
-    }
-}
--- a/TestProject/ExternalToolTest.vb
+++ b/TestProject/ExternalToolTest.vb
@@ -1,145 +0,0 @@
-Imports Microsoft.VisualStudio.TestTools.UnitTesting
-
-Imports mRemoteNG.Tools
-Imports mRemoteNG.Connection.PuttySession
-
-
-'''<summary>
-'''This is a test class for ExternalToolTest and is intended
-'''to contain all ExternalToolTest Unit Tests
-'''</summary>
-<TestClass()> _
-Public Class ExternalToolTest
-    '''<summary>
-    '''Gets or sets the test context which provides
-    '''information about and functionality for the current test run.
-    '''</summary>
-    Public Property TestContext() As TestContext
-
-#Region "Additional test attributes"
-    '
-    'You can use the following additional attributes as you write your tests:
-    '
-    'Use ClassInitialize to run code before running the first test in the class
-    '<ClassInitialize()>  _
-    'Public Shared Sub MyClassInitialize(ByVal testContext As TestContext)
-    'End Sub
-    '
-    'Use ClassCleanup to run code after all tests in a class have run
-    '<ClassCleanup()>  _
-    'Public Shared Sub MyClassCleanup()
-    'End Sub
-    '
-    'Use TestInitialize to run code before running each test
-    '<TestInitialize()>  _
-    'Public Sub MyTestInitialize()
-    'End Sub
-    '
-    'Use TestCleanup to run code after each test has run
-    '<TestCleanup()>  _
-    'Public Sub MyTestCleanup()
-    'End Sub
-    '
-#End Region
-
-
-    '''<summary>
-    '''A test for ParseArguments
-    '''</summary>
-    <TestMethod(), _
-     DeploymentItem("mRemoteNG.exe")> _
-    Public Sub ParseArgumentsTest()
-        Dim externalTool As New ExternalTool
-
-        ' ReSharper disable StringLiteralTypo
-        externalTool.ConnectionInfo = New Info()
-        With externalTool.ConnectionInfo
-            .Name = "EMAN"
-            .Hostname = "EMANTSOH"
-            .Port = 9876
-            .Username = "EMANRESU"
-            .Password = "DROWSSAP"
-            .Domain = "NIAMOD"
-            .Description = "NOITPIRCSED"
-            .MacAddress = "SSERDDACAM"
-            .UserField = "DLEIFRESU"
-        End With
-
-        Assert.AreEqual("EMAN, EMANTSOH, 9876, EMANRESU, DROWSSAP, NIAMOD, NOITPIRCSED, SSERDDACAM, DLEIFRESU", externalTool.ParseArguments("%NAME%, %HOSTNAME%, %PORT%, %USERNAME%, %PASSWORD%, %DOMAIN%, %DESCRIPTION%, %MACADDRESS%, %USERFIELD%"))
-        ' ReSharper restore StringLiteralTypo
-
-        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%PATH%"), externalTool.ParseArguments("%!PATH%"))
-
-        externalTool.ConnectionInfo.Name = "()%!^""<>&|\""\\"
-
-        Assert.AreEqual("%%", externalTool.ParseArguments("%%"))
-        Assert.AreEqual("% %", externalTool.ParseArguments("% %"))
-        Assert.AreEqual("%-%", externalTool.ParseArguments("%-%"))
-        Assert.AreEqual("%!%", externalTool.ParseArguments("%!%"))
-        Assert.AreEqual("%^%", externalTool.ParseArguments("%^%"))
-        Assert.AreEqual("%%%", externalTool.ParseArguments("%%%"))
-        Assert.AreEqual("%foobar%", externalTool.ParseArguments("%foobar%"))
-        Assert.AreEqual("%-foobar%", externalTool.ParseArguments("%-foobar%"))
-        Assert.AreEqual("%!foobar%", externalTool.ParseArguments("%!foobar%"))
-        Assert.AreEqual("%-!^\", externalTool.ParseArguments("%-!^\"))
-
-        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%NAME%"))
-        Assert.AreEqual("^(^)^%^!^^^""^<^>^&^|\^""\\", externalTool.ParseArguments("%-NAME%"))
-        Assert.AreEqual("()%!^""<>&|\""\\", externalTool.ParseArguments("%!NAME%"))
-
-        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%name%"))
-        Assert.AreEqual("%^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%%name%"))
-        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\%", externalTool.ParseArguments("%name%%"))
-        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\ ^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%name% %name%"))
-
-        Assert.AreEqual("%-^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%-%name%"))
-        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\-%", externalTool.ParseArguments("%name%-%"))
-        Assert.AreEqual("%!^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("%!%name%"))
-        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\!%", externalTool.ParseArguments("%name%!%"))
-
-        Assert.AreEqual("\^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("\%NAME%"))
-        Assert.AreEqual("\^(^)^%^!^^\^""^<^>^&^|\\\^""\\NAME%", externalTool.ParseArguments("\%NAME%NAME%"))
-        Assert.AreEqual("%NAME\%", externalTool.ParseArguments("%NAME\%"))
-
-        Assert.AreEqual("""^(^)^%^!^^\^""^<^>^&^|\\\^""\\\\""", externalTool.ParseArguments("""%NAME%"""))
-        Assert.AreEqual("""^(^)^%^!^^^""^<^>^&^|\^""\\""", externalTool.ParseArguments("""%-NAME%"""))
-        Assert.AreEqual("""()%!^""<>&|\""\\""", externalTool.ParseArguments("""%!NAME%"""))
-
-        Assert.AreEqual("""^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("""%NAME%"))
-        Assert.AreEqual("""^(^)^%^!^^^""^<^>^&^|\^""\\", externalTool.ParseArguments("""%-NAME%"))
-        Assert.AreEqual("""()%!^""<>&|\""\\", externalTool.ParseArguments("""%!NAME%"))
-
-        Assert.AreEqual("^(^)^%^!^^\^""^<^>^&^|\\\^""\\\\""", externalTool.ParseArguments("%NAME%"""))
-        Assert.AreEqual("^(^)^%^!^^^""^<^>^&^|\^""\\""", externalTool.ParseArguments("%-NAME%"""))
-        Assert.AreEqual("()%!^""<>&|\""\\""", externalTool.ParseArguments("%!NAME%"""))
-
-        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%USERNAME%"), externalTool.ParseArguments("\%USERNAME\%"))
-        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%USERNAME%"), externalTool.ParseArguments("\%-USERNAME\%"))
-        Assert.AreEqual(Environment.ExpandEnvironmentVariables("%USERNAME%"), externalTool.ParseArguments("\%!USERNAME\%"))
-
-        Assert.AreEqual("\^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("\%NAME%"))
-        Assert.AreEqual("%NAME\%", externalTool.ParseArguments("%NAME\%"))
-        Assert.AreEqual("\\%NAME\\%", externalTool.ParseArguments("\\%NAME\\%"))
-        Assert.AreEqual("\\\%NAME\\\%", externalTool.ParseArguments("\\\%NAME\\\%"))
-        Assert.AreEqual("\\\\%NAME\\\\%", externalTool.ParseArguments("\\\\%NAME\\\\%"))
-        Assert.AreEqual("\\\\\%NAME\\\\\%", externalTool.ParseArguments("\\\\\%NAME\\\\\%"))
-
-        Assert.AreEqual("%NAME%", externalTool.ParseArguments("^%NAME^%"))
-        Assert.AreEqual("%-NAME%", externalTool.ParseArguments("^%-NAME^%"))
-        Assert.AreEqual("\%NAME\%", externalTool.ParseArguments("\^%NAME\^%"))
-        Assert.AreEqual("\%-NAME\%", externalTool.ParseArguments("\^%-NAME\^%"))
-
-        Assert.AreEqual("^%NAME^%", externalTool.ParseArguments("^^%NAME^^%"))
-        Assert.AreEqual("^%-NAME^%", externalTool.ParseArguments("^^%-NAME^^%"))
-        Assert.AreEqual("^^^^%NAME^^^^%", externalTool.ParseArguments("^^^^^%NAME^^^^^%"))
-        Assert.AreEqual("^^^^%-NAME^^^^%", externalTool.ParseArguments("^^^^^%-NAME^^^^^%"))
-        Assert.AreEqual("^^^^%!NAME^^^^%", externalTool.ParseArguments("^^^^^%!NAME^^^^^%"))
-
-        Assert.AreEqual("blah%blah", externalTool.ParseArguments("blah%blah"))
-        Assert.AreEqual("blah^%blah", externalTool.ParseArguments("blah^%blah"))
-        Assert.AreEqual("blah^^%blah", externalTool.ParseArguments("blah^^%blah"))
-        Assert.AreEqual("blah^^^%blah", externalTool.ParseArguments("blah^^^%blah"))
-
-        Assert.AreEqual("^^^^%-NAME^^^^% ^(^)^%^!^^\^""^<^>^&^|\\\^""\\", externalTool.ParseArguments("^^^^^%-NAME^^^^^% %NAME%"))
-    End Sub
-End Class
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -1,37 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following 
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("TestProject")> 
-<Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("")> 
-<Assembly: AssemblyProduct("TestProject")> 
-<Assembly: AssemblyCopyright("Copyright ©  2013")> 
-<Assembly: AssemblyTrademark("")> 
-
-<Assembly: CLSCompliant(True)> 
-
-<Assembly: ComVisible(False)>
-
-'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("8918ad54-4841-44e9-abda-e1b787b02c7c")> 
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Version
-'      Minor Version 
-'      Build Number
-'      Revision
-'
-' You can specify all the values or you can default the Build and Revision Numbers 
-' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("1.0.*")> 
-
-<Assembly: AssemblyVersion("1.0.0.0")> 
-<Assembly: AssemblyFileVersion("1.0.0.0")> 
--- a/References/mRemoteNG.accessor
+++ b/References/mRemoteNG.accessor
@@ -1,2 +0,0 @@
-mRemoteNG.exe
-Desktop
--- a/TestProject/TestProject.vbproj
+++ b/TestProject/TestProject.vbproj
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>
-    </SchemaVersion>
-    <ProjectGuid>{24E0689D-95C0-4AAB-A93F-B8D6B7F0CB97}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>TestProject</RootNamespace>
-    <AssemblyName>TestProject</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <ReferencePath>$(DevEnvDir)PublicAssemblies\</ReferencePath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>TestProject.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>TestProject.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ADTree">
-      <HintPath>..\mRemoteV1\References\ADTree.dll</HintPath>
-    </Reference>
-    <Reference Include="AxInterop.MSTSCLib">
-      <HintPath>..\mRemoteV1\obj\Debug\AxInterop.MSTSCLib.dll</HintPath>
-    </Reference>
-    <Reference Include="AxInterop.WFICALib">
-      <HintPath>..\mRemoteV1\obj\Debug\AxInterop.WFICALib.dll</HintPath>
-    </Reference>
-    <Reference Include="DiffieHellman">
-      <HintPath>..\mRemoteV1\References\DiffieHellman.dll</HintPath>
-    </Reference>
-    <Reference Include="FilteredPropertyGrid">
-      <HintPath>..\mRemoteV1\References\FilteredPropertyGrid.dll</HintPath>
-    </Reference>
-    <Reference Include="Interop.EOLWTSCOM">
-      <HintPath>..\mRemoteV1\obj\Debug\Interop.EOLWTSCOM.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Interop.MSTSCLib">
-      <HintPath>..\mRemoteV1\obj\Debug\Interop.MSTSCLib.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Interop.SHDocVw">
-      <HintPath>..\mRemoteV1\obj\Debug\Interop.SHDocVw.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Interop.WFICALib">
-      <HintPath>..\mRemoteV1\obj\Debug\Interop.WFICALib.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="IPTextBox">
-      <HintPath>..\mRemoteV1\References\IPTextBox.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net">
-      <HintPath>..\mRemoteV1\References\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="MagicLibrary, Version=1.7.4.0, Culture=neutral, PublicKeyToken=3a6eb82f876a49bc">
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="MiniGeckoBrowser">
-      <HintPath>..\mRemoteV1\References\MiniGeckoBrowser.dll</HintPath>
-    </Reference>
-    <Reference Include="MiniTabControl">
-      <HintPath>..\mRemoteV1\References\MiniTabControl.dll</HintPath>
-    </Reference>
-    <Reference Include="Org.Mentalis.Security">
-      <HintPath>..\mRemoteV1\References\Org.Mentalis.Security.dll</HintPath>
-    </Reference>
-    <Reference Include="PSTaskDialog">
-      <HintPath>..\mRemoteV1\References\PSTaskDialog.dll</HintPath>
-    </Reference>
-    <Reference Include="Skybound.Gecko">
-      <HintPath>..\mRemoteV1\References\Skybound.Gecko.dll</HintPath>
-    </Reference>
-    <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Tamir.SharpSSH">
-      <HintPath>..\mRemoteV1\References\Tamir.SharpSSH.dll</HintPath>
-    </Reference>
-    <Reference Include="VncSharpNG">
-      <HintPath>..\mRemoteV1\References\VncSharpNG.dll</HintPath>
-    </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking">
-      <HintPath>..\mRemoteV1\References\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
-  </ItemGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ExternalToolTest.vb" />
-    <Compile Include="My Project\AssemblyInfo.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <Shadow Include="Test References\mRemoteNG.accessor" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\mRemoteV1\mRemoteV1.vbproj">
-      <Project>{4934A491-40BC-4E5B-9166-EA1169A220F6}</Project>
-      <Name>mRemoteV1</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/Tools/7zip/7za.dll
+++ b/Tools/7zip/7za.dll
--- a/Tools/7zip/7za.exe
+++ b/Tools/7zip/7za.exe
--- a/Tools/7zip/7zxa.dll
+++ b/Tools/7zip/7zxa.dll
--- a/Tools/7zip/License.txt
+++ b/Tools/7zip/License.txt
@@ -0,0 +1,31 @@
+      7-Zip Extra
+      ~~~~~~~~~~~
+      License for use and distribution
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+      Copyright (C) 1999-2016 Igor Pavlov.
+
+      7-Zip Extra files are under the GNU LGPL license.
+
+      
+      Notes: 
+        You can use 7-Zip Extra on any computer, including a computer in a commercial 
+        organization. You don't need to register or pay for 7-Zip.
+
+
+      GNU LGPL information
+      --------------------
+
+        This library is free software; you can redistribute it and/or
+        modify it under the terms of the GNU Lesser General Public
+        License as published by the Free Software Foundation; either
+        version 2.1 of the License, or (at your option) any later version.
+
+        This library is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+        Lesser General Public License for more details.
+
+        You can receive a copy of the GNU Lesser General Public License from 
+        http://www.gnu.org/
+
--- a/Tools/7zip/history.txt
+++ b/Tools/7zip/history.txt
@@ -0,0 +1,77 @@
+7-Zip Extra history
+-------------------
+
+9.35 beta           2014-12-07
+------------------------------
+  - SFX modules were moved to LZMA SDK package.
+
+
+9.34 alpha          2014-06-22
+------------------------------
+  - Minimum supported system now is Windows 2000 for EXE and DLL files.
+  - all EXE and DLL files use msvcrt.dll.
+  - 7zr.exe now support AES encryption.
+
+
+9.18                2010-11-02
+------------------------------
+  - New small SFX module for installers.
+
+
+9.17                2010-10-04
+------------------------------
+  - New 7-Zip plugin for FAR Manager x64.
+
+
+9.10                2009-12-30
+------------------------------
+  - 7-Zip for installers now supports LZMA2.
+
+
+9.09                2009-12-12
+------------------------------
+  - LZMA2 compression method support.
+  - Some bugs were fixed.
+
+
+4.65                2009-02-03
+------------------------------
+  - Some bugs were fixed.
+
+
+4.38 beta           2006-04-13
+------------------------------
+  - SFX for installers now supports new properties in config file:
+    Progress, Directory, ExecuteFile, ExecuteParameters.
+
+
+4.34 beta           2006-02-27
+------------------------------
+  - ISetProperties::SetProperties:
+      it's possible to specify desirable number of CPU threads: 
+           PROPVARIANT: name=L"mt", vt = VT_UI4, ulVal = NumberOfThreads
+      If "mt" is not defined, 7za.dll will check number of processors in system to set 
+      number of desirable threads. 
+      Now 7za.dll can use:
+        2 threads for LZMA compressing
+        N threads for BZip2 compressing
+        4 threads for BZip2 decompressing
+      Other codecs use only one thread. 
+      Note: 7za.dll can use additional "small" threads with low CPU load.
+  - It's possible to call ISetProperties::SetProperties to specify "mt" property for decoder.
+
+
+4.33 beta           2006-02-05
+------------------------------
+  - Compressing speed and Memory requirements were increased.
+    Default dictionary size was increased: Fastest: 64 KB, Fast: 1 MB, 
+    Normal: 4 MB, Max: 16 MB, Ultra: 64 MB.
+  - 7z/LZMA now can use only these match finders: HC4, BT2, BT3, BT4
+
+
+4.27                2005-09-21
+------------------------------
+ - Some GUIDs/interfaces were changed.
+   IStream.h:
+     ISequentialInStream::Read now works as old ReadPart
+     ISequentialOutStream::Write now works as old WritePart
--- a/Tools/7zip/readme.txt
+++ b/Tools/7zip/readme.txt
@@ -0,0 +1,124 @@
+7-Zip Extra 16.02
+-----------------
+
+7-Zip Extra is package of extra modules of 7-Zip. 
+
+7-Zip Copyright (C) 1999-2016 Igor Pavlov.
+
+7-Zip is free software. Read License.txt for more information about license.
+
+Source code of binaries can be found at:
+  http://www.7-zip.org/
+
+This package contains the following files:
+
+7za.exe     - standalone console version of 7-Zip with reduced formats support.
+7za.dll     - library for working with 7z archives
+7zxa.dll    - library for extracting from 7z archives
+License.txt - license information
+readme.txt  - this file
+
+Far\        - plugin for Far Manager
+x64\        - binaries for x64
+
+
+All 32-bit binaries can work in:
+  Windows 2000 / 2003 / 2008 / XP / Vista / 7 / 8 / 10
+  and  in any Windows x64 version with WoW64 support.
+All x64 binaries can work in any Windows x64 version. 
+
+All binaries use msvcrt.dll.
+
+7za.exe 
+-------
+
+7za.exe - is a standalone console version of 7-Zip with reduced formats support.
+
+  Extra: 7za.exe             : support for only some formats of 7-Zip.
+  7-Zip: 7z.exe with 7z.dll  : support for all formats of 7-Zip.
+
+7za.exe and 7z.exe from 7-Zip have same command line interface.
+7za.exe doesn't use external DLL files.
+
+You can read Help File (7-zip.chm) from 7-Zip package for description 
+of all commands and switches for 7za.exe and 7z.exe.
+
+7za.exe features:
+
+  - High compression ratio in 7z format
+  - Supported formats:
+      - Packing / unpacking: 7z, xz, ZIP, GZIP, BZIP2 and TAR 
+      - Unpacking only: Z, lzma, CAB.
+  - Highest compression ratio for ZIP and GZIP formats.
+  - Fast compression and decompression
+  - Strong AES-256 encryption in 7z and ZIP formats.
+
+Note: LZMA SDK contains 7zr.exe - more reduced version of 7za.exe.
+But you can use 7zr.exe as "public domain" code.
+
+
+
+DLL files
+---------
+
+7za.dll and 7zxa.dll are reduced versions of 7z.dll from 7-Zip.
+7za.dll and 7zxa.dll support only 7z format.
+Note: 7z.dll is main DLL file that works with all archive types in 7-Zip.
+
+7za.dll and 7zxa.dll support the following decoding methods:
+    - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES, BZip2, Deflate.
+
+7za.dll also supports 7z encoding with the following encoding methods:
+    - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES.
+
+7za.dll and 7zxa.dll work via COM interfaces.
+But these DLLs don't use standard COM interfaces for objects creating.
+
+Look also example code that calls DLL functions (in source code of 7-Zip):
+ 
+ 7zip\UI\Client7z
+
+Another example of binary that uses these interface is 7-Zip itself.
+The following binaries from 7-Zip use 7z.dll:
+  - 7z.exe (console version)
+  - 7zG.exe (GUI version)
+  - 7zFM.exe (7-Zip File Manager)
+
+Note: The source code of LZMA SDK also contains the code for similar DLLs
+(DLLs without BZip2, Deflate support). And these files from LZMA SDK can be 
+used as "public domain" code. If you use LZMA SDK files, you don't need to 
+follow GNU LGPL rules, if you want to change the code.
+
+
+
+
+License FAQ
+-----------
+
+Can I use the EXE or DLL files from 7-Zip in a commercial application?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Yes, but you are required to specify in documentation for your application:
+  (1) that you used parts of the 7-Zip program, 
+  (2) that 7-Zip is licensed under the GNU LGPL license and 
+  (3) you must give a link to www.7-zip.org, where the source code can be found.
+
+
+Can I use the source code of 7-Zip in a commercial application?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Since 7-Zip is licensed under the GNU LGPL you must follow the rules of that license. 
+In brief, it means that any LGPL'ed code must remain licensed under the LGPL. 
+For instance, you can change the code from 7-Zip or write a wrapper for some 
+code from 7-Zip and compile it into a DLL; but, the source code of that DLL 
+(including your modifications / additions / wrapper) must be licensed under 
+the LGPL or GPL. 
+Any other code in your application can be licensed as you wish. This scheme allows 
+users and developers to change LGPL'ed code and recompile that DLL. That is the 
+idea of free software. Read more here: http://www.gnu.org/. 
+
+
+
+Note: You can look also LZMA SDK, which is available under a more liberal license.
+
+
+---
+End of document
--- a/Tools/build-relport.cmd
+++ b/Tools/build-relport.cmd
@@ -0,0 +1,45 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+set SOLUTIONDIR=%~dp0..
+
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%SOLUTIONDIR%\Tools\sigcheck.exe"
+set SEVENZIP="%SOLUTIONDIR%\Tools\7zip\7za.exe"
+
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+call %VCVARSALL% x86
+
+IF NOT "%~1"=="build" goto skipbuild
+echo Building...
+"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" "%SOLUTIONDIR%\mRemoteV1.sln" /Rebuild "Release Portable"
+
+:skipbuild
+IF NOT EXIST "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe" echo Did you forget to build? && goto end
+set SIGCHECK=!SIGCHECK:"=^"!
+set SIGCHECK=!SIGCHECK: =^^ !
+set SIGCHECK=!SIGCHECK:(=^^(!
+set SIGCHECK=!SIGCHECK:)=^^)!
+for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   set PRODUCT_VERSION=%%i.%%j.%%k.%%l
+)
+echo Version is %PRODUCT_VERSION%
+
+set PORTABLEZIP="%SOLUTIONDIR%\Release\mRemoteNG-Portable-%PRODUCT_VERSION%.zip"
+
+rmdir /S /Q "%SOLUTIONDIR%\mRemoteV1\bin\package"
+mkdir "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\*.txt" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\Installer Projects\Installer\Dependencies\PuTTYNG.exe" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+xcopy /S /Y "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+echo Creating portable ZIP file...
+echo %PORTABLEZIP% 
+del /f /q %PORTABLEZIP% > nul 2>&1
+%SEVENZIP% a -bt -mx=9 -tzip -y -r %PORTABLEZIP% "%SOLUTIONDIR%\mRemoteV1\bin\package\*.*"
+%SEVENZIP% a -bt -mx=9 -tzip -y %PORTABLEZIP% "%SOLUTIONDIR%\*.TXT"
+
+:end
--- a/Tools/copy_release_installer.ps1
+++ b/Tools/copy_release_installer.ps1
@@ -0,0 +1,16 @@
+$sourcePath = $args[0]
+$destinationDir = $args[1]
+
+Write-Host $sourcePath
+Write-Host $destinationDir
+
+if (!(Test-Path -Path $destinationDir))
+{
+    New-Item -Path $destinationDir -ItemType "directory"
+}
+
+$sourceFiles = Get-ChildItem -Path $sourcePath -Recurse | ?{$_.Extension -match "exe|msi"}
+foreach ($item in $sourceFiles)
+{
+    Copy-Item -Path $item.FullName -Destination $destinationDir -Force
+}
--- a/Tools/rename_installer_with_version.ps1
+++ b/Tools/rename_installer_with_version.ps1
@@ -0,0 +1,25 @@
+$solutionDir = $args[0]
+$renameTarget = $solutionDir + "InstallerProjects\Installer\bin\Release\en-US\mRemoteNG-Installer.msi"
+
+Write-Host $solutionDir
+Write-Host $renameTarget
+
+$targetVersionedFile = "$solutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
+$version = &"$solutionDir\Tools\sigcheck.exe" /accepteula -q -n $targetVersionedFile
+
+
+$renameTargetFileObject = Get-Item -Path $renameTarget -ErrorAction SilentlyContinue
+if ($renameTargetFileObject)
+{
+    # Build the new file name
+    $oldFileName = $renameTargetFileObject.Name
+    $newFileName = $oldFileName -replace "$("\"+$renameTargetFileObject.Extension)",$("-"+$version+$renameTargetFileObject.Extension)
+    Write-Host $oldFileName
+    Write-Host $newFileName
+
+    # Delete any items that already exist with the new name (effectively an overwrite)
+    Remove-Item -Path "$($renameTargetFileObject.Directory.FullName)\$newFileName" -ErrorAction SilentlyContinue
+
+    # Rename file
+    Rename-Item -Path $renameTarget -NewName $newFileName -ErrorAction SilentlyContinue
+}
--- a/Tools/sigcheck.exe
+++ b/Tools/sigcheck.exe
--- a/Tools/signfiles.ps1
+++ b/Tools/signfiles.ps1
@@ -0,0 +1,13 @@
+$timeserver = "http://timestamp.verisign.com/scripts/timstamp.dll"
+$certPath = "C:\mRemoteNG_code_signing_cert.pfx"
+$certPassword = (Get-Credential -Message "Enter the password for the certificate" -UserName "USERNAME NOT NEEDED").Password
+$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($certPath, $certPassword)
+$targetPath = $args[0]
+
+
+Write-Output "Getting files from path: $targetPath"
+$signableFiles = Get-ChildItem -Path $targetPath -Recurse | ?{$_.Extension -match "dll|exe|msi"}
+Write-Output "Signable files count: $($signableFiles.Count)"
+foreach ($file in $signableFiles) {
+    Set-AuthenticodeSignature -Certificate $cert -TimestampServer $timeserver -IncludeChain all -FilePath $file.FullName
+}
--- a/TraceAndTestImpact.testsettings
+++ b/TraceAndTestImpact.testsettings
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestSettings name="Trace and Test Impact" id="e062ce86-3357-43c9-b5c3-6b38a0dc3776" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <Description>These are test settings for Trace and Test Impact.</Description>
-  <Execution>
-    <TestTypeSpecific />
-    <AgentRule name="Execution Agents">
-      <DataCollectors>
-        <DataCollector uri="datacollector://microsoft/SystemInfo/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.SystemInfoDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="System Information">
-        </DataCollector>
-        <DataCollector uri="datacollector://microsoft/HttpProxy/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.HttpProxyCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="ASP.NET Client Proxy for IntelliTrace and Test Impact">
-        </DataCollector>
-        <DataCollector uri="datacollector://microsoft/TestImpact/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TestImpactDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Test Impact">
-        </DataCollector>
-        <DataCollector uri="datacollector://microsoft/TraceDebugger/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TraceDebuggerDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="IntelliTrace">
-        </DataCollector>
-      </DataCollectors>
-    </AgentRule>
-  </Execution>
-</TestSettings>
--- a/UI_tests.playlist
+++ b/UI_tests.playlist
@@ -0,0 +1 @@
+<Playlist Version="1.0"><Add Test="mRemoteNGTests.UI.WindowListTests.TestMethod1" /><Add Test="mRemoteNGTests.UI.WindowListTests.AddWindowToList" /><Add Test="mRemoteNGTests.UI.WindowListTests.CountReturnsCorrectNumber" /></Playlist>
--- a/mRemoteNGTests/App/LoggerTests.cs
+++ b/mRemoteNGTests/App/LoggerTests.cs
@@ -0,0 +1,25 @@
+using System;
+using NUnit.Framework;
+using mRemoteNG.App;
+using log4net;
+
+namespace mRemoteNGTests.App
+{
+    [TestFixture]
+    public class LoggerTests
+    {
+        [Test]
+        public void GetSingletonInstanceReturnsAnILogObject()
+        {
+            Assert.That(Logger.Instance, Is.InstanceOf<ILog>());
+        }
+
+        [Test]
+        public void SingletonOnlyEverReturnsTheSameInstance()
+        {
+            ILog log1 = Logger.Instance;
+            ILog log2 = Logger.Instance;
+            Assert.That(log1, Is.EqualTo(log2));
+        }
+    }
+}
--- a/mRemoteNGTests/BinaryFileTests.cs
+++ b/mRemoteNGTests/BinaryFileTests.cs
@@ -0,0 +1,68 @@
+using NUnit.Framework;
+using System.IO;
+
+namespace mRemoteNGTests
+{
+    [TestFixture]
+    public class BinaryFileTests
+    {
+        [Test]
+        public void LargeAddressAwareFlagIsSet()
+        {
+            var exePath = GetTargetPath();
+            Assert.That(IsLargeAware(exePath), Is.True);
+        }
+
+        static string GetTargetPath([System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "")
+        {
+            string debugOrRelease = "";
+            string normalOrPortable = "";
+#if DEBUG
+            debugOrRelease = "Debug";
+#else
+            debugOrRelease = "Release";
+#endif
+#if PORTABLE
+            normalOrPortable = " Portable";
+#else
+            normalOrPortable = "";
+#endif
+            var path = Path.GetDirectoryName(sourceFilePath);
+            string FilePath = $"{path}\\..\\mRemoteV1\\bin\\{debugOrRelease}{normalOrPortable}\\mRemoteNG.exe";
+            return FilePath;
+        }
+
+        static bool IsLargeAware(string file)
+        {
+            using (var fs = File.OpenRead(file))
+            {
+                return IsLargeAware(fs);
+            }
+        }
+        /// <summary>
+        /// Checks if the stream is a MZ header and if it is large address aware
+        /// </summary>
+        /// <param name="stream">Stream to check, make sure its at the start of the MZ header</param>
+        /// <exception cref=""></exception>
+        /// <returns></returns>
+        static bool IsLargeAware(Stream stream)
+        {
+            const int IMAGE_FILE_LARGE_ADDRESS_AWARE = 0x20;
+
+            var br = new BinaryReader(stream);
+
+            if (br.ReadInt16() != 0x5A4D)       //No MZ Header
+                return false;
+
+            br.BaseStream.Position = 0x3C;
+            var peloc = br.ReadInt32();         //Get the PE header location.
+
+            br.BaseStream.Position = peloc;
+            if (br.ReadInt32() != 0x4550)       //No PE header
+                return false;
+
+            br.BaseStream.Position += 0x12;
+            return (br.ReadInt16() & IMAGE_FILE_LARGE_ADDRESS_AWARE) == IMAGE_FILE_LARGE_ADDRESS_AWARE;
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Connections/SqlConnectionUpdateCheckerTests.cs
+++ b/mRemoteNGTests/Config/Connections/SqlConnectionUpdateCheckerTests.cs
@@ -0,0 +1,27 @@
+using System;
+using NUnit.Framework;
+using mRemoteNG.Config;
+using mRemoteNG.Config.Connections;
+using NSubstitute;
+
+namespace mRemoteNGTests.Config.Connections
+{
+    [TestFixture]
+    public class SqlConnectionUpdateCheckerTests
+    {
+        SqlConnectionsUpdateChecker _updateChecker;
+
+        [SetUp]
+        public void Setup()
+        {
+            _updateChecker = new SqlConnectionsUpdateChecker();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _updateChecker.Dispose();
+            _updateChecker = null;
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Connections/SqlUpdateQueryBuilderTest.cs
+++ b/mRemoteNGTests/Config/Connections/SqlUpdateQueryBuilderTest.cs
@@ -0,0 +1,32 @@
+using System;
+using NUnit.Framework;
+using mRemoteNG.Config.Connections;
+using System.Data.SqlClient;
+
+namespace mRemoteNGTests.Config.Connections
+{
+    [TestFixture]
+    public class SqlUpdateQueryBuilderTest
+    {
+        private SqlUpdateQueryBuilder _sqlUpdateQueryBuilder;
+
+        [SetUp]
+        public void Setup()
+        {
+            _sqlUpdateQueryBuilder = new SqlUpdateQueryBuilder();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _sqlUpdateQueryBuilder = null;
+        }
+
+        [Test]
+        public void SqlUpdateQueryBuilderReturnsSomeCommand()
+        {
+            SqlCommand command = _sqlUpdateQueryBuilder.BuildCommand();
+            Assert.AreNotEqual(command.CommandText, "");
+        }
+    }
+}
--- a/mRemoteNGTests/Config/Connections/SqlUpdateTimerTests.cs
+++ b/mRemoteNGTests/Config/Connections/SqlUpdateTimerTests.cs
@@ -0,0 +1,40 @@
+using mRemoteNG.Config.Connections;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Connections
+{
+    [TestFixture]
+    public class SqlUpdateTimerTests
+    {
+        private SqlUpdateTimer sqlUpdateChecker;
+
+        [SetUp]
+        public void SetupSqlUpdateChecker()
+        {
+            sqlUpdateChecker = new SqlUpdateTimer();
+        }
+
+        [TearDown]
+        public void TearDownSqlUpdateChecker()
+        {
+            sqlUpdateChecker.Dispose();
+            sqlUpdateChecker = null;
+        }
+
+        [Test]
+        public void EnableSQLUpdating()
+        {
+            sqlUpdateChecker.Enable();
+            Assert.AreEqual(true, sqlUpdateChecker.IsUpdateCheckingEnabled());
+        }
+
+        [Test]
+        public void DisableSQLUpdating()
+        {
+            sqlUpdateChecker.Enable();
+            Assert.AreEqual(true, sqlUpdateChecker.IsUpdateCheckingEnabled());
+            sqlUpdateChecker.Disable();
+            Assert.AreEqual(false, sqlUpdateChecker.IsUpdateCheckingEnabled());
+        }
+    }
+}
--- a/mRemoteNGTests/Connection/ConnectionInfoInheritanceTests.cs
+++ b/mRemoteNGTests/Connection/ConnectionInfoInheritanceTests.cs
@@ -0,0 +1,107 @@
+using mRemoteNG.Connection;
+using NUnit.Framework;
+using System.Reflection;
+using System.Collections;
+
+namespace mRemoteNGTests.Connection
+{
+    [TestFixture]
+    public class ConnectionInfoInheritanceTests
+    {
+        private ConnectionInfo _connectionInfo;
+        private ConnectionInfoInheritance _inheritance;
+        private PropertyInfo[] _inheritanceProperties = typeof(ConnectionInfoInheritance).GetProperties();
+
+
+        [SetUp]
+        public void Setup()
+        {
+            _connectionInfo = new ConnectionInfo();
+            _inheritance = new ConnectionInfoInheritance(_connectionInfo);
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _connectionInfo = null;
+            _inheritance = null;
+        }
+
+        [Test]
+        public void TurnOffInheritanceCompletely()
+        {
+            _inheritance.Username = true;
+            _inheritance.TurnOffInheritanceCompletely();
+            Assert.That(AllInheritancePropertiesAreFalse(), Is.True);
+        }
+
+        [Test]
+        public void TurnOnInheritanceCompletely()
+        {
+            _inheritance.TurnOnInheritanceCompletely();
+            Assert.That(AllInheritancePropertiesAreTrue(), Is.True);
+        }
+
+        [Test]
+        public void DisableInheritanceTurnsOffAllInheritance()
+        {
+            _inheritance.Username = true;
+            _inheritance.DisableInheritance();
+            Assert.That(AllInheritancePropertiesAreFalse(), Is.True);
+        }
+
+        [Test]
+        public void EnableInheritanceRestoresPreviousInheritanceValues()
+        {
+            _inheritance.Username = true;
+            _inheritance.DisableInheritance();
+            _inheritance.EnableInheritance();
+            Assert.That(_inheritance.Username, Is.True);
+        }
+
+
+        private bool AllInheritancePropertiesAreTrue()
+        {
+            bool allPropertiesTrue = true;
+            foreach (var property in _inheritanceProperties)
+            {
+                if (PropertyIsBoolean(property) && PropertyIsChangedWhenSettingInheritAll(property) && BooleanPropertyIsSetToFalse(property))
+                    allPropertiesTrue = false;
+            }
+            return allPropertiesTrue;
+        }
+
+        private bool AllInheritancePropertiesAreFalse()
+        {
+            bool allPropertiesFalse = true;
+            foreach (var property in _inheritanceProperties)
+            {
+                if (PropertyIsBoolean(property) && PropertyIsChangedWhenSettingInheritAll(property) && BooleanPropertyIsSetToTrue(property))
+                    allPropertiesFalse = false;
+            }
+            return allPropertiesFalse;
+        }
+
+        private bool PropertyIsChangedWhenSettingInheritAll(PropertyInfo property)
+        {
+            ArrayList propertiesIgnoredByInheritAll = new ArrayList();
+            propertiesIgnoredByInheritAll.Add("IsDefault");
+            return propertiesIgnoredByInheritAll.Contains(property);
+        }
+
+        private bool PropertyIsBoolean(PropertyInfo property)
+        {
+            return (property.PropertyType.Name == typeof(bool).Name);
+        }
+
+        private bool BooleanPropertyIsSetToFalse(PropertyInfo property)
+        {
+            return (bool)property.GetValue(_inheritance) == false;
+        }
+
+        private bool BooleanPropertyIsSetToTrue(PropertyInfo property)
+        {
+            return (bool)property.GetValue(_inheritance) == true;
+        }
+    }
+}
--- a/mRemoteNGTests/ListViewTester.cs
+++ b/mRemoteNGTests/ListViewTester.cs
@@ -0,0 +1,250 @@
+#region Copyright (c) 2003-2005, Luke T. Maxon
+
+/********************************************************************************************************************
+'
+' Copyright (c) 2003-2005, Luke T. Maxon
+' All rights reserved.
+' 
+' Redistribution and use in source and binary forms, with or without modification, are permitted provided
+' that the following conditions are met:
+' 
+' * Redistributions of source code must retain the above copyright notice, this list of conditions and the
+' 	following disclaimer.
+' 
+' * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+' 	the following disclaimer in the documentation and/or other materials provided with the distribution.
+' 
+' * Neither the name of the author nor the names of its contributors may be used to endorse or 
+' 	promote products derived from this software without specific prior written permission.
+' 
+' THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+' WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+' PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+' ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+' LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+' INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+' OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+' IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+'
+'*******************************************************************************************************************/
+
+#endregion
+
+//Contributed by: Ian Cooper
+
+using System.Collections;
+using System.Windows.Forms;
+
+namespace NUnit.Extensions.Forms
+{
+    /// <summary>
+    /// A ControlTester for testing List Views.  
+    /// </summary>
+    /// <remarks>
+    /// It includes helper methods for selecting items from the list
+    /// and for clearing those selections.</remarks>
+    public class ListViewTester : ControlTester
+    {
+        /// <summary>
+        /// Creates a ControlTester from the control name and the form instance.
+        /// </summary>
+        /// <remarks>
+        /// It is best to use the overloaded Constructor that requires just the name 
+        /// parameter if possible.
+        /// </remarks>
+        /// <param name="name">The Control name.</param>
+        /// <param name="form">The Form instance.</param>
+        public ListViewTester(string name, Form form)
+            : base(name, form)
+        {
+        }
+
+        /// <summary>
+        /// Creates a ControlTester from the control name and the form name.
+        /// </summary>
+        /// <remarks>
+        /// It is best to use the overloaded Constructor that requires just the name 
+        /// parameter if possible.
+        /// </remarks>
+        /// <param name="name">The Control name.</param>
+        /// <param name="formName">The Form name..</param>
+        public ListViewTester(string name, string formName)
+            : base(name, formName)
+        {
+        }
+
+        /// <summary>
+        /// Creates a ControlTester from the control name.
+        /// </summary>
+        /// <remarks>
+        /// This is the best constructor.</remarks>
+        /// <param name="name">The Control name.</param>
+        public ListViewTester(string name)
+            : base(name)
+        {
+        }
+
+        /// <summary>
+        /// Creates a ControlTester from a ControlTester and an index where the
+        /// original tester's name is not unique.
+        /// </summary>
+        /// <remarks>
+        /// It is best to use the overloaded Constructor that requires just the name 
+        /// parameter if possible.
+        /// </remarks>
+        /// <param name="tester">The ControlTester.</param>
+        /// <param name="index">The index to test.</param>
+        public ListViewTester(ControlTester tester, int index)
+            : base(tester, index)
+        {
+        }
+
+        /// <summary>
+        /// Allows you to find a ListViewTester by index where the name is not unique.
+        /// </summary>
+        /// <remarks>
+        /// This was added to support the ability to find controls where their name is
+        /// not unique.  If all of your controls are uniquely named (I recommend this) then
+        /// you will not need this.
+        /// </remarks>
+        /// <value>The ControlTester at the specified index.</value>
+        /// <param name="index">The index of the ListViewTester.</param>
+        public new ListViewTester this[int index]
+        {
+            get
+            {
+                return new ListViewTester(this, index);
+            }
+        }
+
+        /// <summary>
+        /// Provides access to all of the Properties of the ListBox.
+        /// </summary>
+        /// <remarks>
+        /// Allows typed access to all of the properties of the underlying control.
+        /// </remarks>
+        /// <value>The underlying control.</value>
+        public ListView Properties
+        {
+            get
+            {
+                return (ListView)Control;
+            }
+        }
+
+        /// <summary>
+        /// Helper method to return the List View's Items property
+        /// </summary>
+        public ListView.ListViewItemCollection Items
+        {
+            get
+            {
+                return Properties.Items;
+            }
+        }
+
+        /// <summary>
+        /// Helper method to return the columns of the list view
+        /// </summary>
+        public ListView.ColumnHeaderCollection Columns
+        {
+            get
+            {
+                return Properties.Columns;
+            }
+        }
+
+        /// <summary>
+        /// Clears the selections from the list box.
+        /// </summary>
+        public void ClearSelected()
+        {
+            foreach (ListViewItem item in Properties.Items)
+            {
+                item.Selected = false;
+            }
+        }
+
+        /// <summary>
+        /// Selects an item in the ListBox according to its index.
+        /// </summary>
+        /// <param name="i">the index to select.</param>
+        public void Select(int i)
+        {
+            Properties.Items[i].Selected = true;
+            FireEvent("ItemActivate");
+        }
+
+        /// <summary>
+        /// Selects an item in the list according to its string value.
+        /// </summary>
+        /// <param name="text">The item to select.</param>
+        public void Select(string text)
+        {
+            int index = FindItemByString(text);
+
+            if (ItemFound(index))
+            {
+                Select(index);
+            }
+        }
+
+        /// <summary>
+        /// Multiple selection of a range of items
+        /// </summary>
+        /// <param name="items"></param>
+        public void SelectItems(string[] items)
+        {
+            foreach (string item in items)
+            {
+                Select(item);
+            }
+        }
+
+        /// <summary>
+        /// Test that only the indicated items are selected
+        /// </summary>
+        /// <param name="matchList"></param>
+        public bool SelectedItemsMatch(string[] matches)
+        {
+            ArrayList matchList = new ArrayList(matches);
+
+            if (matchList.Count != Properties.SelectedItems.Count)
+            {
+                return false;
+            }
+
+            foreach (ListViewItem item in Properties.SelectedItems)
+            {
+                if (!matchList.Contains(item.Text))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        #region Implementation
+
+        private bool ItemFound(int index)
+        {
+            return index != -1;
+        }
+
+        private int FindItemByString(string text)
+        {
+            for (int i = 0; i < Properties.Items.Count; i++)
+            {
+                if (Properties.Items[i].Text == text)
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
+        #endregion
+    }
+}
--- a/SharedLibraryNG/Properties/AssemblyInfo.cs
+++ b/SharedLibraryNG/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SharedLibraryNG")]
+[assembly: AssemblyTitle("mRemoteNGTests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharedLibraryNG")]
-[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyProduct("mRemoteNGTests")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]

 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f4470853-f933-4203-9d2a-b3c731e225c7")]
+[assembly: Guid("4e9583d3-2b1b-419d-bda5-f06e70e03b50")]

 // Version information for an assembly consists of the following four values:
 //
--- a/mRemoteNGTests/Security/AeadCryptographyProviderTests.cs
+++ b/mRemoteNGTests/Security/AeadCryptographyProviderTests.cs
@@ -0,0 +1,58 @@
+using System.Security;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Security
+{
+    public class AeadCryptographyProviderTests
+    {
+        private ICryptographyProvider _cryptographyProvider;
+        private SecureString _encryptionKey;
+        private string _plainText;
+
+        [SetUp]
+        public void Setup()
+        {
+            _cryptographyProvider = new AeadCryptographyProvider();
+            _encryptionKey = "mypassword111111".ConvertToSecureString();
+            _plainText = "MySecret!";
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            _cryptographyProvider = null;
+        }
+
+        [Test]
+        public void GetBlockSizeReturnsProperValueForAes()
+        {
+            Assert.That(_cryptographyProvider.BlockSizeInBytes, Is.EqualTo(16));
+        }
+
+        [Test]
+        public void EncryptionOutputsBase64String()
+        {
+            var cipherText = _cryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            Assert.That(cipherText.IsBase64String, Is.True);
+        }
+
+        [Test]
+        public void DecryptedTextIsEqualToOriginalPlainText()
+        {
+            var cipherText = _cryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            var decryptedCipherText = _cryptographyProvider.Decrypt(cipherText, _encryptionKey);
+            Assert.That(decryptedCipherText, Is.EqualTo(_plainText));
+        }
+
+        [Test]
+        public void EncryptingTheSameValueReturnsNewCipherTextEachTime()
+        {
+            var cipherText1 = _cryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            var cipherText2 = _cryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            Assert.That(cipherText1, Is.Not.EqualTo(cipherText2));
+        }
+    }
+}
--- a/mRemoteNGTests/Security/CryptographyProviderFactoryTests.cs
+++ b/mRemoteNGTests/Security/CryptographyProviderFactoryTests.cs
@@ -0,0 +1,112 @@
+using mRemoteNG.Security;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Security
+{
+    [TestFixture]
+    public class CryptographyProviderFactoryTests
+    {
+        private CryptographyProviderFactory _cryptographyProviderFactory;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _cryptographyProviderFactory = new CryptographyProviderFactory();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            _cryptographyProviderFactory = null;
+        }
+
+        [Test]
+        public void CanCreateAesGcm()
+        {
+            var engine = BlockCipherEngines.AES;
+            var mode = BlockCipherModes.GCM;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateAesCcm()
+        {
+            var engine = BlockCipherEngines.AES;
+            var mode = BlockCipherModes.CCM;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateAesEax()
+        {
+            var engine = BlockCipherEngines.AES;
+            var mode = BlockCipherModes.EAX;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateSerpentGcm()
+        {
+            var engine = BlockCipherEngines.Serpent;
+            var mode = BlockCipherModes.GCM;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateSerpentCcm()
+        {
+            var engine = BlockCipherEngines.Serpent;
+            var mode = BlockCipherModes.CCM;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateSerpentEax()
+        {
+            var engine = BlockCipherEngines.Serpent;
+            var mode = BlockCipherModes.EAX;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateTwofishCcm()
+        {
+            var engine = BlockCipherEngines.Twofish;
+            var mode = BlockCipherModes.CCM;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateTwofishEax()
+        {
+            var engine = BlockCipherEngines.Twofish;
+            var mode = BlockCipherModes.EAX;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateTwofishGcm()
+        {
+            var engine = BlockCipherEngines.Twofish;
+            var mode = BlockCipherModes.GCM;
+            var cryptoProvider = _cryptographyProviderFactory.CreateAeadCryptographyProvider(engine, mode);
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo($"{engine}/{mode}"));
+        }
+
+        [Test]
+        public void CanCreateLegacyRijndael()
+        {
+            var cryptoProvider = _cryptographyProviderFactory.CreateLegacyRijndaelCryptographyProvider();
+            Assert.That(cryptoProvider.CipherEngine, Is.EqualTo("Rijndael"));
+        }
+    }
+}
--- a/mRemoteNGTests/Security/EncryptedSecureStringTests.cs
+++ b/mRemoteNGTests/Security/EncryptedSecureStringTests.cs
@@ -0,0 +1,45 @@
+using mRemoteNG.Security;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Security
+{
+    [TestFixture()]
+    public class EncryptedSecureStringTests
+    {
+        private readonly string _clearTextData = "MySecureData";
+
+        [Test]
+        public void CanCreateEncryptedSecureString()
+        {
+            Assert.That(new EncryptedSecureString(), Is.InstanceOf<EncryptedSecureString>());
+        }
+
+        [Test]
+        public void CanAssignStringValue()
+        {
+            var encryptedSecString = new EncryptedSecureString();
+            TestDelegate testDelegate = () => encryptedSecString.SetValue(_clearTextData);
+            Assert.DoesNotThrow(testDelegate);
+        }
+
+        [Test]
+        public void EncryptedValueIsSameAsOriginalValue()
+        {
+            var encryptedSecString = new EncryptedSecureString();
+            encryptedSecString.SetValue(_clearTextData);
+            var decryptedData = encryptedSecString.GetClearTextValue();
+            Assert.That(decryptedData, Is.EqualTo(_clearTextData));
+        }
+
+        [Test]
+        public void CreatingMultipleEncryptedSecureStrings()
+        {
+            var encString1 = new EncryptedSecureString();
+            encString1.SetValue(_clearTextData);
+            var encString2 = new EncryptedSecureString();
+            encString2.SetValue("somevalue");
+            var decryptedString = encString1.GetClearTextValue();
+            Assert.That(decryptedString, Is.EqualTo(_clearTextData));
+        }
+    }
+}
--- a/mRemoteNGTests/Security/LegacyRijndaelCryptographyProviderTests.cs
+++ b/mRemoteNGTests/Security/LegacyRijndaelCryptographyProviderTests.cs
@@ -0,0 +1,59 @@
+using System.Security;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Security
+{
+    [TestFixture()]
+    public class LegacyRijndaelCryptographyProviderTests
+    {
+        private ICryptographyProvider _rijndaelCryptographyProvider;
+        private SecureString _encryptionKey;
+        private string _plainText;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _rijndaelCryptographyProvider = new LegacyRijndaelCryptographyProvider();
+            _encryptionKey = "mR3m".ConvertToSecureString();
+            _plainText = "MySecret!";
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _rijndaelCryptographyProvider = null;
+        }
+
+        [Test]
+        public void GetBlockSizeReturnsProperValueForRijndael()
+        {
+            Assert.That(_rijndaelCryptographyProvider.BlockSizeInBytes, Is.EqualTo(16));
+        }
+
+        [Test]
+        public void EncryptionOutputsBase64String()
+        {
+            var cipherText = _rijndaelCryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            Assert.That(cipherText.IsBase64String, Is.True);
+        }
+
+        [Test]
+        public void DecryptedTextIsEqualToOriginalPlainText()
+        {
+            var cipherText = _rijndaelCryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            var decryptedCipherText = _rijndaelCryptographyProvider.Decrypt(cipherText, _encryptionKey);
+            Assert.That(decryptedCipherText, Is.EqualTo(_plainText));
+        }
+
+        [Test]
+        public void EncryptingTheSameValueReturnsNewCipherTextEachTime()
+        {
+            var cipherText1 = _rijndaelCryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            var cipherText2 = _rijndaelCryptographyProvider.Encrypt(_plainText, _encryptionKey);
+            Assert.That(cipherText1, Is.Not.EqualTo(cipherText2));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Controls/CustomListViewTests.cs
+++ b/mRemoteNGTests/UI/Controls/CustomListViewTests.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using mRemoteNG.Controls;
+using NUnit.Framework;
+using NUnit.Extensions.Forms;
+using System.Windows.Forms;
+
+namespace mRemoteNGTests.UI.Controls
+{
+    public class CustomListViewTests
+    {
+        mRemoteNG.Controls.ListView _listView;
+
+        [SetUp]
+        public void Setup()
+        {
+            _listView = new mRemoteNG.Controls.ListView();
+            _listView.Name = "myTestListView";
+            _listView.View = System.Windows.Forms.View.Tile;
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _listView.Dispose();
+            while (_listView.Disposing) ;
+            _listView = null;
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Controls/TestForm.Designer.cs
+++ b/mRemoteNGTests/UI/Controls/TestForm.Designer.cs
@@ -0,0 +1,48 @@
+namespace mRemoteNGTests.UI.Controls
+{
+    partial class TestForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.SuspendLayout();
+            // 
+            // TestForm
+            // 
+            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";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+
+    }
+}
--- a/mRemoteNGTests/UI/Controls/TestForm.cs
+++ b/mRemoteNGTests/UI/Controls/TestForm.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace mRemoteNGTests.UI.Controls
+{
+    public partial class TestForm : Form
+    {
+        public TestForm()
+        {
+            InitializeComponent();
+        }
+
+        private void listView1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Controls/TestForm.resx
+++ b/mRemoteNGTests/UI/Controls/TestForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/mRemoteNGTests/UI/Forms/OptionsFormSetupAndTeardown.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsFormSetupAndTeardown.cs
@@ -0,0 +1,35 @@
+using mRemoteNG.App;
+using mRemoteNG.Messages;
+using mRemoteNG.UI.Window;
+using NUnit.Framework;
+using mRemoteNG.UI.Forms;
+using WeifenLuo.WinFormsUI.Docking;
+
+namespace mRemoteNGTests.UI.Forms
+{
+    public class OptionsFormSetupAndTeardown
+    {
+        protected frmOptions _optionsForm;
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            Runtime.MessageCollector = new MessageCollector(new ErrorAndInfoWindow(new DockContent()));
+        }
+
+        [SetUp]
+        public void Setup()
+        {
+            _optionsForm = new frmOptions();
+            _optionsForm.Show();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _optionsForm.Dispose();
+            while (_optionsForm.Disposing) ;
+            _optionsForm = null;
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsFormTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsFormTests.cs
@@ -0,0 +1,44 @@
+using mRemoteNG.App;
+using mRemoteNG.Controls;
+using mRemoteNG.Forms;
+using mRemoteNG.Messages;
+using mRemoteNG.UI.Window;
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+using System;
+using System.Threading;
+using WeifenLuo.WinFormsUI.Docking;
+
+namespace mRemoteNGTests.UI.Forms
+{
+    [TestFixture]
+    public class OptionsFormTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void ClickingCloseButtonClosesTheForm()
+        {
+            bool eventFired = false;
+            _optionsForm.FormClosed += (o, e) => eventFired = true;
+            ButtonTester cancelButton = new ButtonTester("CancelButtonControl", _optionsForm);
+            cancelButton.Click();
+            Assert.That(eventFired, Is.True);
+        }
+
+        [Test]
+        public void ClickingOKButtonClosesTheForm()
+        {
+            bool eventFired = false;
+            _optionsForm.FormClosed += (o, e) => eventFired = true;
+            ButtonTester cancelButton = new ButtonTester("OkButton", _optionsForm);
+            cancelButton.Click();
+            Assert.That(eventFired, Is.True);
+        }
+
+        [Test]
+        public void ListViewContainsOptionsPages()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items.Count, Is.EqualTo(8));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsAdvancedPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsAdvancedPageTests.cs
@@ -0,0 +1,34 @@
+using System;
+using NUnit.Framework;
+using mRemoteNGTests.UI.Forms;
+using NUnit.Extensions.Forms;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsAdvancedPageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void AdvancedPageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[7].Text, Does.Match("Advanced"));
+        }
+
+        [Test]
+        public void AdvancedIconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[7].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingAdvancedPageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("Advanced");
+            CheckBoxTester checkboxTester = new CheckBoxTester("chkWriteLogFile", _optionsForm);
+            Assert.That(checkboxTester.Text, Does.Match("Write log file"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsAppearancePageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsAppearancePageTests.cs
@@ -0,0 +1,34 @@
+using System;
+using NUnit.Framework;
+using mRemoteNGTests.UI.Forms;
+using NUnit.Extensions.Forms;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsAppearancePageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void AppearancePageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[1].Text, Does.Match("Appearance"));
+        }
+
+        [Test]
+        public void IconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[1].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingAppearancePageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("Appearance");
+            CheckBoxTester checkboxTester = new CheckBoxTester("chkShowSystemTrayIcon", _optionsForm);
+            Assert.That(checkboxTester.Text, Does.Match("show notification area icon"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsConnectionsPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsConnectionsPageTests.cs
@@ -0,0 +1,34 @@
+using System;
+using NUnit.Framework;
+using mRemoteNGTests.UI.Forms;
+using NUnit.Extensions.Forms;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsConnectionsPageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void ConnectionsPageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[3].Text, Does.Match("Connections"));
+        }
+
+        [Test]
+        public void ConnectionsIconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[3].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingConnectionsPageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("Connections");
+            CheckBoxTester checkboxTester = new CheckBoxTester("chkSingleClickOnConnectionOpensIt", _optionsForm);
+            Assert.That(checkboxTester.Text, Does.Match("Single click on connection"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsSQLPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsSQLPageTests.cs
@@ -0,0 +1,34 @@
+using System;
+using NUnit.Framework;
+using mRemoteNGTests.UI.Forms;
+using NUnit.Extensions.Forms;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsSQLPageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void SQLPageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[4].Text, Does.Match("SQL Server"));
+        }
+
+        [Test]
+        public void SQLIconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[4].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingSQLPageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("SQL Server");
+            CheckBoxTester checkboxTester = new CheckBoxTester("chkUseSQLServer", _optionsForm);
+            Assert.That(checkboxTester.Text, Does.Match("Use SQL"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsStartupExitPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsStartupExitPageTests.cs
@@ -0,0 +1,34 @@
+using System;
+using NUnit.Framework;
+using mRemoteNGTests.UI.Forms;
+using NUnit.Extensions.Forms;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsStartupExitPageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void StartupExitPageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[0].Text, Does.Match("Startup/Exit"));
+        }
+
+        [Test]
+        public void IconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[0].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingStartupExitPageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("Startup/Exit");
+            CheckBoxTester checkboxTester = new CheckBoxTester("chkSaveConsOnExit", _optionsForm);
+            Assert.That(checkboxTester.Text, Does.Match("Save connections"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsTabsPanelPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsTabsPanelPageTests.cs
@@ -0,0 +1,32 @@
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsTabsPanelPageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void TabsPanelPageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[2].Text, Does.Match("Tabs & Panels"));
+        }
+
+        [Test]
+        public void TabsPanelIconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[2].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingTabsPanelPageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("Tabs & Panels");
+            CheckBoxTester checkboxTester = new CheckBoxTester("chkAlwaysShowPanelTabs", _optionsForm);
+            Assert.That(checkboxTester.Text, Does.Match("Always show panel tabs"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsThemePageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsThemePageTests.cs
@@ -0,0 +1,34 @@
+using System;
+using NUnit.Framework;
+using mRemoteNGTests.UI.Forms;
+using NUnit.Extensions.Forms;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsThemePageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void ThemePageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[6].Text, Does.Match("Theme"));
+        }
+
+        [Test]
+        public void ThemeIconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[6].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingThemePageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("Theme");
+            ButtonTester buttonTester = new ButtonTester("btnThemeNew", _optionsForm);
+            Assert.That(buttonTester.Text, Does.Match("New"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/OptionsPages/OptionsUpdatesPageTests.cs
+++ b/mRemoteNGTests/UI/Forms/OptionsPages/OptionsUpdatesPageTests.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using NUnit.Extensions.Forms;
+
+namespace mRemoteNGTests.UI.Forms.OptionsPages
+{
+    [TestFixture]
+    public class OptionsUpdatesPageTests : OptionsFormSetupAndTeardown
+    {
+        [Test]
+        public void UpdatesPageLinkExistsInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[5].Text, Does.Match("Updates"));
+        }
+
+        [Test]
+        public void UpdatesIconShownInListView()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            Assert.That(listViewTester.Items[5].ImageList, Is.Not.Null);
+        }
+
+        [Test]
+        public void SelectingUpdatesPageLoadsSettings()
+        {
+            ListViewTester listViewTester = new ListViewTester("PageListView", _optionsForm);
+            listViewTester.Select("Updates");
+            CheckBoxTester checkboxTester = new CheckBoxTester("chkCheckForUpdatesOnStartup", _optionsForm);
+            Assert.That(checkboxTester.Text, Does.Match("Check for updates"));
+        }
+    }
+}
--- a/mRemoteNGTests/UI/Forms/PasswordFormTests.cs
+++ b/mRemoteNGTests/UI/Forms/PasswordFormTests.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using NUnit.Extensions.Forms;
+using System.Threading.Tasks;
+using mRemoteNG.Forms;
+using mRemoteNG.UI.Forms;
+
+namespace mRemoteNGTests.UI.Forms
+{
+    [TestFixture]
+    public class PasswordFormTests
+    {
+        PasswordForm _passwordForm;
+
+        [SetUp]
+        public void Setup()
+        {
+            _passwordForm = new PasswordForm();
+            _passwordForm.Show();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _passwordForm.Dispose();
+            while (_passwordForm.Disposing) ;
+            _passwordForm = null;
+        }
+
+        [Test]
+        public void PasswordFormText()
+        {
+            FormTester formTester = new FormTester("PasswordForm");
+            Assert.That(formTester.Text, Does.Match("Password"));
+        }
+
+        [Test]
+        public void ClickingCancelClosesPasswordForm()
+        {
+            bool eventFired = false;
+            _passwordForm.FormClosed += (o, e) => eventFired = true;
+            ButtonTester cancelButton = new ButtonTester("btnCancel", _passwordForm);
+            cancelButton.Click();
+            Assert.That(eventFired, Is.True);
+        }
+    }
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<Playlist Version="1.0"><Add Test="mRemoteNGTests.UI.WindowListTests.TestMethod1" /><Add Test="mRemoteNGTests.UI.WindowListTests.AddWindowToList" /><Add Test="mRemoteNGTests.UI.WindowListTests.CountReturnsCorrectNumber" /></Playlist>`