bump assembly version to 1.75.7012

closes #814

.github/CONTRIBUTING.md

@@ -0,0 +1,60 @@
+# Welcome!
+
+We are really glad you are interested in contributing to mRemoteNG!
+
+Open source software is best when shared with others. This also applies to the work that goes into the software. Your ideas and passion are what make this software great.
+
+
+### Ways you can contribute
+There are many ways that you can help improve mRemoteNG, even if you don't know how to program.
+
+For example, you might:
+- add documentation or "how-to" articles on the [Wiki](https://github.com/mRemoteNG/mRemoteNG/wiki)
+- answer support questions on the [forum](http://forum.mremoteng.org)
+- [add or improve a translation](https://github.com/mRemoteNG/mRemoteNG/wiki/How to Help Translating mRemoteNG)
+- submit a [pull request](https://github.com/mRemoteNG/mRemoteNG/pulls) for a [bug or feature ticket](https://github.com/mRemoteNG/mRemoteNG/issues)
+
+
+# Submitting GitHub Issues
+The GitHub Issue tracker is our preferred channel for bug reports and feature requests.
+- For questions or general discussion, please use [our public Gitter chat](https://gitter.im/mRemoteNG/PublicChat) or the [forum](http://forum.mremoteng.org).
+- If you find a security vulnerability, do **NOT** open an issue. Email support@mremoteng.org instead.
+
+### Bug reports
+A bug is any behavior that does not consistently produce the expected result.
+
+Guidelines for bug reports:
+1. Do not open bug reports for questions.
+1. Use the GitHub Issue search to make sure your bug hasn't already been reported.
+1. Include as much detailed information as possible. We've included a default template when opening an issue to make this easier.
+1. Please tag your your bug report with the [`Bug`](https://github.com/mRemoteNG/mRemoteNG/issues?q=is%3Aissue+is%3Aopen+label%3ABug) label.
+
+### Feature requests
+Feature requests are great! Take some time to compose a well thought out proposal. It's up to you to convince the project maintainers that your feature is a good idea. To ensure your request receives the consideration that it deserves, include as much detail as possible. For example:
+- What is the purpose of the new feature?
+- What situation led you to want this feature?
+- How does the application perform now and how would the new feature change this?
+- If applicable, consider including visual mock-ups to show us what you mean.
+- Please tag your feature request with the [`Feature Request`](https://github.com/mRemoteNG/mRemoteNG/issues?q=is%3Aissue+is%3Aopen+label%3A%22Feature+Request%22) label.
+
+# Pull requests
+Good pull requests are a huge help! If you haven't already, please consider reading [GitHub's guide to contributing to open source](https://guides.github.com/activities/contributing-to-open-source/)
+
+Our requests when it comes to pull requests:
+- Be clear about what your PR seeks to do.
+- Keep your PR focused. It should be clear what code changed to achieve your stated goal.
+- Add or update tests when possible. Some of the code base is still very hard to effectively test. If you can, please try to create or update tests that relate to your PR.
+- Please talk with one of the project maintainers before starting work on large pull requests. Otherwise, you run the risk of putting a lot of time into a feature or refactor that gets denied.
+- If you have access to Static Code Analysis tools (like ReSharper), please don't analyze/fix everything in one giant PR. As great as these tools are, they can sometimes cause unintended problems.
+
+# Code Style
+- Please make use of simple types and var where possible
+- Prefer "using" over .Dispose()
+- Avoid nesting "using"
+
+# Your first contributions
+Want to help but don't know where to start? Check out the issues that we've labeled with [`Help Wanted`](https://github.com/mRemoteNG/mRemoteNG/issues?q=is%3Aissue+is%3Aopen+label%3A%22Help+Wanted%22) or [`ready`](https://github.com/mRemoteNG/mRemoteNG/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20label%3A%22ready%22). These will vary in difficulty, but should be possible for new contributors.
+
+Want to help but don't know C#? Check out the issues that we've labeled with [`Documentation`](https://github.com/mRemoteNG/mRemoteNG/labels/Documentation).
+
+Sorry, we currently do not have any tags for truly beginner-friendly issues :(

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+<!--
+Only file GitHub issues for bugs and feature requests.  All other topics will be closed.
+
+Before opening an issue, please search for a duplicate or closed issue.
+Please provide as much detail as possible for us to fix your issue.
+-->
+
+<!-- Bug -->
+|||
+|--:|---|
+|Operating system | Windows 7 x64 |
+|mRemoteNG version| 1.75 aplha 3  |
+
+
+<!-- Feature Request -->
+<!-- If you file a feature request, please delete the bug section -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+<!--
+Please provide as much detail as possible with what your pull request does.
+Include a reference to a filed issue if it exists.
+-->

.gitignore

@@ -1,10 +1,291 @@
-Release
-mRemoteV1/bin
-mRemoteV1/obj
-mRemoteV1/publish
+**/bin/
+**/obj/
+**/[Rr]elease [Pp]ortable/
+**/[Dd]ebug [Pp]ortable/
+
 *.pfx
-*.suo
-*.vbproj.user
 Thumbs.db
-_ReSharper.*
+_Re[Ss]harper.*
+*.resharper
 *.resharper.user
+*.cache
+*~
+*.swp
+*.user*
+*.pidb
+*.gpState
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML
+*.orig
+*.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
+
+# gh-pages info
+runlocal.bat
+/_site

BUILD.CMD

@@ -1,32 +0,0 @@
-@echo off
-
-SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
-SET DEVENV="devenv.exe"
-SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
-SET RAR="%ProgramFiles%\WinRAR\Rar.exe"
-SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip"
-SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip"
-
-call %VCVARSALL% x86
-
-rmdir /s /q "%~dp0\mRemoteV1\bin"
-rmdir /s /q "%~dp0\mRemoteV1\obj"
-
-%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
-%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
-
-mkdir "%~dp0\Release"
-
-%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
-
-del /f /q %BINARYZIP%
-
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT"
-
-del /f /q %PORTABLEZIP%
-
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT"

CREDITS.TXT

@@ -1,9 +1,51 @@
 Contributors
 ============
 
-Felix Deimel
-Riley McArdle
+Current mRemoteNG dev team:
+David Sparer (github.com/sparerd)
+Sean Kaim (github.com/kmscode)
+
+Thanks for the awesome new website!
+Bennett Blodinger (github.com/benwa)
+
+Joe Cefoli (github.com/jcefoli)
+countchappy (github.com/countchappy)
+Tony Lambert
+Brandon Wulf (github.com/mrwulf)
+Pedro Rodrigues (github.com/pedro2555)
+github.com/dekelMP
+
+
+Past Contributors
+=================
+
+Felix Deimel - mRemote original developer
+Riley McArdle - mRemoteNG original developer
+
+Hayato Iriumi (github.com/hiriumi)
+Jason Barbier
+Wiktor Beryt
+Lionel Caignec
+Ruben d'Arco
+Holger Henke
+Tom Hiller
+Apisitt Rattana
+Andreas Rehm
 David Vidmar
+github.com/Brandhor
+github.com/Kvarkas
+
+
+Translators
+===========
+
+Eugenio "Ryo567" Mart<72>nez
+Mathieu Pape
+Emanuel Silva
+Robert Siwiec
+Hayato Iriumi
+Sebastien Thieury (github.com/SebThieu)
+Riza Emet
 
 
 Included Source Code
@@ -14,6 +56,22 @@ Copyright
 MIT License
 http://www.codeproject.com/KB/recipes/command_line.aspx
 
+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
 ===================
@@ -23,36 +81,18 @@ Copyright
 Copyright <20> 2008 Felix Deimel
 http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
 
-DiffieHellman 1.0
-Copyright <20> 2003 The Mentalis.org Team
-Modified New BSD License
-http://www.mentalis.org/
-
-DockPanel Suite 2.3.1
-Copyright <20> 2007 Weifen Luo
+DockPanel Suite 2.10.0
+Copyright <20> 2016 @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/
 
@@ -61,41 +101,22 @@ Copyright
 Freely redistributable with attribution
 http://www.dotnetmagic.com/magic_download.html
 
-Mentalis.org Security Library 1.0.13.715
-Copyright <20> 2002-2005 The Mentalis.org Team
-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.60
-Copyright <20> 1997-2007 Simon Tatham
+PuTTY 0.68
+Copyright <20> 1997-2017 Simon Tatham
 MIT License
 http://www.chiark.greenend.org.uk/~sgtatham/putty/
 
-SharpSSH 1.1.1.13
-Copyright <20> 2002-2008 Atsuhiko Yamanaka, JCraft, Inc.
-Copyright <20> 2007 Tamir Gal
-BSD Style License
-http://www.tamirgal.com/blog/page/SharpSSH.aspx
-
 Silk Icon Set
 Copyright <20> 2005-2008 FAMFAMFAM
 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
+SSH.NET v2016.0.0
+Copyright <20> 2016
+MIT License
+https://github.com/sshnet/SSH.NET
 
-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

Installer/mRemote.nsi

@@ -1,149 +0,0 @@
-!include "MUI.nsh"
-!include "WordFunc.nsh"
-!insertmacro VersionCompare
-
-!DEFINE PRODUCT_VERSION_MAJOR 1
-!DEFINE PRODUCT_VERSION_MINOR 63
-
-!DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
-!DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
-
-; Global Variables
-Var InstallDotNET
-
-; Basic Config
-Name "mRemoteNG ${PRODUCT_VERSION}"
-OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION}.exe"
-SetCompressor /SOLID lzma
-InstallDir "$PROGRAMFILES\mRemoteNG"
-InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
-RequestExecutionLevel admin
-
-; Version Information
-VIProductVersion ${PRODUCT_VERSION_LONG}
-!DEFINE LANG_ENGLISH "1033-English"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "mRemoteNG"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" ${PRODUCT_VERSION_LONG}
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright <20> 2007-2010 Felix Deimel, Riley McArdle"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "mRemoteNG ${PRODUCT_VERSION} Installer"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" ${PRODUCT_VERSION_LONG}
-
-; Design
-!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_Text "Launch mRemoteNG Now"
-!define MUI_FINISHPAGE_RUN "$INSTDIR\mRemoteNG.exe"
-!insertmacro MUI_PAGE_FINISH
-
-; Uninstall Pages
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-; Set Language
-!insertmacro MUI_LANGUAGE "English"
-
-Function .onInit
-	; Check .NET version
-	StrCpy $InstallDotNET "No"
-	Call GetDotNETVersion
-	Pop $0
-
-	${If} $0 == "not found"
-		StrCpy $InstallDotNET "Yes"
-	${EndIf}
-
-	StrCpy $0 $0 "" 1 # skip "v"
-
-	${VersionCompare} $0 "2.0" $1
-	${If} $1 == 2
-		StrCpy $InstallDotNET "Yes"
-	${EndIf}
-
-	${If} $InstallDotNET == "Yes"
-		MessageBox MB_OK|MB_ICONEXCLAMATION "mRemoteNG requires Microsoft .NET Framework 2.0."
-		Quit
-	${EndIf}
-FunctionEnd
-
-Section "" ; Install
-	SetOutPath $INSTDIR
-
-	; 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\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
-	; 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" "mRemoteNG"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 6464
-
-	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
-	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
-	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
-	RMDir "$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
-
-Function GetDotNETVersion
-	Push $0
-	Push $1
-
-	System::Call "mscoree::GetCORVersion(w .r0, i ${NSIS_MAX_STRLEN}, *i) i .r1"
-	StrCmp $1 "error" 0 +2
-	StrCpy $0 "not found"
-
-	Pop $1
-	Exch $0
-FunctionEnd

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>

InstallerProjects/CustomActions/CustomActions.cs

@@ -0,0 +1,56 @@
+using Microsoft.Deployment.WindowsInstaller;
+
+namespace CustomActions
+{
+    public class CustomActions
+    {
+        [CustomAction]
+        public static ActionResult IsMinimumRdpVersionInstalled(Session session)
+        {
+            var acceptedRdpKbVariables = new[] { session["RDP80_KB"], session["RDP81_KB"] };
+            var returnVariable = "MINIMUM_RDP_VERSION_INSTALLED";
+            var kbInstalledChecker = new KbInstalledChecker(session);
+            kbInstalledChecker.Execute(acceptedRdpKbVariables, returnVariable);
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult IsRdpDtlsUpdateInstalled(Session session)
+        {
+            var kb = session["RDP_DTLS_KB"];
+            var returnVar = "RDP_DTLS_UPDATE_INSTALLED";
+            var kbInstalledChecker = new KbInstalledChecker(session);
+            kbInstalledChecker.Execute(kb, returnVar);
+            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;
+        }
+    }
+}

InstallerProjects/CustomActions/CustomActions.csproj

@@ -0,0 +1,56 @@
+<?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>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5423D985-CB48-4344-B47F-E8C6D60C8B04}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <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|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Management" />
+    <Reference Include="Microsoft.Deployment.WindowsInstaller">
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CustomActions.cs" />
+    <Compile Include="KbInstalledChecker.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="InstalledWindowsUpdateChecker.cs" />
+    <Compile Include="UninstallNsisVersions.cs" />
+    <Content Include="CustomAction.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(WixCATargetsPath)" />
+</Project>

InstallerProjects/CustomActions/InstalledWindowsUpdateChecker.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Management;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace CustomActions
+{
+    public class InstalledWindowsUpdateChecker
+    {
+        private readonly ManagementScope _managementScope;
+
+        public InstalledWindowsUpdateChecker()
+        {
+            _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) => IsUpdateInstalled(new[] {kb});
+
+        public bool IsUpdateInstalled(IEnumerable<string> kbList)
+        {
+            var updateIsInstalled = false;
+            var whereClause = BuildWhereClauseFromKbList(kbList);
+            if (whereClause == "") return false;
+            var query = $"SELECT HotFixID FROM Win32_QuickFixEngineering WHERE {whereClause}";
+            var searcher = new ManagementObjectSearcher(_managementScope, new ObjectQuery(query));
+            if (searcher.Get().Count > 0)
+                updateIsInstalled = true;
+            return updateIsInstalled;
+        }
+
+        private string BuildWhereClauseFromKbList(IEnumerable<string> kbList)
+        {
+            var whereClause = "";
+            var counter = 0;
+            foreach (var kb in kbList)
+            {
+                if (counter > 0)
+                    whereClause += " OR ";
+                whereClause += $"HotFixID='{kb}'";
+                counter++;
+            }
+            return whereClause;
+        }
+    }
+}

InstallerProjects/CustomActions/KbInstalledChecker.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Deployment.WindowsInstaller;
+
+namespace CustomActions
+{
+    public class KbInstalledChecker
+    {
+        private readonly Session _session;
+        private readonly InstalledWindowsUpdateChecker _installedUpdateChecker;
+
+        public KbInstalledChecker(Session session)
+        {
+            _installedUpdateChecker = new InstalledWindowsUpdateChecker();
+            _session = session;
+        }
+
+        public bool Execute(string acceptedKb, string returnVar) => Execute(new[] {acceptedKb}, returnVar);
+
+        public bool Execute(IEnumerable<string> acceptedKbs, string returnVar)
+        {
+            try
+            {
+                _session.Log("Begin KbInstalledChecker");
+                var isUpdateInstalled = _installedUpdateChecker.IsUpdateInstalled(acceptedKbs);
+                SetReturnValue(isUpdateInstalled, returnVar);
+                _session.Log("End KbInstalledChecker");
+                return true;
+            }
+            catch (Exception e)
+            {
+                _session.Log($"There was an issue executing the KbInstalledChecker. Exception: {e}");
+                return false;
+            }
+        }
+
+        private void SetReturnValue(bool isUpdateInstalled, string returnVar)
+        {
+            var updateInstalledVal = isUpdateInstalled ? "1" : "0";
+            _session[returnVar] = updateInstalledVal;
+            _session.Log($"Set property '{returnVar}' to '{updateInstalledVal}'");
+        }
+    }
+}

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")]

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

InstallerProjects/Installer/CustomActions/CheckForInstalledWindowsUpdates.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="CheckIfMinimumRdpInstalled" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsMinimumRdpVersionInstalled" />
+  </Fragment>
+  <Fragment>
+    <CustomAction Id="CheckIfRdpDtlsUpdateInstalled" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsRdpDtlsUpdateInstalled" />
+  </Fragment>
+</Wix>

InstallerProjects/Installer/CustomActions/SaveInstallLocation.wxs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <!-- http://robmensching.com/blog/posts/2010/5/2/the-wix-toolsets-remember-property-pattern/ -->
+    <!-- This pattern allows a cmdline value to take precedence over values set from searchers (registry/file/etc) -->
+    
+    <!-- Save the INSTALLDIR value from the cmdline, if it was provided -->
+    <CustomAction Id="SaveCmdlineINSTALLDIR" Property="CMDLINE_INSTALLDIR" Value="[INSTALLDIR]" Execute="firstSequence" />
+
+    <!-- Set the INSTALLDIR value to the cmdline value, if one was provided -->
+    <CustomAction Id="SetFromCmdlineINSTALLDIR" Property="INSTALLDIR" Value="[CMDLINE_INSTALLDIR]" Execute="firstSequence" />
+
+
+    <InstallUISequence>
+      <Custom Action="SaveCmdlineINSTALLDIR" Before="AppSearch" />
+      <Custom Action="SetFromCmdlineINSTALLDIR" After="AppSearch">
+        CMDLINE_INSTALLDIR
+      </Custom>
+    </InstallUISequence>
+
+    <InstallExecuteSequence>
+      <Custom Action="SaveCmdlineINSTALLDIR" Before="AppSearch" />
+      <Custom Action="SetFromCmdlineINSTALLDIR" After="AppSearch">
+        CMDLINE_INSTALLDIR
+      </Custom>
+    </InstallExecuteSequence>
+    
+	</Fragment>
+</Wix>

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>

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>

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="INSTALLDIR" 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>

InstallerProjects/Installer/Fragments/MainExeFragment.wxs

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

InstallerProjects/Installer/Fragments/MiscTextFilesFragment.wxs

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <ComponentGroup Id="CG.ProjectInfoFiles" Directory="INSTALLDIR">
+      <Component Id="C.Changelog" Guid="*">
+        <File Id="ChangelogFile" Name="Changelog.txt" Source="$(var.SolutionDir)CHANGELOG.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>

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="INSTALLDIR">
+      <Component Id="C.PuttyNGFile" Guid="*">
+        <File Id="PuttyNGFile" Name="PuTTYNG.exe" Source="$(var.HarvestPath)\PuTTYNG.exe" KeyPath="yes" />
+      </Component>
+    </DirectoryRef>
+	</Fragment>
+</Wix>

InstallerProjects/Installer/Fragments/RegistryEntriesFragment.wxs

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <DirectoryRef Id="TARGETDIR">
+      <Component Id="C.RegistryEntries" Guid="*">
+        <RegistryKey Root="HKLM" Key="Software\mRemoteNG">
+          <RegistryValue Type="string" Name="InstallDir" Value="[INSTALLDIR]" KeyPath="yes" />
+        </RegistryKey>
+      </Component>
+    </DirectoryRef>
+	</Fragment>
+</Wix>

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="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="mRemoteNG.ico" />
+        <RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="DesktopShortcut" Type="integer" Value="1" KeyPath="yes" />
+      </Component>
+    </DirectoryRef>
+    
+    <DirectoryRef Id="ApplicationProgramsFolder">
+      <Component Id="C.ApplicationStartMenuShortcut" Guid="193B9E14-F40E-44F1-8514-BED253BCBF75">
+        <Shortcut Id="ApplicationStartMenuShortcut" Name="$(var.ProductName)" Target="[INSTALLDIR][MAINEXE]" WorkingDirectory="INSTALLDIR" Icon="mRemoteNG.ico" />
+        <Shortcut Id="CreditsShortcut" Name="Credits" Target="[INSTALLDIR]Credits.txt" WorkingDirectory="INSTALLDIR" />
+        <Shortcut Id="LicenseShortcut" Name="License" Target="[INSTALLDIR]License.txt" WorkingDirectory="INSTALLDIR" />
+        <Shortcut Id="ReadmeShortcut" Name="Readme" Target="[INSTALLDIR]Readme.txt" WorkingDirectory="INSTALLDIR" />
+        <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKCU" Key="Software\$(var.ProductName)" Name="ApplicationStartMenuShortcut" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+    
+	</Fragment>
+</Wix>

InstallerProjects/Installer/Includes/Config.wxi

@@ -0,0 +1,34 @@
+<?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 = "KB2830477" ?>
+  <?define MinimumRdpKb = $(var.Rdp80Kb) ?>
+  <?define RdpDtlsKb = "KB2574819" ?>
+  <?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>

InstallerProjects/Installer/Installer.wixproj

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>f0168b9f-6815-40df-ba53-46cee7683b68</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>mRemoteNG-Installer</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug Portable' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug Portable;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release Portable' ">
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release Portable;</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="CustomActions\CheckForInstalledWindowsUpdates.wxs" />
+    <Compile Include="CustomActions\SaveInstallLocation.wxs" />
+    <Compile Include="CustomActions\UninstallLegacyVersions.wxs" />
+    <Compile Include="Fragments\FilesFragment.wxs" />
+    <Compile Include="Fragments\DirectoriesFragment.wxs" />
+    <Compile Include="Fragments\MainExeFragment.wxs" />
+    <Compile Include="Fragments\MiscTextFilesFragment.wxs" />
+    <Compile Include="Fragments\PuTTYNGFragment.wxs" />
+    <Compile Include="Fragments\RegistryEntriesFragment.wxs" />
+    <Compile Include="Fragments\ShortcutFragment.wxs" />
+    <Compile Include="mRemoteNGV1.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Filters\Harvest_Filter.xslt" />
+    <Content Include="Includes\Config.wxi" />
+    <Content Include="Resources\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="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>
+    <PostBuildEvent>:: When passing paths to powershell scripts, check if the path ends with a backslash "\"
+:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.
+
+powershell -noprofile -command "sleep 2"
+set /p buildenv=&lt;buildenv.tmp
+set solutionDir=$(SolutionDir)\
+set targetDir=%25cd%25
+set psScriptsDir=$(SolutionDir)Tools
+set certPath=$(CertPath)
+set certPassword=$(CertPassword)
+
+:: Call the post build powershell script
+powershell.exe -ExecutionPolicy Bypass -File "%25psScriptsDir%25\postbuild_installer.ps1" -SolutionDir "%25solutionDir%25" -TargetDir "%25targetDir%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "%25certPath%25" -CertificatePassword "%25certPassword%25"</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>REM Clean the TargetDir
+rmdir /S /Q "$(TargetDir)"
+
+echo $(ConfigurationName) &gt; buildenv.tmp
+
+REM Harvest bin directory of the mRemoteV1 project
+"$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteV1\bin\$(Configuration)" -ag -nologo -dr INSTALLDIR -var var.HarvestPath -srd -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt"
+
+REM Convert the license file "COPYING.TXT" to "License.rtf" to be shown in the installer GUI
+"$(ProjectDir)Resources\Pandoc\pandoc.exe" -s -t rtf -o "$(ProjectDir)\Resources\License.rtf" "$(SolutionDir)COPYING.TXT"</PreBuildEvent>
+  </PropertyGroup>
+</Project>

InstallerProjects/Installer/Localizations/cs-CZ.wxl

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

InstallerProjects/Installer/Localizations/de-DE.wxl

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

InstallerProjects/Installer/Localizations/en-US.wxl

@@ -0,0 +1,27 @@
+<?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 either KB2592687 (RDP 8.0) or KB2830477 (RDP 8.1)</String>
+  <String Id="Install_RDPDtlsRequirement">mRemoteNG requires KB2574819 in order to create RDP connections. Windows 7 users will need to install this KB.</String>
+  <String Id="Install_Win7RequiresSP1">For mRemoteNG to run on Windows 7, it requires Service Pack 1 to be installed. Please install Service Pack 1 and try again.</String>
+  
+  <!-- Directories and File names -->
+  <String Id="Folders_Desktop">Desktop</String>
+  <String Id="File_Credits">Credits</String>
+  <String Id="File_License">License</String>
+  <String Id="File_VersionHistory">Version History</String>
+  
+  <!-- Features and install options -->
+  <String Id="Feature_Complete">Complete</String>
+  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
+  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
+  
+  <!-- GUI Page Text -->
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
+  
+</WixLocalization>

InstallerProjects/Installer/Localizations/ja-JP.wxl

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

InstallerProjects/Installer/Localizations/ru-RU.wxl

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

InstallerProjects/Installer/Resources/Pandoc/COPYING.rtf

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

InstallerProjects/Installer/Resources/Pandoc/COPYRIGHT.txt

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

InstallerProjects/Installer/mRemoteNGV1.wxs

@@ -0,0 +1,105 @@
+<?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="MsiLogging" Value="v" />
+    <Property Id="ARPPRODUCTICON" Value="mRemoteNG.ico" />
+    <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize" />
+    <Property Id="MAINEXE" Value="$(var.ExeProcessName)" />
+    <Property Id="INSTALLDIR">
+      <RegistrySearch Id='mRemoteNGRegistry' Type='raw' Root='HKLM' Key='Software\mRemoteNG' Name='InstallDir' />
+    </Property>
+    <Property Id='RDP_DTLS_KB' Value='$(var.RdpDtlsKb)' />
+    <Property Id='RDP_DTLS_UPDATE_INSTALLED' Value='0' Secure='yes' />
+    <Property Id='RDP80_KB' Value='$(var.Rdp80Kb)' />
+    <Property Id='RDP81_KB' Value='$(var.Rdp81Kb)' />
+    <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" />
+    <CustomActionRef Id='SaveCmdlineINSTALLDIR' />
+
+
+    <InstallUISequence>
+      <Custom Action="CheckIfRdpDtlsUpdateInstalled" After="AppSearch">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
+      <Custom Action="CheckIfMinimumRdpInstalled" After="CheckIfRdpDtlsUpdateInstalled">(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>
+
+    <InstallExecuteSequence>
+      <Custom Action="CheckIfRdpDtlsUpdateInstalled" After="AppSearch">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
+      <Custom Action="CheckIfMinimumRdpInstalled" After="CheckIfRdpDtlsUpdateInstalled">(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>
+    </InstallExecuteSequence>
+    
+    
+    <!-- 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 DTLS update (KB2574819) -->
+    <Condition Message="!(loc.Install_RDPDtlsRequirement)">
+      <![CDATA[Installed OR (IGNOREPREREQUISITES = 1) OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND (RDP_DTLS_UPDATE_INSTALLED = 1))]]>
+    </Condition>
+    <!-- If Win7, require RDP 8.0 (KB2592687) or 8.1 (KB2830477) update  -->
+    <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="INSTALLDIR" Level="1">
+        <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
+        <ComponentRef Id="C.MainExe" Primary="yes" />
+        <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
+        <ComponentRef Id="C.RegistryEntries" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.PuttyNG" Title="PuTTYNG" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.PuttyNGFile" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.DesktopShortcut" Title="!(loc.Feature_DesktopShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.DesktopShortcut" Primary="yes" />
+      </Feature>
+
+      <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
+        <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
+      </Feature>
+    </Feature>
+
+    
+    <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>

Jenkinsfile

@@ -0,0 +1,23 @@
+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 scm
+
+	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\""
+}

Jenkinsfile_publish.groovy

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

README.MD

@@ -0,0 +1,47 @@
+# Welcome to the mRemoteNG project!
+
+[![Twitter Follow](https://img.shields.io/twitter/follow/mRemoteNG.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=mRemoteNG)
+[![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat)
+[![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer)
+
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)
+
+[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG)
+
+| Update Channel | Build Status | Downloads |
+| ---------------|--------------|-----------|
+| Stable | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/master)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/master/) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75Hotfix7/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75Hotfix7) |
+| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75Hotfix7/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75Hotfix7) |
+| Development | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/develop/) | - |
+
+
+
+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 (Teletype Network)
+ * HTTP/S (Hypertext Transfer Protocol Secure)
+ * Rlogin (Remote Login)
+ * 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 connect successfully to a Windows 2003 host (for example).
+
+
+
+[![Developed with ReSharper](https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/.github/icon_ReSharper.png)](https://www.jetbrains.com/resharper/)

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).

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

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

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

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

Tools/copy_puttyng.ps1

@@ -0,0 +1,15 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+Write-Output "Copying PUTTYNG to correct directory"
+Copy-Item -Path (Join-Path -Path $SolutionDir -ChildPath "mRemoteV1\Resources\PuTTYNG.exe") -Destination $TargetDir -Force
+
+Write-Output ""

Tools/copy_release_installer.ps1

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

Tools/create_upg_chk_files.ps1

@@ -0,0 +1,109 @@
+#Requires -Version 4.0
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TagName,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    [ValidateSet("Stable","Beta","Development")]
+    $UpdateChannel
+)
+
+
+
+function New-MsiUpdateFileContent {
+    param (
+        [System.IO.FileInfo]
+        [Parameter(Mandatory=$true)]
+        $MsiFile,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        $TagName
+    )
+    
+    $version = $MsiFile.BaseName -replace "[a-zA-Z-]*"
+    $certThumbprint = (Get-AuthenticodeSignature -FilePath $MsiFile).SignerCertificate.Thumbprint
+    $hash = Get-FileHash -Algorithm SHA512 $MsiFile | % { $_.Hash }
+
+    $fileContents = `
+"Version: $version
+dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$TagName/$($MsiFile.Name)
+clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.TXT
+CertificateThumbprint: $certThumbprint
+Checksum: $hash"
+    Write-Output $fileContents
+}
+
+
+function New-ZipUpdateFileContent {
+    param (
+        [System.IO.FileInfo]
+        [Parameter(Mandatory=$true)]
+        $ZipFile,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        $TagName
+    )
+    
+    $version = $ZipFile.BaseName -replace "[a-zA-Z-]*"
+    $hash = Get-FileHash -Algorithm SHA512 $ZipFile | % { $_.Hash }
+
+    $fileContents = `
+"Version: $version
+dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$TagName/$($ZipFile.Name)
+clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.TXT
+Checksum: $hash"
+    Write-Output $fileContents
+}
+
+
+function Resolve-UpdateCheckFileName {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        [ValidateSet("Stable","Beta","Development")]
+        $UpdateChannel,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        [ValidateSet("Normal","Portable")]
+        $Type
+    )
+
+    $fileName = ""
+
+    if ($UpdateChannel -eq "Beta") { $fileName += "beta-" }
+    elseif ($UpdateChannel -eq "Development") { $fileName += "dev-" }
+
+    $fileName += "update"
+
+    if ($Type -eq "Portable") { $fileName += "-portable" }
+
+    $fileName += ".txt"
+
+    Write-Output $fileName
+}
+
+
+
+
+
+$releaseFolder = Join-Path -Path $PSScriptRoot -ChildPath "..\Release" -Resolve
+
+# build msi update file
+$msiFile = Get-ChildItem -Path "$releaseFolder\*.msi" | sort LastWriteTime | select -last 1
+$msiUpdateContents = New-MsiUpdateFileContent -MsiFile $msiFile -TagName $TagName
+$msiUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Normal
+Write-Output "`n`nMSI Update Check File Contents ($msiUpdateFileName)`n------------------------------"
+Tee-Object -InputObject $msiUpdateContents -FilePath "$releaseFolder\$msiUpdateFileName"
+
+
+# build zip update file
+$zipFile = Get-ChildItem -Path "$releaseFolder\*.zip" | sort LastWriteTime | select -last 1
+$zipUpdateContents = New-ZipUpdateFileContent -ZipFile $zipFile -TagName $TagName
+$zipUpdateFileName = Resolve-UpdateCheckFileName -UpdateChannel $UpdateChannel -Type Portable
+Write-Output "`n`nZip Update Check File Contents ($zipUpdateFileName)`n------------------------------"
+Tee-Object -InputObject $zipUpdateContents -FilePath "$releaseFolder\$zipUpdateFileName"

Tools/github_functions.ps1

@@ -0,0 +1,220 @@
+$githubUrl = 'https://api.github.com'
+
+
+function Publish-GitHubRelease {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Owner,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Repository,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $ReleaseTitle,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $TagName,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # Either the SHA of the commit to target or the branch name.
+        $TargetCommitish,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Description,
+
+        [bool]
+        [Parameter(Mandatory=$true)]
+        #
+        $IsDraft,
+
+        [bool]
+        [Parameter(Mandatory=$true)]
+        #
+        $IsPrerelease,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken
+    )
+
+    $body = New-GitHubReleaseRequestBody -TagName $TagName -TargetCommitish $TargetCommitish -ReleaseTitle $ReleaseTitle -Description $Description -IsDraft $IsDraft -IsPrerelease $IsPrerelease
+    $req_publishRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases" -Method Post -Headers @{"Authorization"="token $AuthToken"} -Body $body -ErrorAction Stop
+    $response_publishRelease = ConvertFrom-Json -InputObject $req_publishRelease.Content
+
+    Write-Output $response_publishRelease
+}
+
+
+function Edit-GitHubRelease {
+    param (
+        [string]
+        #[Parameter(Mandatory=$true)]
+        #
+        $Owner,
+
+        [string]
+        #[Parameter(Mandatory=$true)]
+        #
+        $Repository,
+
+        [string]
+        #[Parameter(Mandatory=$true)]
+        #
+        $ReleaseId,
+
+        [string]
+        #
+        $ReleaseTitle,
+
+        [string]
+        #
+        $TagName,
+
+        [string]
+        # Either the SHA of the commit to target or the branch name.
+        $TargetCommitish,
+
+        [string]
+        #
+        $Description,
+
+        [bool]
+        #
+        $IsDraft,
+
+        [bool]
+        #
+        $IsPrerelease,
+
+        [string]
+        #[Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken
+    )
+
+    $body_params = @{
+        "TagName" = $TagName
+        "TargetCommitish" = $TargetCommitish
+        "ReleaseTitle" = $ReleaseTitle
+        "Description" = $Description
+    }
+    if ($PSBoundParameters.ContainsKey("IsDraft")) { $body_params.Add("IsDraft", $IsDraft) }
+    if ($PSBoundParameters.ContainsKey("IsPrerelease")) { $body_params.Add("IsPrerelease", $IsPrerelease) }
+
+    $body = New-GitHubReleaseRequestBody @body_params
+    $req_editRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases/$ReleaseId" -Method Post -Headers @{"Authorization"="token $AuthToken"} -Body $body -ErrorAction Stop
+    $response_editRelease = ConvertFrom-Json -InputObject $req_editRelease.Content
+
+    Write-Output $response_editRelease
+}
+
+
+function Get-GitHubRelease {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Owner,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $Repository,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        #
+        $ReleaseId,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken
+    )
+
+    $req_getRelease = Invoke-WebRequest -Uri "$githubUrl/repos/$Owner/$Repository/releases/$ReleaseId" -Method Get -Headers @{"Authorization"="token $AuthToken"} -ErrorAction Stop
+    $response_getRelease = ConvertFrom-Json -InputObject $req_getRelease.Content
+
+    Write-Output $response_getRelease
+}
+
+
+function Upload-GitHubReleaseAsset {
+    param (
+        [string]
+        [Parameter(Mandatory=$true)]
+        $UploadUri,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # Path to the file to upload with the release
+        $FilePath,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # Content type of the file
+        $ContentType,
+
+        [string]
+        [Parameter(Mandatory=$true)]
+        # The OAuth2 token to use for authentication.
+        $AuthToken
+    )
+
+    $UploadUri = $UploadUri -replace "(\{[\w,\?]*\})$"
+    $file = Get-Item -Path $FilePath
+
+    $req_uploadZipAsset = Invoke-WebRequest -Uri "$($UploadUri)?name=$($file.Name)" -Method Post -Headers @{"Authorization"="token $AuthToken"} -ContentType $ContentType -InFile $file.FullName -ErrorAction Stop
+}
+
+
+function New-GitHubReleaseRequestBody {
+    param (
+        [string]
+        # 
+        $TagName,
+
+        [string]
+        # Either the SHA of the commit to target or the branch name.
+        $TargetCommitish,
+
+        [string]
+        # Title of the release
+        $ReleaseTitle,
+
+        [string]
+        # Description of the release
+        $Description,
+
+        [bool]
+        # Is this a draft?
+        $IsDraft,
+
+        [bool]
+        # Is this a pre-release?
+        $IsPrerelease
+    )
+
+    $body_params = [ordered]@{}
+    if ($TagName -ne "")         { $body_params.Add("tag_name", $TagName) }
+    if ($TargetCommitish -ne "") { $body_params.Add("target_commitish", $TargetCommitish) }
+    if ($ReleaseTitle -ne "")    { $body_params.Add("name", $ReleaseTitle) }
+    if ($Description -ne "")     { $body_params.Add("body", $Description) }
+    if ($PSBoundParameters.ContainsKey("IsDraft"))         { $body_params.Add("draft", $IsDraft) }
+    if ($PSBoundParameters.ContainsKey("IsPrerelease"))    { $body_params.Add("prerelease", $IsPrerelease) }
+
+    $json_body = ConvertTo-Json -InputObject $body_params -Compress
+    Write-Output $json_body
+}

Tools/move_help_files.ps1

@@ -0,0 +1,23 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+$path_HelpFilesDir = Join-Path -Path $TargetDir -ChildPath "Help"
+
+Write-Output "Moving Help files to correct directory"
+
+# Remove stale Help files, if they exist
+if (Test-Path -Path $path_HelpFilesDir) {
+    Remove-Item -Path $path_HelpFilesDir -Recurse -Force
+}
+
+# Move Help files
+Move-Item -Path (Join-Path -Path $TargetDir -ChildPath "Resources\Help") -Destination $path_HelpFilesDir -Force
+Start-Sleep -Seconds 2
+Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "Resources") -Recurse -Force
+
+Write-Output ""

Tools/old/BUILD.CMD

@@ -0,0 +1,149 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+set VERSIONTAG=
+
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+set DEVENV="devenv.exe"
+set MAKENSIS="%ProgramFiles(x86)%\NSIS\Unicode\makensis.exe"
+set RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+set SIGNCMD=signtool.exe sign /n "Astrospark Technologies, LLC" /sha1 "1cbd910dbd6e77f26506e7f600736972f700673f" /tr http://timestamp.comodoca.com/rfc3161
+
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%ProgramFiles(x86)%\Sigcheck\sigcheck.exe"
+
+call %VCVARSALL% x86
+
+rmdir /s /q "%~dp0\mRemoteV1\bin" > nul 2>&1
+rmdir /s /q "%~dp0\mRemoteV1\obj" > nul 2>&1
+
+if exist "%~dp0\mRemoteV1\bin" goto ERROR_RMDIR
+if exist "%~dp0\mRemoteV1\obj" goto ERROR_RMDIR
+goto NOERROR_RMDIR
+
+:ERROR_RMDIR
+echo.
+echo Could not clean output directories.
+echo.
+echo Build process failed.
+echo.
+goto END
+
+:NOERROR_RMDIR
+
+echo Building release version...
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
+
+echo Building portable version...
+%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
+
+echo Signing binaries...
+%SIGNCMD% ^
+	"%~dp0\mRemoteV1\bin\Release\de\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\el\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\en-US\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\es\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\es-AR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\fr\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\hu\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\it\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\nb-NO\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\nl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pt\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pt-BR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\ru\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\uk\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\zh-CN\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\zh-TW\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\AxInterop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.ShDocVw.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\de\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\el\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\en-US\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\es\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\es-AR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\fr\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\hu\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\it\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\nb-NO\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\nl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pt\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pt-BR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\ru\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\uk\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\zh-CN\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\zh-TW\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\mRemoteNG.exe" ^
+
+
+rem Do not remove the two blank lines above this line.
+
+mkdir "%~dp0\Release" > nul 2>&1
+
+echo Getting product version...
+set VERSIONNSH="%~dp0\Release\Version.nsh"
+set SIGCHECK=!SIGCHECK:"=^"!
+set SIGCHECK=!SIGCHECK: =^^ !
+set SIGCHECK=!SIGCHECK:(=^^(!
+set SIGCHECK=!SIGCHECK:)=^^)!
+for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   echo ^^!define PRODUCT_VERSION "%%i.%%j.%%k.%%l" > %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_SHORT "%%i.%%j" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MAJOR "%%i" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MINOR "%%j" >> %VERSIONNSH%
+)
+echo Version is %PRODUCT_VERSION_SHORT%
+
+echo Creating installer package...
+if defined VERSIONTAG (
+	%MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% "%~dp0\Installer\mRemote.nsi"
+
+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.exe"
+	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
+	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
+) else (
+	%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
+
+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%.exe"
+	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%.zip"
+	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%.zip"
+)
+
+del %VERSIONNSH%
+
+echo Signing installer package...
+%SIGNCMD% %INSTALLEREXE%
+
+echo Creating release ZIP file...
+del /f /q %BINARYZIP% > nul 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %BINARYZIP% "%~dp0\*.TXT"
+
+echo Creating portable ZIP file...
+del /f /q %PORTABLEZIP% > nul 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %PORTABLEZIP% "%~dp0\*.TXT"
+
+echo.
+echo Build process complete.
+echo.
+
+:END
+pause

Tools/old/Sort Language Files.cmd

@@ -0,0 +1,26 @@
+@echo off
+
+set TEMP_FOLDER="%TEMP%\Translations.tmp"
+set SORTRESX="%~dp0\Tools\SortRESX.exe"
+
+echo.
+echo This script sorts the language files
+echo.
+
+choice /m "Would you like to continue?"
+
+echo.
+
+rmdir /s /q %TEMP_FOLDER%
+mkdir %TEMP_FOLDER%
+copy "%~dp0\mRemoteV1\Language\*.resx" %TEMP_FOLDER%
+
+pushd %TEMP_FOLDER%
+for %%f in (*) do %SORTRESX% %TEMP_FOLDER%\%%f "%~dp0\mRemoteV1\Language\%%f"
+popd
+
+rmdir /s /q %TEMP_FOLDER%
+
+echo Done.
+echo.
+pause

Tools/old/Update Languages.cmd

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

Tools/postbuild_installer.ps1

@@ -0,0 +1,43 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetFileName,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $ConfigurationName,
+
+    [string]
+    $CertificatePath,
+
+    [string]
+    $CertificatePassword,
+
+    [string[]]
+    $ExcludeFromSigning
+)
+
+Write-Output "+=================================================================+"
+Write-Output "|             Beginning mRemoteNG Installer Post Build            |"
+Write-Output "+=================================================================+"
+Format-Table -AutoSize -Wrap -InputObject @{
+    "SolutionDir" = $SolutionDir
+    "TargetDir" = $TargetDir
+    "TargetFileName" = $TargetFileName
+    "ConfigurationName" = $ConfigurationName
+    "ExcludeFromSigning" = $ExcludeFromSigning
+}
+
+
+& "$PSScriptRoot\sign_binaries.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath
+& "$PSScriptRoot\rename_installer_with_version.ps1" -SolutionDir $SolutionDir
+& "$PSScriptRoot\copy_release_installer.ps1" -SourcePath $TargetDir -DestinationDir (Join-Path -Path $SolutionDir -ChildPath "Release")

Tools/postbuild_mremotev1.ps1

@@ -0,0 +1,47 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetFileName,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $ConfigurationName,
+
+    [string]
+    $CertificatePath,
+
+    [string]
+    $CertificatePassword,
+
+    [string[]]
+    $ExcludeFromSigning
+)
+
+Write-Output "+=================================================================+"
+Write-Output "|                  Beginning mRemoteV1 Post Build                 |"
+Write-Output "+=================================================================+"
+Format-Table -AutoSize -Wrap -InputObject @{
+    "SolutionDir" = $SolutionDir
+    "TargetDir" = $TargetDir
+    "TargetFileName" = $TargetFileName
+    "ConfigurationName" = $ConfigurationName
+    "ExcludeFromSigning" = $ExcludeFromSigning
+}
+
+
+
+& "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
+& "$PSScriptRoot\move_help_files.ps1" -TargetDir $TargetDir
+& "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
+& "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\sign_binaries.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
+& "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/publish_draft_github_release.ps1

@@ -0,0 +1,25 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $Owner,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $Repository,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $ReleaseId,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    # The OAuth2 token to use for authentication.
+    $AuthToken
+)
+
+. "$PSScriptRoot\github_functions.ps1"
+
+Edit-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseId $ReleaseId -AuthToken $AuthToken -IsDraft $false

Tools/publish_to_github.ps1

@@ -0,0 +1,76 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $Owner,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $Repository,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $ReleaseTitle,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $TagName,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    # Either the SHA of the commit to target or the branch name.
+    $TargetCommitish,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #
+    $Description,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    [ValidateSet("true","false")]
+    # true/false
+    $IsDraft,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    [ValidateSet("true","false")]
+    # true/false
+    $IsPrerelease,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    # Path to the zip file to upload with the release
+    $ZipFilePath,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    #Path to the msi file to upload with the release
+    $MsiFilePath,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    # The OAuth2 token to use for authentication.
+    $AuthToken,
+
+    [switch]
+    # Enable this switch to treat $Description as a Base64 encoded string. It will be decoded before being used elsewhere in the script.
+    $DescriptionIsBase64Encoded
+)
+
+
+if ($DescriptionIsBase64Encoded) {
+    $Description = ([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($Description)))
+}
+
+
+. "$PSScriptRoot\github_functions.ps1"
+
+
+$release = Publish-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseTitle $ReleaseTitle -TagName $TagName -TargetCommitish $TargetCommitish -Description $Description -IsDraft ([bool]::Parse($IsDraft)) -IsPrerelease ([bool]::Parse($IsPrerelease)) -AuthToken $AuthToken
+$zipUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $ZipFilePath -ContentType "application/zip" -AuthToken $AuthToken
+$msiUpload = Upload-GitHubReleaseAsset -UploadUri $release.upload_url -FilePath $MsiFilePath -ContentType "application/octet-stream" -AuthToken $AuthToken
+Write-Output (Get-GitHubRelease -Owner $Owner -Repository $Repository -ReleaseId $release.id -AuthToken $AuthToken)

Tools/rename_installer_with_version.ps1

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

Tools/set_LargeAddressAware.ps1

@@ -0,0 +1,43 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetFileName
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+# Find editbin.exe
+#Resolve-Path tends to be faster, but since editbin's are all over the place it's not 100% effective
+$editBinPath = @((Resolve-Path -Path "C:\Program Files*\Microsoft Visual Studio*\VC\bin\editbin.exe").Path)
+
+if(!$editBinPath)
+{
+	# This should work on all VS versions, but doesn't on our Jenkin's build for some reason...
+	# This is needed VC Community
+	$editBinPath =  @((gci -Path "C:\Program*\Microsoft Visual Studio\" -Filter editbin.exe -Recurse)[0].FullName)
+}
+
+# if we STILL can't find it, just return. Same end result NUnit test will fail.
+if(!$editBinPath)
+{
+	echo "Could not find editbin.exe - Can't set LargeAddressAware"
+	return
+}
+
+echo "editBinPath value:"
+echo $editBinPath
+# Verify editbin certificate
+& "$PSScriptRoot\validate_microsoft_tool.ps1" -FullPath "$editBinPath"
+
+
+$outputExe = Join-Path -Path $TargetDir -ChildPath $TargetFileName
+
+# Set LargeAddressAware
+Write-Output "Setting LargeAddressAware on binary file `"$outputExe`""
+& $editBinPath "/largeaddressaware" "$outputExe"
+
+Write-Output ""

Tools/sign_binaries.ps1

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

Tools/tidy_files_for_release.ps1

@@ -0,0 +1,33 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $ConfigurationName
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+# Remove unnecessary files from Release versions
+if ($ConfigurationName -match "Release") {
+    Write-Output "Removing unnecessary files from Release versions"
+    Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
+    $filesToDelete = Get-ChildItem -Path $TargetDir -Recurse -Include @(
+        "*.pdb",
+        "*.publish",
+        "*.xml",
+        "*.backup",
+        "*.log",
+        "*vshost*",
+        "*.tmp"
+    )
+    Remove-Item -Path $filesToDelete.FullName
+    Write-Output $filesToDelete.FullName
+}
+else {
+    Write-Output "We will not remove anything - this is not a release build."
+}
+
+Write-Output ""

Tools/validate_microsoft_tool.ps1

@@ -0,0 +1,17 @@
+# $FullPath Full path to the Microsoft executable to validate
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $FullPath
+)
+
+$validMSCertThumbprints = @("3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC", "108E2BA23632620C427C570B6D9DB51AC31387FE", "98ED99A67886D020C564923B7DF25E9AC019DF26", "5EAD300DC7E4D637948ECB0ED829A072BD152E17")
+$exeSignature = Get-AuthenticodeSignature -FilePath $FullPath
+$baseErrorMsg = "Could not validate the certificate of $FullPath. "
+
+if ($exeSignature.Status -ne "Valid") {
+    Write-Error -Message ($baseErrorMsg+"The signature was invalid.") -ErrorAction Stop
+}
+elseif ($validMSCertThumbprints -notcontains $exeSignature.SignerCertificate.Thumbprint) {
+    Write-Error -Message ($baseErrorMsg+"The certificate thumbprint ($($exeSignature.SignerCertificate.Thumbprint)) is not trusted.") -ErrorAction Stop
+}

Tools/verify_binary_signatures.ps1

@@ -0,0 +1,47 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $ConfigurationName,
+    
+    [string]
+    # The code signing certificate to use when signing the files.
+    $CertificatePath
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+
+#  validate release versions and if the certificate is available
+if ($ConfigurationName -match "Release") {
+	
+		if ($CertificatePath -eq "" -or !(Test-Path -Path $CertificatePath -PathType Leaf))
+		{
+	    Write-Output "Certificate is not present - files likely not signed - we won't verify file signatures."
+	    return
+		}
+		
+    Write-Output "Verifying signature of binaries"
+    Write-Output "Getting files from path: $TargetDir"
+    $signableFiles = Get-ChildItem -Path $TargetDir -Recurse | ?{$_.Extension -match "dll|exe|msi"}
+    Write-Output "Signable files count: $($signableFiles.Count)"
+    $badSignatureFound = $false
+    foreach ($file in $signableFiles) {
+        $signature = Get-AuthenticodeSignature -FilePath $file.FullName
+        if ($signature.Status -ne "Valid") {
+            Write-Warning "File $($file.FullName) does not have a valid signature."
+            $badSignatureFound = $true
+        }
+    }
+    if ($badSignatureFound) {
+        Write-Output "One or more files were improperly signed."
+    } else {
+        Write-Output "All files have valid signatures."
+    }
+} else {
+    Write-Output "This is not a release build - we won't verify file signatures."
+}
+
+Write-Output ""

Tools/zip_portable_files.ps1

@@ -0,0 +1,28 @@
+param (
+    [string]
+    [Parameter(Mandatory=$true)]
+    $SolutionDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $TargetDir,
+
+    [string]
+    [Parameter(Mandatory=$true)]
+    $ConfigurationName
+)
+
+Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
+$path_packageZipScript = Join-Path -Path $SolutionDir -ChildPath "Tools\build-relport.cmd"
+
+
+# Package Zip
+if ($ConfigurationName -match "Release" -and $ConfigurationName -match "Portable") {
+    Write-Output "Packaging Release Portable ZIP"
+    & $path_packageZipScript
+}
+else {
+    Write-Output "We will not zip anything - this isnt a portable release build."
+}
+
+Write-Output ""

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>

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));
+        }
+    }
+}

mRemoteNGTests/App/UpdaterTests.cs

@@ -0,0 +1,84 @@
+using System;
+using mRemoteNG.App.Info;
+using mRemoteNG.App.Update;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.App
+{
+    [TestFixture]
+    public class UpdaterTests
+    {
+        [Test]
+        public void UpdateStableChannel()
+        {
+            GeneralAppInfo.ApplicationVersion = "1.0.0.0";
+            var CurrentUpdateInfo = UpdateInfo.FromString(Resources.update);
+            Assert.That(CurrentUpdateInfo.CheckIfValid(), Is.True);
+            Version v;
+            Version.TryParse(GeneralAppInfo.ApplicationVersion, out v);
+            var IsNewer = CurrentUpdateInfo.Version > v;
+            Assert.That(IsNewer, Is.True);
+        }
+
+        [Test]
+        public void UpdateBetaChannel()
+        {
+            GeneralAppInfo.ApplicationVersion = "1.0.0.0";
+            var CurrentUpdateInfo = UpdateInfo.FromString(Resources.beta_update);
+            Assert.That(CurrentUpdateInfo.CheckIfValid(), Is.True);
+            Version v;
+            Version.TryParse(GeneralAppInfo.ApplicationVersion, out v);
+            var IsNewer = CurrentUpdateInfo.Version > v;
+            Assert.That(IsNewer, Is.True);
+        }
+
+        [Test]
+        public void UpdateDevChannel()
+        {
+            GeneralAppInfo.ApplicationVersion = "1.0.0.0";
+            var CurrentUpdateInfo = UpdateInfo.FromString(Resources.dev_update);
+            Assert.That(CurrentUpdateInfo.CheckIfValid(), Is.True);
+            Version v;
+            Version.TryParse(GeneralAppInfo.ApplicationVersion, out v);
+            var IsNewer = CurrentUpdateInfo.Version > v;
+            Assert.That(IsNewer, Is.True);
+        }
+
+        [Test]
+        public void UpdateStablePortableChannel()
+        {
+            GeneralAppInfo.ApplicationVersion = "1.0.0.0";
+            var CurrentUpdateInfo = UpdateInfo.FromString(Resources.update_portable);
+            Assert.That(CurrentUpdateInfo.CheckIfValid(), Is.True);
+            Version v;
+            Version.TryParse(GeneralAppInfo.ApplicationVersion, out v);
+            var IsNewer = CurrentUpdateInfo.Version > v;
+            Assert.That(IsNewer, Is.True);
+        }
+
+        [Test]
+        public void UpdateBetaPortableChannel()
+        {
+            GeneralAppInfo.ApplicationVersion = "1.0.0.0";
+            var CurrentUpdateInfo = UpdateInfo.FromString(Resources.beta_update_portable);
+            Assert.That(CurrentUpdateInfo.CheckIfValid(), Is.True);
+            Version v;
+            Version.TryParse(GeneralAppInfo.ApplicationVersion, out v);
+            var IsNewer = CurrentUpdateInfo.Version > v;
+            Assert.That(IsNewer, Is.True);
+        }
+
+        [Test]
+        public void UpdateDevPortableChannel()
+        {
+            GeneralAppInfo.ApplicationVersion = "1.0.0.0";
+            var CurrentUpdateInfo = UpdateInfo.FromString(Resources.dev_update_portable);
+            Assert.That(CurrentUpdateInfo.CheckIfValid(), Is.True);
+            Version v;
+            Version.TryParse(GeneralAppInfo.ApplicationVersion, out v);
+            var IsNewer = CurrentUpdateInfo.Version > v;
+            Assert.That(IsNewer, Is.True);
+        }
+    }
+}

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

mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs

@@ -0,0 +1,55 @@
+using System.Data;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class DataTableDeserializerTests
+    {
+        private DataTableDeserializer _deserializer;
+
+        [SetUp]
+        public void Setup()
+        {
+            
+        }
+
+
+        [Test]
+        public void WeCanDeserializeATree()
+        {
+            var model = CreateConnectionTreeModel();
+            var dataTable = CreateDataTable(model.RootNodes[0]);
+            _deserializer = new DataTableDeserializer(dataTable);
+            var output = _deserializer.Deserialize();
+            Assert.That(output.GetRecursiveChildList().Count(), Is.EqualTo(model.GetRecursiveChildList().Count()));
+        }
+
+        [Test]
+        public void WeCanDeserializeASingleEntry()
+        {
+            var dataTable = CreateDataTable(new ConnectionInfo());
+            _deserializer = new DataTableDeserializer(dataTable);
+            var output = _deserializer.Deserialize();
+            Assert.That(output.GetRecursiveChildList().Count(), Is.EqualTo(1));
+        }
+
+
+        private DataTable CreateDataTable(ConnectionInfo tableContent)
+        {
+            var serializer = new DataTableSerializer(new SaveFilter());
+            return serializer.Serialize(tableContent);
+        }
+
+        private ConnectionTreeModel CreateConnectionTreeModel()
+        {
+            var builder = new ConnectionTreeModelBuilder();
+            return builder.Build();
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs

@@ -0,0 +1,128 @@
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using mRemoteNGTests.TestHelpers;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class DataTableSerializerTests
+    {
+        private DataTableSerializer _dataTableSerializer;
+        private SaveFilter _saveFilter;
+
+        [SetUp]
+        public void Setup()
+        {
+            _saveFilter = new SaveFilter();
+            _dataTableSerializer = new DataTableSerializer(_saveFilter);
+        }
+
+        [Test]
+        public void AllItemsSerialized()
+        {
+            var model = CreateConnectionTreeModel();
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows.Count, Is.EqualTo(3));
+        }
+
+        [Test]
+        public void ReturnsEmptyDataTableWhenGivenEmptyConnectionTreeModel()
+        {
+            var model = new ConnectionTreeModel();
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows.Count, Is.EqualTo(0));
+        }
+
+        [Test]
+        public void UsernameSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveUsername = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Username"], Is.Not.EqualTo(""));
+        }
+
+        [Test]
+        public void DomainSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveDomain = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["DomainName"], Is.Not.EqualTo(""));
+        }
+
+        [Test]
+        public void PasswordSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SavePassword = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Password"], Is.Not.EqualTo(""));
+        }
+
+        [Test]
+        public void InheritanceSerializedWhenSaveSecurityAllowsIt()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveInheritance = true;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["InheritUsername"], Is.Not.EqualTo(""));
+        }
+
+
+
+        [Test]
+        public void UsernameNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveUsername = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Username"], Is.EqualTo(""));
+        }
+
+        [Test]
+        public void DomainNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveDomain = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["DomainName"], Is.EqualTo(""));
+        }
+
+        [Test]
+        public void PasswordNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SavePassword = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["Password"], Is.EqualTo(""));
+        }
+
+        [Test]
+        public void InheritanceNotSerializedWhenSaveSecurityDisabled()
+        {
+            var model = CreateConnectionTreeModel();
+            _saveFilter.SaveInheritance = false;
+            var dataTable = _dataTableSerializer.Serialize(model);
+            Assert.That(dataTable.Rows[0]["InheritUsername"], Is.False);
+        }
+
+        [Test]
+        public void CanSerializeEmptyConnectionInfo()
+        {
+            var dataTable = _dataTableSerializer.Serialize(new ConnectionInfo());
+            Assert.That(dataTable.Rows.Count, Is.EqualTo(1));
+        }
+
+
+        private ConnectionTreeModel CreateConnectionTreeModel()
+        {
+            var builder = new ConnectionTreeModelBuilder();
+            return builder.Build();
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/PortScanDeserializerTests.cs

@@ -0,0 +1,61 @@
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Tools;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class PortScanDeserializerTests
+    {
+        private PortScanDeserializer _deserializer;
+        private ConnectionInfo _importedConnectionInfo;
+        private const string ExpectedHostName = "server1.domain.com";
+        private const string ExpectedDisplayName = "server1";
+        private const ProtocolType ExpectedProtocolType = ProtocolType.SSH2;
+
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            var host = new ScanHost("10.20.30.40")
+            {
+                HostName = "server1.domain.com",
+                SSH = true
+            };
+            _deserializer = new PortScanDeserializer(new [] {host}, ProtocolType.SSH2);
+            _deserializer.Deserialize();
+            var connectionTreeModel = _deserializer.Deserialize();
+            var root = connectionTreeModel.RootNodes.First();
+            _importedConnectionInfo = root.Children.First();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+            _importedConnectionInfo = null;
+        }
+
+        [Test]
+        public void DisplayNameImported()
+        {
+            Assert.That(_importedConnectionInfo.Name, Is.EqualTo(ExpectedDisplayName));
+        }
+
+        [Test]
+        public void HostNameImported()
+        {
+            Assert.That(_importedConnectionInfo.Hostname, Is.EqualTo(ExpectedHostName));
+        }
+
+        [Test]
+        public void ProtocolImported()
+        {
+            Assert.That(_importedConnectionInfo.Protocol, Is.EqualTo(ExpectedProtocolType));
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/PuttyConnectionManagerDeserializerTests.cs

@@ -0,0 +1,112 @@
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Container;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class PuttyConnectionManagerDeserializerTests
+    {
+        private PuttyConnectionManagerDeserializer _deserializer;
+        private ContainerInfo _rootImportedFolder;
+        private const string ExpectedRootFolderName = "test_puttyConnectionManager_database";
+        private const string ExpectedConnectionDisplayName = "my ssh connection";
+        private const string ExpectedConnectionHostname = "server1.mydomain.com";
+        private const string ExpectedConnectionDescription = "My Description Here";
+        private const int ExpectedConnectionPort = 22;
+        private const ProtocolType ExpectedProtocolType = ProtocolType.SSH2;
+        private const string ExpectedPuttySession = "MyCustomPuttySession";
+        private const string ExpectedConnectionUsername = "mysshusername";
+        private const string ExpectedConnectionPassword = "password123";
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            var fileContents = Resources.test_puttyConnectionManager_database;
+            _deserializer = new PuttyConnectionManagerDeserializer(fileContents);
+            var connectionTreeModel = _deserializer.Deserialize();
+            var rootNode = connectionTreeModel.RootNodes.First();
+            _rootImportedFolder = rootNode.Children.Cast<ContainerInfo>().First();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+            _rootImportedFolder = null;
+        }
+
+        [Test]
+        public void RootFolderImportedWithCorrectName()
+        {
+            Assert.That(_rootImportedFolder.Name, Is.EqualTo(ExpectedRootFolderName));
+        }
+
+        [Test]
+        public void ConnectionDisplayNameImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Name, Is.EqualTo(ExpectedConnectionDisplayName));
+        }
+
+        [Test]
+        public void ConnectionHostNameImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Hostname, Is.EqualTo(ExpectedConnectionHostname));
+        }
+
+        [Test]
+        public void ConnectionDescriptionImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Description, Is.EqualTo(ExpectedConnectionDescription));
+        }
+
+        [Test]
+        public void ConnectionPortImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Port, Is.EqualTo(ExpectedConnectionPort));
+        }
+
+        [Test]
+        public void ConnectionProtocolTypeImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Protocol, Is.EqualTo(ExpectedProtocolType));
+        }
+
+        [Test]
+        public void ConnectionPuttySessionImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.PuttySession, Is.EqualTo(ExpectedPuttySession));
+        }
+
+        [Test]
+        public void ConnectionUsernameImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Username, Is.EqualTo(ExpectedConnectionUsername));
+        }
+
+        [Test]
+        public void ConnectionPasswordImported()
+        {
+            var connection = GetSshConnection();
+            Assert.That(connection.Password, Is.EqualTo(ExpectedConnectionPassword));
+        }
+
+        private ConnectionInfo GetSshConnection()
+        {
+            var sshFolder = _rootImportedFolder.Children.OfType<ContainerInfo>().First(node => node.Name == "SSHFolder");
+            return sshFolder.Children.First();
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionDeserializerTests.cs

@@ -0,0 +1,185 @@
+using System;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Tree;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class RemoteDesktopConnectionDeserializerTests
+    {
+        // .rdp file schema: https://technet.microsoft.com/en-us/library/ff393699(v=ws.10).aspx
+        private string[] _connectionFileContents;
+        private RemoteDesktopConnectionDeserializer _deserializer;
+        private ConnectionTreeModel _connectionTreeModel;
+        private const string ExpectedHostname = "testhostname.domain.com";
+        private const string ExpectedUserName = "myusernamehere";
+        private const string ExpectedDomain = "myspecialdomain";
+        private const string ExpectedGatewayHostname = "gatewayhostname.domain.com";
+        private const int ExpectedPort = 9933;
+        private const ProtocolRDP.RDPColors ExpectedColors = ProtocolRDP.RDPColors.Colors24Bit;
+        private const bool ExpectedBitmapCaching = false;
+        private const ProtocolRDP.RDPResolutions ExpectedResolutionMode = ProtocolRDP.RDPResolutions.FitToWindow;
+        private const bool ExpectedWallpaperDisplay = true;
+        private const bool ExpectedThemesDisplay = true;
+        private const bool ExpectedFontSmoothing = true;
+        private const bool ExpectedDesktopComposition = true;
+        private const bool ExpectedSmartcardRedirection = true;
+        private const bool ExpectedDriveRedirection = true;
+        private const bool ExpectedPortRedirection = true;
+        private const bool ExpectedPrinterRedirection = true;
+        private const ProtocolRDP.RDPSounds ExpectedSoundRedirection = ProtocolRDP.RDPSounds.BringToThisComputer;
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            _connectionFileContents = Resources.test_remotedesktopconnection_rdp.Split(Environment.NewLine.ToCharArray());
+            _deserializer = new RemoteDesktopConnectionDeserializer(_connectionFileContents);
+            _connectionTreeModel = _deserializer.Deserialize();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+        }
+
+        [Test]
+        public void ConnectionTreeModelHasARootNode()
+        {
+            var numberOfRootNodes = _connectionTreeModel.RootNodes.Count;
+            Assert.That(numberOfRootNodes, Is.GreaterThan(0));
+        }
+
+        [Test]
+        public void RootNodeHasConnectionInfo()
+        {
+            var rootNodeContents = _connectionTreeModel.RootNodes.First().Children.OfType<ConnectionInfo>();
+            Assert.That(rootNodeContents, Is.Not.Empty);
+        }
+
+        [Test]
+        public void HostnameImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Hostname, Is.EqualTo(ExpectedHostname));
+        }
+
+        [Test]
+        public void PortImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Port, Is.EqualTo(ExpectedPort));
+        }
+
+        [Test]
+        public void UsernameImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Username, Is.EqualTo(ExpectedUserName));
+        }
+
+        [Test]
+        public void DomainImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Domain, Is.EqualTo(ExpectedDomain));
+        }
+
+        [Test]
+        public void RdpColorsImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Colors, Is.EqualTo(ExpectedColors));
+        }
+
+        [Test]
+        public void BitmapCachingImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.CacheBitmaps, Is.EqualTo(ExpectedBitmapCaching));
+        }
+
+        [Test]
+        public void ResolutionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.Resolution, Is.EqualTo(ExpectedResolutionMode));
+        }
+
+        [Test]
+        public void DisplayWallpaperImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.DisplayWallpaper, Is.EqualTo(ExpectedWallpaperDisplay));
+        }
+
+        [Test]
+        public void DisplayThemesImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.DisplayThemes, Is.EqualTo(ExpectedThemesDisplay));
+        }
+
+        [Test]
+        public void FontSmoothingImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.EnableFontSmoothing, Is.EqualTo(ExpectedFontSmoothing));
+        }
+
+        [Test]
+        public void DesktopCompositionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.EnableDesktopComposition, Is.EqualTo(ExpectedDesktopComposition));
+        }
+
+        [Test]
+        public void SmartcardRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectSmartCards, Is.EqualTo(ExpectedSmartcardRedirection));
+        }
+
+        [Test]
+        public void DriveRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectDiskDrives, Is.EqualTo(ExpectedDriveRedirection));
+        }
+
+        [Test]
+        public void PortRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectPorts, Is.EqualTo(ExpectedPortRedirection));
+        }
+
+        [Test]
+        public void PrinterRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectPrinters, Is.EqualTo(ExpectedPrinterRedirection));
+        }
+
+        [Test]
+        public void SoundRedirectionImportedCorrectly()
+        {
+            var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+            Assert.That(connectionInfo.RedirectSound, Is.EqualTo(ExpectedSoundRedirection));
+        }
+
+        //[Test]
+        //public void GatewayHostnameImportedCorrectly()
+        //{
+        //    var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First();
+        //    Assert.That(connectionInfo.RDGatewayHostname, Is.EqualTo(_expectedGatewayHostname));
+        //}
+    }
+}

mRemoteNGTests/Config/Serializers/RemoteDesktopConnectionManagerDeserializerTests.cs

@@ -0,0 +1,335 @@
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Container;
+using mRemoteNG.Tree;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+using System.IO;
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class RemoteDesktopConnectionManagerDeserializerTests
+    {
+        private string _connectionFileContents;
+        private RemoteDesktopConnectionManagerDeserializer _deserializer;
+        private ConnectionTreeModel _connectionTreeModel;
+        private const string ExpectedName = "server1_displayname";
+        private const string ExpectedHostname = "server1";
+        private const string ExpectedDescription = "Comment text here";
+        private const string ExpectedUsername = "myusername1";
+        private const string ExpectedDomain = "mydomain";
+        private const string ExpectedPassword = "passwordHere!";
+        private const bool ExpectedUseConsoleSession = true;
+        private const int ExpectedPort = 9933;
+        private const ProtocolRDP.RDGatewayUsageMethod ExpectedGatewayUsageMethod = ProtocolRDP.RDGatewayUsageMethod.Always;
+        private const string ExpectedGatewayHostname = "gatewayserverhost.innerdomain.net";
+        private const string ExpectedGatewayUsername = "gatewayusername";
+        private const string ExpectedGatewayDomain = "innerdomain";
+        private const string ExpectedGatewayPassword = "gatewayPassword123";
+        private const ProtocolRDP.RDPResolutions ExpectedRdpResolution = ProtocolRDP.RDPResolutions.FitToWindow;
+        private const ProtocolRDP.RDPColors ExpectedRdpColorDepth = ProtocolRDP.RDPColors.Colors24Bit;
+        private const ProtocolRDP.RDPSounds ExpectedAudioRedirection = ProtocolRDP.RDPSounds.DoNotPlay;
+        private const bool ExpectedKeyRedirection = true;
+        private const bool ExpectedSmartcardRedirection = true;
+        private const bool ExpectedDriveRedirection = true;
+        private const bool ExpectedPortRedirection = true;
+        private const bool ExpectedPrinterRedirection = true;
+        private const ProtocolRDP.AuthenticationLevel ExpectedAuthLevel = ProtocolRDP.AuthenticationLevel.AuthRequired;
+
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            _connectionFileContents = Resources.test_rdcman_v2_2_schema1;
+            _deserializer = new RemoteDesktopConnectionManagerDeserializer(_connectionFileContents);
+            _connectionTreeModel = _deserializer.Deserialize();
+        }
+
+        [OneTimeTearDown]
+        public void OnetimeTeardown()
+        {
+            _deserializer = null;
+        }
+
+        [Test]
+        public void ConnectionTreeModelHasARootNode()
+        {
+            var numberOfRootNodes = _connectionTreeModel.RootNodes.Count;
+            Assert.That(numberOfRootNodes, Is.GreaterThan(0));
+        }
+
+        [Test]
+        public void RootNodeHasContents()
+        {
+            var rootNodeContents = _connectionTreeModel.RootNodes.First().Children;
+            Assert.That(rootNodeContents, Is.Not.Empty);
+        }
+
+        [Test]
+        public void AllSubRootFoldersImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var rootNodeContents = importedRdcmanRootNode.Children.Count(node => node.Name == "Group1" || node.Name == "Group2");
+            Assert.That(rootNodeContents, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void ConnectionDisplayNameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Name, Is.EqualTo(ExpectedName));
+        }
+
+        [Test]
+        public void ConnectionHostnameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Hostname, Is.EqualTo(ExpectedHostname));
+        }
+
+        [Test]
+        public void ConnectionDescriptionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Description, Is.EqualTo(ExpectedDescription));
+        }
+
+        [Test]
+        public void ConnectionUsernameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Username, Is.EqualTo(ExpectedUsername));
+        }
+
+        [Test]
+        public void ConnectionDomainImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Domain, Is.EqualTo(ExpectedDomain));
+        }
+
+        // Since password is encrypted with a machine key, cant test decryption on another machine
+        //[Test]
+        //public void ConnectionPasswordImported()
+        //{
+        //    var rootNode = _connectionTreeModel.RootNodes.First();
+        //    var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+        //    var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+        //    var connection = group1.Children.First();
+        //    Assert.That(connection.Password, Is.EqualTo(ExpectedPassword));
+        //}
+
+        [Test]
+        public void ConnectionProtocolSetToRdp()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Protocol, Is.EqualTo(ProtocolType.RDP));
+        }
+
+        [Test]
+        public void ConnectionUseConsoleSessionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.UseConsoleSession, Is.EqualTo(ExpectedUseConsoleSession));
+        }
+
+        [Test]
+        public void ConnectionPortImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Port, Is.EqualTo(ExpectedPort));
+        }
+
+        [Test]
+        public void ConnectionGatewayUsageMethodImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayUsageMethod, Is.EqualTo(ExpectedGatewayUsageMethod));
+        }
+
+        [Test]
+        public void ConnectionGatewayHostnameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayHostname, Is.EqualTo(ExpectedGatewayHostname));
+        }
+
+        [Test]
+        public void ConnectionGatewayUsernameImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayUsername, Is.EqualTo(ExpectedGatewayUsername));
+        }
+
+        // Since password is encrypted with a machine key, cant test decryption on another machine
+        //[Test]
+        //public void ConnectionGatewayPasswordImported()
+        //{
+        //    var rootNode = _connectionTreeModel.RootNodes.First();
+        //    var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+        //    var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+        //    var connection = group1.Children.First();
+        //    Assert.That(connection.RDGatewayPassword, Is.EqualTo(ExpectedGatewayPassword));
+        //}
+
+        [Test]
+        public void ConnectionGatewayDomainImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDGatewayDomain, Is.EqualTo(ExpectedGatewayDomain));
+        }
+
+        [Test]
+        public void ConnectionResolutionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Resolution, Is.EqualTo(ExpectedRdpResolution));
+        }
+
+        [Test]
+        public void ConnectionColorDepthImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.Colors, Is.EqualTo(ExpectedRdpColorDepth));
+        }
+
+        [Test]
+        public void ConnectionAudioRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectSound, Is.EqualTo(ExpectedAudioRedirection));
+        }
+
+        [Test]
+        public void ConnectionKeyRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectKeys, Is.EqualTo(ExpectedKeyRedirection));
+        }
+
+        [Test]
+        public void ConnectionDriveRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectDiskDrives, Is.EqualTo(ExpectedDriveRedirection));
+        }
+
+        [Test]
+        public void ConnectionPortRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectPorts, Is.EqualTo(ExpectedPortRedirection));
+        }
+
+        [Test]
+        public void ConnectionPrinterRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectPrinters, Is.EqualTo(ExpectedPrinterRedirection));
+        }
+
+        [Test]
+        public void ConnectionSmartcardRedirectionImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RedirectSmartCards, Is.EqualTo(ExpectedSmartcardRedirection));
+        }
+
+        [Test]
+        public void ConnectionauthenticationLevelImported()
+        {
+            var rootNode = _connectionTreeModel.RootNodes.First();
+            var importedRdcmanRootNode = rootNode.Children.OfType<ContainerInfo>().First();
+            var group1 = importedRdcmanRootNode.Children.OfType<ContainerInfo>().First(node => node.Name == "Group1");
+            var connection = group1.Children.First();
+            Assert.That(connection.RDPAuthenticationLevel, Is.EqualTo(ExpectedAuthLevel));
+        }
+
+        [Test]
+        public void ExceptionThrownOnBadSchemaVersion()
+        {
+            var badFileContents = Resources.test_rdcman_v2_2_badschemaversion;
+            var deserializer = new RemoteDesktopConnectionManagerDeserializer(badFileContents);
+            Assert.That(() => deserializer.Deserialize(), Throws.TypeOf<FileFormatException>());
+        }
+
+        [Test]
+        public void ExceptionThrownOnUnsupportedVersion()
+        {
+            var badFileContents = Resources.test_rdcman_badVersionNumber;
+            var deserializer = new RemoteDesktopConnectionManagerDeserializer(badFileContents);
+            Assert.That(() => deserializer.Deserialize(), Throws.TypeOf<FileFormatException>());
+        }
+
+        [Test]
+        public void ExceptionThrownOnNoVersion()
+        {
+            var badFileContents = Resources.test_rdcman_noversion;
+            var deserializer = new RemoteDesktopConnectionManagerDeserializer(badFileContents);
+            Assert.That(() => deserializer.Deserialize(), Throws.TypeOf<FileFormatException>());
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializerTests.cs

@@ -0,0 +1,254 @@
+using System.Collections;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionNodeSerializerTests
+    {
+        private XmlConnectionNodeSerializer _connectionNodeSerializer;
+        private ICryptographyProvider _cryptographyProvider;
+
+        [SetUp]
+        public void Setup()
+        {
+            _cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(
+                BlockCipherEngines.AES, BlockCipherModes.GCM);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, "myPassword1".ConvertToSecureString(), new SaveFilter());
+        }
+
+        [Test]
+        public void ReturnsXElement()
+        {
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(new ConnectionInfo());
+            Assert.That(returnVal, Is.TypeOf<XElement>());
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.AttributesAndExpectedValues))]
+        public void XmlElementContainsSerializedAttribute(string attributeName, string expectedValue, ConnectionInfo connectionInfo)
+        {
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.EqualTo(expectedValue));
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.PasswordAttributes))]
+        public void PasswordFieldsAreSerialized(string attributeName, ConnectionInfo connectionInfo)
+        {
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.Not.Empty);
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.SaveFilterTests))]
+        public void AttributesNotSerializedWhenFiltered(string attributeName, ConnectionInfo connectionInfo)
+        {
+            var saveFilter = new SaveFilter(true);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, "myPassword1".ConvertToSecureString(), saveFilter);
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.EqualTo(string.Empty));
+        }
+
+        [TestCaseSource(typeof(TestCaseDataSource), nameof(TestCaseDataSource.InheritanceFilterTests))]
+        public void InheritanceNotSerialiedWhenFiltered(string attributeName, ConnectionInfo connectionInfo)
+        {
+            var saveFilter = new SaveFilter(true);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, "myPassword1".ConvertToSecureString(), saveFilter);
+            var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
+            var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
+            Assert.That(targetAttribute?.Value, Is.EqualTo(false.ToString()));
+        }
+
+        private class TestCaseDataSource
+        {
+            private static readonly ConnectionInfo ConnectionInfo = new ConnectionInfo
+            {
+                Name = "HeresACustomName",
+                Description = "myDescription",
+                Username = "myuser",
+                Domain = "superdomain",
+                Password = "pass",
+                Hostname = "somehost",
+                ExtApp = "myextapp",
+                PreExtApp = "preext1",
+                PostExtApp = "postext1",
+                MacAddress = "asdf-asdf-asdf-asdf23423",
+                LoadBalanceInfo = "loadbalanceinfohere",
+                RDGatewayUsername = "gatewayuser",
+                RDGatewayDomain = "somegatewaydomain",
+                RDGatewayHostname = "somegatewayhost",
+                RDGatewayPassword = "gatewaypass",
+                UserField = "userfield data here",
+                VNCProxyIP = "192.168.1.1",
+                VNCProxyUsername = "vncproxyuser",
+                VNCProxyPassword = "vncproxypass",
+            };
+
+            private static readonly ConnectionInfo ConnectionInfoWithInheritance = new ConnectionInfo
+            {
+                Inheritance = {EverythingInherited = true}
+            };
+
+            private static readonly ContainerInfo ContainerInfo = new ContainerInfo();
+
+            public static IEnumerable SaveFilterTests
+            {
+                get
+                {
+                    yield return new TestCaseData("Username", ConnectionInfo);
+                    yield return new TestCaseData("Domain", ConnectionInfo);
+                    yield return new TestCaseData("Password", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUsername", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayDomain", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayPassword", ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyUsername", ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyPassword", ConnectionInfo);
+                }
+            }
+
+            public static IEnumerable InheritanceFilterTests
+            {
+                get
+                {
+                    yield return new TestCaseData("InheritUsername", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritDomain", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritPassword", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritRDGatewayUsername", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritRDGatewayDomain", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritRDGatewayPassword", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritVNCProxyUsername", ConnectionInfoWithInheritance);
+                    yield return new TestCaseData("InheritVNCProxyPassword", ConnectionInfoWithInheritance);
+                }
+            }
+
+            public static IEnumerable PasswordAttributes
+            {
+                get
+                {
+                    yield return new TestCaseData("Password", ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyPassword", ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayPassword", ConnectionInfo);
+                }
+            }
+
+            public static IEnumerable AttributesAndExpectedValues
+            {
+                get
+                {
+                    yield return new TestCaseData("Name", ConnectionInfo.Name, ConnectionInfo);
+                    yield return new TestCaseData("Type", "Connection", ConnectionInfo);
+                    yield return new TestCaseData("Type", "Container", ContainerInfo);
+                    yield return new TestCaseData("Expanded", ContainerInfo.IsExpanded.ToString(), ContainerInfo);
+                    yield return new TestCaseData("Descr", ConnectionInfo.Description, ConnectionInfo);
+                    yield return new TestCaseData("Icon", ConnectionInfo.Icon, ConnectionInfo);
+                    yield return new TestCaseData("Panel", "General", ConnectionInfo);
+                    yield return new TestCaseData("Username", ConnectionInfo.Username, ConnectionInfo);
+                    yield return new TestCaseData("Domain", ConnectionInfo.Domain, ConnectionInfo);
+                    yield return new TestCaseData("Hostname", ConnectionInfo.Hostname, ConnectionInfo);
+                    yield return new TestCaseData("Protocol", "RDP", ConnectionInfo);
+                    yield return new TestCaseData("PuttySession", ConnectionInfo.PuttySession, ConnectionInfo);
+                    yield return new TestCaseData("Port", ConnectionInfo.Port.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("ConnectToConsole", ConnectionInfo.UseConsoleSession.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("UseCredSsp", ConnectionInfo.UseCredSsp.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RenderingEngine", ConnectionInfo.RenderingEngine.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("ICAEncryptionStrength", ConnectionInfo.ICAEncryptionStrength.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDPAuthenticationLevel", ConnectionInfo.RDPAuthenticationLevel.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("LoadBalanceInfo", ConnectionInfo.LoadBalanceInfo, ConnectionInfo);
+                    yield return new TestCaseData("Colors", ConnectionInfo.Colors.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("Resolution", ConnectionInfo.Resolution.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("AutomaticResize", ConnectionInfo.AutomaticResize.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("DisplayWallpaper", ConnectionInfo.DisplayWallpaper.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("DisplayThemes", ConnectionInfo.DisplayThemes.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("EnableFontSmoothing", ConnectionInfo.EnableFontSmoothing.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("EnableDesktopComposition", ConnectionInfo.EnableDesktopComposition.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("CacheBitmaps", ConnectionInfo.CacheBitmaps.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectDiskDrives", ConnectionInfo.RedirectDiskDrives.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectPorts", ConnectionInfo.RedirectPorts.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectPrinters", ConnectionInfo.RedirectPrinters.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectSmartCards", ConnectionInfo.RedirectSmartCards.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectSound", ConnectionInfo.RedirectSound.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RedirectKeys", ConnectionInfo.RedirectKeys.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("Connected", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("PreExtApp", ConnectionInfo.PreExtApp, ConnectionInfo);
+                    yield return new TestCaseData("PostExtApp", ConnectionInfo.PostExtApp, ConnectionInfo);
+                    yield return new TestCaseData("MacAddress", ConnectionInfo.MacAddress, ConnectionInfo);
+                    yield return new TestCaseData("UserField", ConnectionInfo.UserField, ConnectionInfo);
+                    yield return new TestCaseData("ExtApp", ConnectionInfo.ExtApp, ConnectionInfo);
+                    yield return new TestCaseData("VNCCompression", ConnectionInfo.VNCCompression.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCEncoding", ConnectionInfo.VNCEncoding.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCAuthMode", ConnectionInfo.VNCAuthMode.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyType", ConnectionInfo.VNCProxyType.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyIP", ConnectionInfo.VNCProxyIP, ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyPort", ConnectionInfo.VNCProxyPort.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCProxyUsername", ConnectionInfo.VNCProxyUsername, ConnectionInfo);
+                    yield return new TestCaseData("VNCColors", ConnectionInfo.VNCColors.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCSmartSizeMode", ConnectionInfo.VNCSmartSizeMode.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("VNCViewOnly", ConnectionInfo.VNCViewOnly.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUsageMethod", ConnectionInfo.RDGatewayUsageMethod.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayHostname", ConnectionInfo.RDGatewayHostname, ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUseConnectionCredentials", ConnectionInfo.RDGatewayUseConnectionCredentials.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayUsername", ConnectionInfo.RDGatewayUsername, ConnectionInfo);
+                    yield return new TestCaseData("RDGatewayDomain", ConnectionInfo.RDGatewayDomain, ConnectionInfo);
+                    yield return new TestCaseData("InheritCacheBitmaps", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritColors", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDescription", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDisplayThemes", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDisplayWallpaper", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritEnableFontSmoothing", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritEnableDesktopComposition", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritDomain", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritIcon", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPanel", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPassword", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPort", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritProtocol", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPuttySession", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectDiskDrives", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectKeys", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectPorts", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectPrinters", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectSmartCards", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRedirectSound", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritSoundQuality", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritResolution", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritAutomaticResize", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUseConsoleSession", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUseCredSsp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRenderingEngine", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUsername", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritICAEncryptionStrength", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDPAuthenticationLevel", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritLoadBalanceInfo", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPreExtApp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritPostExtApp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritMacAddress", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritUserField", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritExtApp", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCCompression", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCEncoding", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCAuthMode", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyType", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyIP", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyPort", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyUsername", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCProxyPassword", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCColors", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCSmartSizeMode", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritVNCViewOnly", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayUsageMethod", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayHostname", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayUseConnectionCredentials", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayUsername", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayPassword", false.ToString(), ConnectionInfo);
+                    yield return new TestCaseData("InheritRDGatewayDomain", false.ToString(), ConnectionInfo);
+                }
+            }
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsDeserializerTests.cs

@@ -0,0 +1,156 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNGTests.Properties;
+using NUnit.Framework;
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsDeserializerTests
+    {
+        private XmlConnectionsDeserializer _xmlConnectionsDeserializer;
+        private ConnectionTreeModel _connectionTreeModel;
+
+        public void Setup(string confCons, string password)
+        {
+            _xmlConnectionsDeserializer = new XmlConnectionsDeserializer(confCons, password.ConvertToSecureString);
+            _connectionTreeModel = _xmlConnectionsDeserializer.Deserialize();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _xmlConnectionsDeserializer = null;
+            _connectionTreeModel = null;
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void DeserializingCreatesRootNode(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            Assert.That(_connectionTreeModel.RootNodes, Is.Not.Empty);
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void RootNodeHasThreeChildren(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            Assert.That(connectionRoot.Children.Count, Is.EqualTo(3));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void RootContainsFolder1(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            Assert.That(ContainsNodeNamed("Folder1", connectionRoot.Children), Is.True);
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder1ContainsThreeConnections(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder1 = GetFolderNamed("Folder1", connectionRoot.Children);
+            var folder1ConnectionCount = folder1?.Children.Count(node => !(node is ContainerInfo));
+            Assert.That(folder1ConnectionCount, Is.EqualTo(3));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder2ContainsThreeNodes(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder1Count = folder2?.Children.Count();
+            Assert.That(folder1Count, Is.EqualTo(3));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder21HasTwoNodes(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder21 = GetFolderNamed("Folder2.1", folder2.Children);
+            Assert.That(folder21.Children.Count, Is.EqualTo(2));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder211HasOneConnection(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder21 = GetFolderNamed("Folder2.1", folder2.Children);
+            var folder211 = GetFolderNamed("Folder2.1.1", folder21.Children);
+            var connectionCount = folder211.Children.Count(node => !(node is ContainerInfo));
+            Assert.That(connectionCount, Is.EqualTo(1));
+        }
+
+        [TestCaseSource(typeof(XmlConnectionsDeserializerFixtureData), nameof(XmlConnectionsDeserializerFixtureData.FixtureParams))]
+        public void Folder22InheritsUsername(Datagram testData)
+        {
+            Setup(testData.ConfCons, testData.Password);
+            var connectionRoot = _connectionTreeModel.RootNodes[0];
+            var folder2 = GetFolderNamed("Folder2", connectionRoot.Children);
+            var folder22 = GetFolderNamed("Folder2.2", folder2.Children);
+            Assert.That(folder22.Inheritance.Username, Is.True);
+        }
+
+        private bool ContainsNodeNamed(string name, IEnumerable<ConnectionInfo> list)
+        {
+            return list.Any(node => node.Name == name);
+        }
+
+        private ContainerInfo GetFolderNamed(string name, IEnumerable<ConnectionInfo> list)
+        {
+            var folder = list.First(node => (node is ContainerInfo && node.Name == name)) as ContainerInfo;
+            return folder;
+        }
+    }
+
+    public class XmlConnectionsDeserializerFixtureData
+    {
+        public static IEnumerable FixtureParams
+        {
+            get
+            {
+                yield return new TestCaseData(new Datagram("confCons v2.5", Resources.confCons_v2_5, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.5 fullencryption", Resources.confCons_v2_5_fullencryption, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.5 custompassword,fullencryption", Resources.confCons_v2_5_passwordis_Password_fullencryption, "Password"));
+                yield return new TestCaseData(new Datagram("confCons v2.6", Resources.confCons_v2_6, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 5k Iterations", Resources.confCons_v2_6_5k_iterations, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 fullencryption", Resources.confCons_v2_6_fullencryption, "mR3m"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 custompassword", Resources.confCons_v2_6_passwordis_Password, "Password"));
+                yield return new TestCaseData(new Datagram("confCons v2.6 custompassword,fullencryption", Resources.confCons_v2_6_passwordis_Password_fullencryption, "Password"));
+            }
+        }
+    }
+
+    public class Datagram
+    {
+        private readonly string _testName;
+
+        public string ConfCons { get; set; }
+        public string Password { get; set; }
+
+        public Datagram(string testName, string confCons, string password)
+        {
+            _testName = testName;
+            ConfCons = confCons;
+            Password = password;
+        }
+
+        public override string ToString()
+        {
+            return _testName;
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs

@@ -0,0 +1,108 @@
+using System.Xml.XPath;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsDocumentCompilerTests
+    {
+        private XmlConnectionsDocumentCompiler _documentCompiler;
+        private ConnectionTreeModel _connectionTreeModel;
+        private ICryptographyProvider _cryptographyProvider;
+        private ContainerInfo _folder1;
+        private ContainerInfo _folder2;
+        private ContainerInfo _folder3;
+        private ConnectionInfo _con0;
+        private ConnectionInfo _con1;
+        private ConnectionInfo _con2;
+        private ConnectionInfo _con3;
+        private ConnectionInfo _con4;
+
+        [SetUp]
+        public void Setup()
+        {
+            _cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            var saveFilter = new SaveFilter();
+            _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider, saveFilter);
+            _connectionTreeModel = SetupConnectionTreeModel();
+        }
+
+        [Test]
+        public void XDocumentHasXmlDeclaration()
+        {
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            Assert.That(xdoc.Declaration, Is.Not.Null);
+        }
+
+        [Test]
+        public void DocumentHasRootConnectionElement()
+        {
+            var xdoc =_documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            var rootElementName = xdoc.Root?.Name.LocalName;
+            Assert.That(rootElementName, Is.EqualTo("Connections"));
+        }
+
+        [Test]
+        public void ConnectionNodesSerializedRecursively()
+        {
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, false, false);
+            var con4 = xdoc.Root?.XPathSelectElement("Node[@Name='folder2']/Node[@Name='folder3']/Node[@Name='con4']");
+            Assert.That(con4, Is.Not.Null);
+        }
+
+        [Test]
+        public void XmlContentEncryptedWhenFullFileEncryptionTurnedOn()
+        {
+            var xdoc = _documentCompiler.CompileDocument(_connectionTreeModel, true, false);
+            var rootElementValue = xdoc.Root?.Value;
+            Assert.That(rootElementValue, Is.Not.EqualTo(string.Empty));
+        }
+
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Root
+             * |--- con0
+             * |--- folder1
+             * |    L--- con1
+             * L--- folder2
+             *      |--- con2
+             *      L--- folder3
+             *           |--- con3
+             *           L--- con4
+             */
+            BuildTreeNodes();
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            rootNode.AddChild(_folder1);
+            rootNode.AddChild(_folder2);
+            rootNode.AddChild(_con0);
+            _folder1.AddChild(_con1);
+            _folder2.AddChild(_con2);
+            _folder2.AddChild(_folder3);
+            _folder3.AddChild(_con3);
+            _folder3.AddChild(_con4);
+            connectionTreeModel.AddRootNode(rootNode);
+            return connectionTreeModel;
+        }
+
+        private void BuildTreeNodes()
+        {
+            _folder1 = new ContainerInfo { Name = "folder1" };
+            _folder2 = new ContainerInfo { Name = "folder2" };
+            _folder3 = new ContainerInfo { Name = "folder3" };
+            _con0 = new ConnectionInfo { Name = "con0" };
+            _con1 = new ConnectionInfo { Name = "con1" };
+            _con2 = new ConnectionInfo { Name = "con2" };
+            _con3 = new ConnectionInfo { Name = "con3" };
+            _con4 = new ConnectionInfo { Name = "con4" };
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs

@@ -0,0 +1,71 @@
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsDocumentEncryptorTests
+    {
+        private XmlConnectionsDocumentEncryptor _documentEncryptor;
+        private XDocument _originalDocument;
+
+        [SetUp]
+        public void Setup()
+        {
+            var connectionTreeModel = SetupConnectionTreeModel();
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
+            var saveFilter = new SaveFilter();
+            _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider, saveFilter).CompileDocument(connectionTreeModel, false, false);
+            _documentEncryptor = new XmlConnectionsDocumentEncryptor(cryptoProvider);
+        }
+
+        [Test]
+        public void RootNodeValueIsEncrypted()
+        {
+            var encryptedDocument = _documentEncryptor.EncryptDocument(_originalDocument, "mR3m".ConvertToSecureString());
+            var encryptedContent = encryptedDocument.Root?.Value;
+            Assert.That(encryptedContent, Is.Not.EqualTo(string.Empty));
+        }
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Root
+             * |--- con0
+             * |--- folder1
+             * |    L--- con1
+             * L--- folder2
+             *      |--- con2
+             *      L--- folder3
+             *           |--- con3
+             *           L--- con4
+             */
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            var folder1 = new ContainerInfo { Name = "folder1" };
+            var folder2 = new ContainerInfo { Name = "folder2" };
+            var folder3 = new ContainerInfo { Name = "folder3" };
+            var con0 = new ConnectionInfo { Name = "con0" };
+            var con1 = new ConnectionInfo { Name = "con1" };
+            var con2 = new ConnectionInfo { Name = "con2" };
+            var con3 = new ConnectionInfo { Name = "con3" };
+            var con4 = new ConnectionInfo { Name = "con4" };
+            rootNode.AddChild(folder1);
+            rootNode.AddChild(folder2);
+            rootNode.AddChild(con0);
+            folder1.AddChild(con1);
+            folder2.AddChild(con2);
+            folder2.AddChild(folder3);
+            folder3.AddChild(con3);
+            folder3.AddChild(con4);
+            connectionTreeModel.AddRootNode(rootNode);
+            return connectionTreeModel;
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlConnectionsSerializerTests.cs

@@ -0,0 +1,106 @@
+using System.Xml;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tree;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlConnectionsSerializerTests
+    {
+        private XmlConnectionsSerializer _serializer;
+        private ConnectionTreeModel _connectionTreeModel;
+        
+
+        [SetUp]
+        public void Setup()
+        {
+            var encryptor = new AeadCryptographyProvider();
+            _serializer = new XmlConnectionsSerializer(encryptor);
+            _connectionTreeModel = SetupConnectionTreeModel();
+        }
+
+        [Test]
+        public void ChildNestingSerializedCorrectly()
+        {
+            var serializedConnections = _serializer.Serialize(_connectionTreeModel);
+            var xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(serializedConnections);
+            var nodeCon4 = xmlDoc.DocumentElement?.SelectSingleNode("Node[@Name='folder2']/Node[@Name='folder3']/Node[@Name='con4']");
+            Assert.That(nodeCon4, Is.Not.Null);
+        }
+
+        [Test]
+        public void SingleConnectionSerializedCorrectly()
+        {
+            var connectionInfo = new ConnectionInfo {Name = "myConnection"};
+            var serializedConnections = _serializer.Serialize(connectionInfo);
+            var xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(serializedConnections);
+            var connectionNode = xmlDoc.DocumentElement?.SelectSingleNode($"Node[@Name='{connectionInfo.Name}']");
+            Assert.That(connectionNode, Is.Not.Null);
+        }
+
+        [TestCase("Username", "")]
+        [TestCase("Domain", "")]
+        [TestCase("Password", "")]
+        [TestCase("InheritAutomaticResize", "False")]
+        public void SerializerRespectsSaveFilterSettings(string attributeName, string expectedValue)
+        {
+            _serializer.SaveFilter = new SaveFilter(true);
+            var connectionInfo = new ConnectionInfo
+            {
+                Name = "myConnection",
+                Username = "somefilteredstuff",
+                Domain = "somefilteredstuff",
+                Password = "somefilteredstuff",
+                Inheritance = {AutomaticResize = true}
+            };
+            var serializedConnections = _serializer.Serialize(connectionInfo);
+            var xdoc = XDocument.Parse(serializedConnections);
+            var attributeValue = xdoc.Root?.Element("Node")?.Attribute(attributeName)?.Value;
+            Assert.That(attributeValue, Is.EqualTo(expectedValue));
+        }
+
+        private ConnectionTreeModel SetupConnectionTreeModel()
+        {
+            /*
+             * Root
+             * |--- con0
+             * |--- folder1
+             * |    L--- con1
+             * L--- folder2
+             *      |--- con2
+             *      L--- folder3
+             *           |--- con3
+             *           L--- con4
+             */
+            var connectionTreeModel = new ConnectionTreeModel();
+            var rootNode = new RootNodeInfo(RootNodeType.Connection);
+            var folder1 = new ContainerInfo { Name = "folder1" };
+            var folder2 = new ContainerInfo { Name = "folder2" };
+            var folder3 = new ContainerInfo { Name = "folder3" };
+            var con0 = new ConnectionInfo { Name = "con0" };
+            var con1 = new ConnectionInfo { Name = "con1" };
+            var con2 = new ConnectionInfo { Name = "con2" };
+            var con3 = new ConnectionInfo { Name = "con3" };
+            var con4 = new ConnectionInfo { Name = "con4" };
+            rootNode.AddChild(folder1);
+            rootNode.AddChild(folder2);
+            rootNode.AddChild(con0);
+            folder1.AddChild(con1);
+            folder2.AddChild(con2);
+            folder2.AddChild(folder3);
+            folder3.AddChild(con3);
+            folder3.AddChild(con4);
+            connectionTreeModel.AddRootNode(rootNode);
+            return connectionTreeModel;
+        }
+    }
+}

mRemoteNGTests/Config/Serializers/XmlRootNodeSerializerTests.cs

@@ -0,0 +1,139 @@
+using System;
+using System.Collections;
+using System.Xml.Linq;
+using mRemoteNG.Config.Serializers;
+using mRemoteNG.Security;
+using mRemoteNG.Security.SymmetricEncryption;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Config.Serializers
+{
+    public class XmlRootNodeSerializerTests
+    {
+        private XmlRootNodeSerializer _rootNodeSerializer;
+        private ICryptographyProvider _cryptographyProvider;
+        private RootNodeInfo _rootNodeInfo;
+
+        [SetUp]
+        public void Setup()
+        {
+            _rootNodeSerializer = new XmlRootNodeSerializer();
+            _cryptographyProvider = new AeadCryptographyProvider();
+            _rootNodeInfo = new RootNodeInfo(RootNodeType.Connection);
+        }
+
+        [Test]
+        public void RootElementNamedConnections()
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            Assert.That(element.Name.LocalName, Is.EqualTo("Connections"));
+        }
+
+        [Test]
+        public void RootNodeInfoNameSerialized()
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("Name"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo("Connections"));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void ExportValueSerialized(bool export)
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, export:export);
+            var attributeValue = element.Attribute(XName.Get("Export"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(export.ToString()));
+        }
+
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void EncryptionEngineSerialized(BlockCipherEngines engine, BlockCipherModes mode)
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
+            var attributeValue = element.Attribute(XName.Get("EncryptionEngine"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(engine.ToString()));
+        }
+
+        [TestCaseSource(typeof(TestCaseSources), nameof(TestCaseSources.AllEngineAndModeCombos))]
+        public void EncryptionModeSerialized(BlockCipherEngines engine, BlockCipherModes mode)
+        {
+            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(engine, mode);
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, cryptoProvider);
+            var attributeValue = element.Attribute(XName.Get("BlockCipherMode"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(mode.ToString()));
+        }
+
+        [TestCase(1000)]
+        [TestCase(1234)]
+        [TestCase(9999)]
+        [TestCase(10000)]
+        public void KdfIterationsSerialized(int iterations)
+        {
+            _cryptographyProvider.KeyDerivationIterations = iterations;
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("KdfIterations"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(iterations.ToString()));
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
+        public void FullFileEncryptionFlagSerialized(bool fullFileEncryption)
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, fullFileEncryption);
+            var attributeValue = element.Attribute(XName.Get("FullFileEncryption"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo(fullFileEncryption.ToString()));
+        }
+
+        [TestCase("", "ThisIsNotProtected")]
+        [TestCase(null, "ThisIsNotProtected")]
+        [TestCase("mR3m", "ThisIsNotProtected")]
+        [TestCase("customPassword1", "ThisIsProtected")]
+        public void ProtectedStringSerialized(string customPassword, string expectedPlainText)
+        {
+            _rootNodeInfo.PasswordString = customPassword;
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("Protected"))?.Value;
+            var attributeValuePlainText = _cryptographyProvider.Decrypt(attributeValue, _rootNodeInfo.PasswordString.ConvertToSecureString());
+            Assert.That(attributeValuePlainText, Is.EqualTo(expectedPlainText));
+        }
+
+        [TestCase("", "ThisIsNotProtected")]
+        [TestCase("customPassword1", "ThisIsNotProtected")]
+        public void EncryptWithDefaultPasswordWhenExporting(string customPassword, string expectedPlainText)
+        {
+            _rootNodeInfo.PasswordString = customPassword;
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider, export:true);
+            var attributeValue = element.Attribute(XName.Get("Protected"))?.Value;
+            var attributeValuePlainText = _cryptographyProvider.Decrypt(attributeValue, _rootNodeInfo.DefaultPassword.ConvertToSecureString());
+            Assert.That(attributeValuePlainText, Is.EqualTo(expectedPlainText));
+        }
+
+        [Test]
+        public void ConfVersionSerialized()
+        {
+            var element = _rootNodeSerializer.SerializeRootNodeInfo(_rootNodeInfo, _cryptographyProvider);
+            var attributeValue = element.Attribute(XName.Get("ConfVersion"))?.Value;
+            Assert.That(attributeValue, Is.EqualTo("2.6"));
+        }
+
+        private class TestCaseSources
+        {
+            public static IEnumerable AllEngineAndModeCombos
+            {
+                get
+                {
+                    foreach (var engine in Enum.GetValues(typeof(BlockCipherEngines)))
+                    {
+                        foreach (var mode in Enum.GetValues(typeof(BlockCipherModes)))
+                        {
+                            yield return new TestCaseData(engine, mode);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs

@@ -0,0 +1,507 @@
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.Http;
+using mRemoteNG.Connection.Protocol.ICA;
+using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.Connection.Protocol.VNC;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class AbstractConnectionInfoDataTests
+    {
+        private class TestAbstractConnectionInfoData : AbstractConnectionInfoData {}
+        private TestAbstractConnectionInfoData _testAbstractConnectionInfoData;
+
+        [SetUp]
+        public void Setup()
+        {
+            _testAbstractConnectionInfoData = new TestAbstractConnectionInfoData();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _testAbstractConnectionInfoData = null;
+        }
+
+
+        [Test]
+        public void NameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Name = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DescriptionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Description = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void IconNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Icon = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PanelNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Panel = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void HostnameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Hostname = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UsernameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Username = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PasswordNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Password = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DomainNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Domain = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ProtocolNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Protocol = ProtocolType.HTTP;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ExtAppNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.ExtApp = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PortNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Port = 9999;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PuttySessionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.PuttySession = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void IcaEncryptionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.ICAEncryptionStrength = ProtocolICA.EncryptionStrength.Encr128BitLogonOnly;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UseConsoleSessionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.UseConsoleSession = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdpAuthenticationLevelNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDPAuthenticationLevel = ProtocolRDP.AuthenticationLevel.AuthRequired;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void LoadBalanceInfoNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.LoadBalanceInfo = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RenderingEngineNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RenderingEngine = HTTPBase.RenderingEngine.Gecko;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UseCredSspNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.UseCredSsp = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayUsageMethodNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayUsageMethod = ProtocolRDP.RDGatewayUsageMethod.Always;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayHostnameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayHostname = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayUseConnectionCredentialsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayUseConnectionCredentials = ProtocolRDP.RDGatewayUseConnectionCredentials.SmartCard;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayUsernameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayUsername = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayPasswordNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayPassword = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RdGatewayDomainNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RDGatewayDomain = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ResolutionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Resolution = ProtocolRDP.RDPResolutions.Res1366x768;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void AutomaticResizeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.AutomaticResize = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ColorsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.Colors = ProtocolRDP.RDPColors.Colors16Bit;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void CacheBitmapsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.CacheBitmaps = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DisplayWallpaperNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.DisplayWallpaper = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void DisplayThemesNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.DisplayThemes = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void EnableFontSmoothingNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.EnableFontSmoothing = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void EnableDesktopCompositionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.EnableDesktopComposition = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectKeysNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectKeys = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectDiskDrivesNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectDiskDrives = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectPrintersNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectPrinters = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectPortsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectPorts = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectSmartCardsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectSmartCards = true;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RedirectSoundNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.RedirectSound = ProtocolRDP.RDPSounds.DoNotPlay;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PreExtAppNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.PreExtApp = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void PostExtAppNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.PostExtApp = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void MacAddressNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.MacAddress = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void UserFieldNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.UserField = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncCompressionNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCCompression = ProtocolVNC.Compression.Comp5;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncEncodingNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCEncoding = ProtocolVNC.Encoding.EncTight;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncAuthModeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCAuthMode = ProtocolVNC.AuthMode.AuthWin;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyTypeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyType = ProtocolVNC.ProxyType.ProxyUltra;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyIpNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyIP = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyPortNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyPort = 9999;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyUsernameNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyUsername = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncProxyPasswordNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCProxyPassword = "a";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncColorsNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCColors = ProtocolVNC.Colors.Col8Bit;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncSmartSizeModeNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCSmartSizeMode = ProtocolVNC.SmartSizeMode.SmartSFree;
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void VncViewOnlyNotifiesOnValueChange()
+        {
+            var wasCalled = false;
+            _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true;
+            _testAbstractConnectionInfoData.VNCViewOnly = true;
+            Assert.That(wasCalled, Is.True);
+        }
+    }
+}

mRemoteNGTests/Connection/ConnectionInfoComparerTests.cs

@@ -0,0 +1,42 @@
+using System.ComponentModel;
+using mRemoteNG.Connection;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class ConnectionInfoComparerTests
+    {
+        private ConnectionInfo _con1;
+        private ConnectionInfo _con2;
+
+        [OneTimeSetUp]
+        public void OnetimeSetup()
+        {
+            _con1 = new ConnectionInfo { Name = "a" };
+            _con2 = new ConnectionInfo { Name = "b" };
+        }
+
+        [Test]
+        public void SortAscendingOnName()
+        {
+            var comparer = new ConnectionInfoComparer<string>(node => node.Name)
+            {
+                SortDirection = ListSortDirection.Ascending
+            };
+            var compareReturn = comparer.Compare(_con1, _con2);
+            Assert.That(compareReturn, Is.Negative);
+        }
+
+        [Test]
+        public void SortDescendingOnName()
+        {
+            var comparer = new ConnectionInfoComparer<string>(node => node.Name)
+            {
+                SortDirection = ListSortDirection.Descending
+            };
+            var compareReturn = comparer.Compare(_con1, _con2);
+            Assert.That(compareReturn, Is.Positive);
+        }
+    }
+}

mRemoteNGTests/Connection/ConnectionInfoInheritanceTests.cs

@@ -0,0 +1,120 @@
+using mRemoteNG.Connection;
+using NUnit.Framework;
+using System.Reflection;
+using System.Collections;
+using System.Linq;
+
+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);
+        }
+
+        [Test]
+        public void GetPropertiesReturnsListOfSettableProperties()
+        {
+            var hasIconProperty = _inheritance.GetProperties().Contains(typeof(ConnectionInfoInheritance).GetProperty("Icon"));
+            Assert.That(hasIconProperty, Is.True);
+        }
+
+        [Test]
+        public void GetPropertiesExludesPropertiesThatShouldNotBeSet()
+        {
+            var hasEverythingInheritedProperty = _inheritance.GetProperties().Contains(typeof(ConnectionInfoInheritance).GetProperty("EverythingInherited"));
+            Assert.That(hasEverythingInheritedProperty, Is.False);
+        }
+
+        private bool AllInheritancePropertiesAreTrue()
+        {
+            var allPropertiesTrue = true;
+            foreach (var property in _inheritanceProperties)
+            {
+                if (PropertyIsBoolean(property) && PropertyIsChangedWhenSettingInheritAll(property) && BooleanPropertyIsSetToFalse(property))
+                    allPropertiesTrue = false;
+            }
+            return allPropertiesTrue;
+        }
+
+        private bool AllInheritancePropertiesAreFalse()
+        {
+            var allPropertiesFalse = true;
+            foreach (var property in _inheritanceProperties)
+            {
+                if (PropertyIsBoolean(property) && PropertyIsChangedWhenSettingInheritAll(property) && BooleanPropertyIsSetToTrue(property))
+                    allPropertiesFalse = false;
+            }
+            return allPropertiesFalse;
+        }
+
+        private bool PropertyIsChangedWhenSettingInheritAll(PropertyInfo property)
+        {
+            var propertiesIgnoredByInheritAll = new ArrayList {"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);
+        }
+    }
+}

mRemoteNGTests/Connection/ConnectionInfoTests.cs

@@ -0,0 +1,144 @@
+using System.Collections.Generic;
+using System.Reflection;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.SSH;
+using mRemoteNG.Container;
+using mRemoteNG.Tree.Root;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+	public class ConnectionInfoTests
+    {
+        private ConnectionInfo _connectionInfo;
+        private const string TestDomain = "somedomain";
+
+        [SetUp]
+        public void Setup()
+        {
+            _connectionInfo = new ConnectionInfo();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _connectionInfo = null;
+        }
+
+        [Test]
+        public void CreatingConnectionInfoWithParentSetsTheParentProperty()
+        {
+            var container = new ContainerInfo();
+            var connectionInfo = new ConnectionInfo(container);
+            Assert.That(connectionInfo.Parent, Is.EqualTo(container));
+        }
+
+        [Test]
+        public void CreatingConnectionInfoWithParentAddsToTheParentsChildList()
+        {
+            var container = new ContainerInfo();
+            var connectionInfo = new ConnectionInfo(container);
+            Assert.That(container.Children, Does.Contain(connectionInfo));
+        }
+
+        [Test]
+        public void CopyCreatesMemberwiseCopy()
+        {
+            _connectionInfo.Domain = TestDomain;
+            var secondConnection = _connectionInfo.Clone();
+            Assert.That(secondConnection.Domain, Is.EqualTo(_connectionInfo.Domain));
+        }
+
+        [Test]
+        public void CloneDoesNotSetParentOfNewConnectionInfo()
+        {
+            _connectionInfo.SetParent(new ContainerInfo());
+            var clonedConnection = _connectionInfo.Clone();
+            Assert.That(clonedConnection.Parent, Is.Null);
+        }
+
+        [Test]
+        public void CopyFromCopiesProperties()
+        {
+            var secondConnection = new ConnectionInfo {Domain = TestDomain};
+            _connectionInfo.CopyFrom(secondConnection);
+            Assert.That(_connectionInfo.Domain, Is.EqualTo(secondConnection.Domain));
+        }
+
+        [Test]
+        public void CopyingAConnectionInfoAlsoCopiesItsInheritance()
+        {
+            _connectionInfo.Inheritance.Username = true;
+            var secondConnection = new ConnectionInfo {Inheritance = {Username = false}};
+            secondConnection.CopyFrom(_connectionInfo);
+            Assert.That(secondConnection.Inheritance.Username, Is.True);
+        }
+
+        [Test]
+        public void PropertyChangedEventRaisedWhenOpenConnectionsChanges()
+        {
+            var eventWasCalled = false;
+            _connectionInfo.PropertyChanged += (sender, args) => eventWasCalled = true;
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            Assert.That(eventWasCalled);
+        }
+
+        [Test]
+        public void PropertyChangedEventArgsAreCorrectWhenOpenConnectionsChanges()
+        {
+            var nameOfModifiedProperty = "";
+            _connectionInfo.PropertyChanged += (sender, args) => nameOfModifiedProperty = args.PropertyName;
+            _connectionInfo.OpenConnections.Add(new ProtocolSSH2());
+            Assert.That(nameOfModifiedProperty, Is.EqualTo("OpenConnections"));
+        }
+
+	    [TestCaseSource(typeof(InheritancePropertyProvider), nameof(InheritancePropertyProvider.GetProperties))]
+	    public void MovingAConnectionUnderRootNodeDisablesInheritance(PropertyInfo property)
+	    {
+		    var rootNode = new RootNodeInfo(RootNodeType.Connection);
+		    _connectionInfo.Inheritance.EverythingInherited = true;
+			_connectionInfo.SetParent(rootNode);
+			var propertyValue = property.GetValue(_connectionInfo.Inheritance);
+			Assert.That(propertyValue, Is.False);
+	    }
+
+	    [TestCaseSource(typeof(InheritancePropertyProvider), nameof(InheritancePropertyProvider.GetProperties))]
+	    public void MovingAConnectionFromUnderRootNodeToUnderADifferentNodeEnablesInheritance(PropertyInfo property)
+	    {
+		    var rootNode = new RootNodeInfo(RootNodeType.Connection);
+			var otherContainer = new ContainerInfo();
+		    _connectionInfo.Inheritance.EverythingInherited = true;
+		    _connectionInfo.SetParent(rootNode);
+			_connectionInfo.SetParent(otherContainer);
+		    var propertyValue = property.GetValue(_connectionInfo.Inheritance);
+		    Assert.That(propertyValue, Is.True);
+	    }
+
+		[TestCase(ProtocolType.HTTP, ExpectedResult = 80)]
+        [TestCase(ProtocolType.HTTPS, ExpectedResult = 443)]
+        [TestCase(ProtocolType.ICA, ExpectedResult = 1494)]
+        [TestCase(ProtocolType.IntApp, ExpectedResult = 0)]
+        [TestCase(ProtocolType.RAW, ExpectedResult = 23)]
+        [TestCase(ProtocolType.RDP, ExpectedResult = 3389)]
+        [TestCase(ProtocolType.Rlogin, ExpectedResult = 513)]
+        [TestCase(ProtocolType.SSH1, ExpectedResult = 22)]
+        [TestCase(ProtocolType.SSH2, ExpectedResult = 22)]
+        [TestCase(ProtocolType.Telnet, ExpectedResult = 23)]
+        [TestCase(ProtocolType.VNC, ExpectedResult = 5900)]
+        public int GetDefaultPortReturnsCorrectPortForProtocol(ProtocolType protocolType)
+        {
+            _connectionInfo.Protocol = protocolType;
+            return _connectionInfo.GetDefaultPort();
+        }
+
+	    private class InheritancePropertyProvider
+	    {
+		    public static IEnumerable<PropertyInfo> GetProperties()
+		    {
+			    return new ConnectionInfoInheritance(new object()).GetProperties();
+		    }
+	    }
+    }
+}

mRemoteNGTests/Connection/DefaultConnectionInfoTests.cs

@@ -0,0 +1,73 @@
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class DefaultConnectionInfoTests
+    {
+        private string _testDomain = "somedomain";
+
+        [SetUp]
+        public void Setup()
+        {
+            DefaultConnectionInfo.Instance.Domain = "";
+        }
+
+        [Test]
+        public void LoadingDefaultInfoUpdatesAllProperties()
+        {
+            var connectionInfoSource = new ConnectionInfo { Domain = _testDomain };
+            DefaultConnectionInfo.Instance.LoadFrom(connectionInfoSource);
+            Assert.That(DefaultConnectionInfo.Instance.Domain, Is.EqualTo(_testDomain));
+        }
+
+        [Test]
+        public void SavingDefaultConnectionInfoExportsAllProperties()
+        {
+            var saveTarget = new ConnectionInfo();
+            DefaultConnectionInfo.Instance.Domain = _testDomain;
+            DefaultConnectionInfo.Instance.SaveTo(saveTarget);
+            Assert.That(saveTarget.Domain, Is.EqualTo(_testDomain));
+        }
+
+        [Test]
+        public void CanSaveEnumValuesToString()
+        {
+            const ProtocolType targetProtocol = ProtocolType.RAW;
+            var saveTarget = new AllStringPropertySaveTarget();
+            DefaultConnectionInfo.Instance.Protocol = targetProtocol;
+            DefaultConnectionInfo.Instance.SaveTo(saveTarget);
+            Assert.That(saveTarget.Protocol, Is.EqualTo(targetProtocol.ToString()));
+        }
+
+        [Test]
+        public void CanSaveIntegerValuesToString()
+        {
+            const int targetValue = 123;
+            var saveTarget = new AllStringPropertySaveTarget();
+            DefaultConnectionInfo.Instance.RDPMinutesToIdleTimeout = targetValue;
+            DefaultConnectionInfo.Instance.SaveTo(saveTarget);
+            Assert.That(saveTarget.RDPMinutesToIdleTimeout, Is.EqualTo(targetValue.ToString()));
+        }
+
+        [Test]
+        public void CanSaveStringValuesToString()
+        {
+            const string targetName = "hello";
+            var saveTarget = new AllStringPropertySaveTarget();
+            DefaultConnectionInfo.Instance.Username = targetName;
+            DefaultConnectionInfo.Instance.SaveTo(saveTarget);
+            Assert.That(saveTarget.Username, Is.EqualTo(targetName));
+        }
+
+
+        private class AllStringPropertySaveTarget
+        {
+            public string Username { get; set; }
+            public string Protocol { get; set; }
+            public string RDPMinutesToIdleTimeout { get; set; }
+        }
+    }
+}

mRemoteNGTests/Connection/DefaultConnectionInheritanceTests.cs

@@ -0,0 +1,49 @@
+using mRemoteNG.Connection;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection
+{
+    public class DefaultConnectionInheritanceTests
+    {
+        [SetUp]
+        public void Setup()
+        {
+            DefaultConnectionInheritance.Instance.TurnOffInheritanceCompletely();
+        }
+
+        [Test]
+        public void LoadingDefaultInheritanceUpdatesAllProperties()
+        {
+            var inheritanceSource = new ConnectionInfoInheritance(new object(), true);
+            inheritanceSource.TurnOnInheritanceCompletely();
+            DefaultConnectionInheritance.Instance.LoadFrom(inheritanceSource);
+            Assert.That(DefaultConnectionInheritance.Instance.EverythingInherited, Is.True);
+        }
+
+        [Test]
+        public void SavingDefaultInheritanceExportsAllProperties()
+        {
+            var inheritanceDestination = new ConnectionInfoInheritance(new object(), true);
+            DefaultConnectionInheritance.Instance.AutomaticResize = true;
+            DefaultConnectionInheritance.Instance.SaveTo(inheritanceDestination);
+            Assert.That(inheritanceDestination.AutomaticResize, Is.True);
+        }
+
+        [Test]
+        public void NewInheritanceInstancesCreatedWithDefaultInheritanceValues()
+        {
+            DefaultConnectionInheritance.Instance.Domain = true;
+            var inheritanceInstance = new ConnectionInfoInheritance(new object());
+            Assert.That(inheritanceInstance.Domain, Is.True);
+        }
+
+        [Test]
+        public void NewInheritanceInstancesCreatedWithAllDefaultInheritanceValues()
+        {
+            DefaultConnectionInheritance.Instance.TurnOnInheritanceCompletely();
+            var inheritanceInstance = new ConnectionInfoInheritance(new object());
+            Assert.That(inheritanceInstance.EverythingInherited, Is.True);
+        }
+    }
+}

mRemoteNGTests/Connection/Protocol/IntegratedProgramTests.cs

@@ -0,0 +1,57 @@
+using System.Collections;
+using mRemoteNG.App;
+using mRemoteNG.Connection;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Tools;
+using mRemoteNG.UI.Window;
+using NUnit.Framework;
+using WeifenLuo.WinFormsUI.Docking;
+
+namespace mRemoteNGTests.Connection.Protocol
+{
+	public class IntegratedProgramTests
+	{
+		private readonly ExternalTool _extTool = new ExternalTool
+		{
+			DisplayName = "notepad",
+			FileName = @"%windir%\system32\notepad.exe",
+			Arguments = "",
+			TryIntegrate = true
+		};
+
+		
+		[Test]
+		public void CanStartExternalApp()
+		{
+			SetExternalToolList(_extTool);
+			var sut = new IntegratedProgram();
+			sut.InterfaceControl = BuildInterfaceControl("notepad", sut);
+			sut.Initialize();
+			var appStarted = sut.Connect();
+			sut.Disconnect();
+			Assert.That(appStarted);
+		}
+
+		[Test]
+		public void ConnectingToExternalAppThatDoesntExistDoesNothing()
+		{
+			SetExternalToolList(_extTool);
+			var sut = new IntegratedProgram();
+			sut.InterfaceControl = BuildInterfaceControl("doesntExist", sut);
+			var appInitialized = sut.Initialize();
+			Assert.That(appInitialized, Is.False);
+		}
+
+		private void SetExternalToolList(ExternalTool externalTool)
+		{
+			Runtime.ExternalTools = new ArrayList {externalTool};
+		}
+
+		private InterfaceControl BuildInterfaceControl(string extAppName, ProtocolBase sut)
+		{
+			var connectionWindow = new ConnectionWindow(new DockContent());
+			var connectionInfo = new ConnectionInfo {ExtApp = extAppName};
+			return new InterfaceControl(connectionWindow, sut, connectionInfo);
+		}
+	}
+}

mRemoteNGTests/Connection/Protocol/ProtocolListTests.cs

@@ -0,0 +1,218 @@
+using System.Collections;
+using System.Collections.Specialized;
+using mRemoteNG.Connection.Protocol;
+using mRemoteNG.Connection.Protocol.SSH;
+using mRemoteNG.Connection.Protocol.Telnet;
+using mRemoteNG.Connection.Protocol.VNC;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Connection.Protocol
+{
+    public class ProtocolListTests
+    {
+        private ProtocolList _protocolList;
+        private ProtocolBase _protocol1;
+        private ProtocolBase _protocol2;
+        private ProtocolBase _protocol3;
+
+
+        [SetUp]
+        public void Setup()
+        {
+            _protocolList = new ProtocolList();
+            _protocol1 = new ProtocolTelnet();
+            _protocol2 = new ProtocolSSH2();
+            _protocol3 = new ProtocolVNC();
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _protocolList = null;
+            _protocol1 = null;
+            _protocol2 = null;
+            _protocol3 = null;
+        }
+
+        [Test]
+        public void EmptyWhenInitialized()
+        {
+            Assert.That(_protocolList.Count == 0);
+        }
+
+        [Test]
+        public void AddAddsObjectToList()
+        {
+            _protocolList.Add(_protocol1);
+            Assert.That(_protocolList[0] == _protocol1);
+        }
+
+        [Test]
+        public void AddRangeAddsAllObjects()
+        {
+            var protArray = new[] {_protocol1, _protocol2, _protocol3};
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList, Is.EquivalentTo(protArray));
+        }
+
+        [Test]
+        public void CountUpdatesToReflectCurrentList()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList.Count == protArray.Length);
+        }
+
+        [Test]
+        public void RemoveRemovesObjectFromList()
+        {
+            _protocolList.Add(_protocol1);
+            _protocolList.Remove(_protocol1);
+            Assert.That(_protocolList.Count == 0);
+        }
+
+        [Test]
+        public void ClearResetsList()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            _protocolList.Clear();
+            Assert.That(_protocolList.Count == 0);
+        }
+
+        [Test]
+        public void IntIndexerReturnsCorrectObject()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList[1], Is.EqualTo(protArray[1]));
+        }
+
+        [Test]
+        public void ObjectIndexerReturnsCorrectObject()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList[_protocol3], Is.EqualTo(_protocol3));
+        }
+
+        [Test]
+        public void IndexerSafelyHandlesUnknownObjects()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            _protocolList.AddRange(protArray);
+            Assert.That(_protocolList["unacceptablevalue"], Is.EqualTo(null));
+        }
+
+        [Test]
+        public void RemovingNonexistantObjectFromListDoesNothing()
+        {
+            Assert.DoesNotThrow(()=> _protocolList.Remove(_protocol1));
+        }
+
+        [Test]
+        public void AddRaisesCollectionChangedEvent()
+        {
+            var eventWasCalled = false;
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Add(_protocol1);
+            Assert.That(eventWasCalled);
+        }
+
+        [Test]
+        public void AddCollectionChangedEventContainsAddedObject()
+        {
+            IList nodeListFromEvent = new ArrayList();
+            _protocolList.CollectionChanged += (sender, args) => nodeListFromEvent = args.NewItems;
+            _protocolList.Add(_protocol1);
+            Assert.That(nodeListFromEvent, Is.EquivalentTo(new[] {_protocol1}));
+        }
+
+        [Test]
+        public void AddRangeCollectionChangedEventContainsAddedObjects()
+        {
+            var protArray = new[] { _protocol1, _protocol2, _protocol3 };
+            IList nodeListFromEvent = new ArrayList();
+            _protocolList.CollectionChanged += (sender, args) => nodeListFromEvent = args.NewItems;
+            _protocolList.AddRange(protArray);
+            Assert.That(nodeListFromEvent, Is.EquivalentTo(protArray));
+        }
+
+        [Test]
+        public void RemoveCollectionChangedEventContainsRemovedObject()
+        {
+            IList nodeListFromEvent = new ArrayList();
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => nodeListFromEvent = args.OldItems;
+            _protocolList.Remove(_protocol1);
+            Assert.That(nodeListFromEvent, Is.EquivalentTo(new[] { _protocol1 }));
+        }
+
+        [Test]
+        public void AttemptingToRemoveNonexistantObjectDoesNotRaiseCollectionChangedEvent()
+        {
+            var eventWasCalled = false;
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Remove(_protocol1);
+            Assert.That(eventWasCalled == false);
+        }
+
+        [Test]
+        public void ClearRaisesCollectionChangedEvent()
+        {
+            var eventWasCalled = false;
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Clear();
+            Assert.That(eventWasCalled);
+        }
+
+        [Test]
+        public void ClearDoesntRaiseCollectionChangedEventWhenNoObjectsRemoved()
+        {
+            var eventWasCalled = false;
+            _protocolList.CollectionChanged += (sender, args) => eventWasCalled = true;
+            _protocolList.Clear();
+            Assert.That(eventWasCalled == false);
+        }
+
+        [Test]
+        public void AddCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.Add(_protocol1);
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Add));
+        }
+
+        [Test]
+        public void AddRangeCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.AddRange(new []{_protocol1});
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Add));
+        }
+
+        [Test]
+        public void RemoveCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.Remove(_protocol1);
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Remove));
+        }
+
+        [Test]
+        public void ClearCollectionChangedEventHasCorrectAction()
+        {
+            NotifyCollectionChangedAction collectionChangedAction = NotifyCollectionChangedAction.Move;
+            _protocolList.Add(_protocol1);
+            _protocolList.CollectionChanged += (sender, args) => collectionChangedAction = args.Action;
+            _protocolList.Clear();
+            Assert.That(collectionChangedAction, Is.EqualTo(NotifyCollectionChangedAction.Reset));
+        }
+    }
+}

mRemoteNGTests/Container/ContainerInfoTests.cs

@@ -0,0 +1,438 @@
+using System.ComponentModel;
+using System.Linq;
+using mRemoteNG.Connection;
+using mRemoteNG.Container;
+using NUnit.Framework;
+
+
+namespace mRemoteNGTests.Container
+{
+    public class ContainerInfoTests
+    {
+        private ContainerInfo _containerInfo;
+        private ConnectionInfo _con1;
+        private ConnectionInfo _con2;
+        private ConnectionInfo _con3;
+
+        [SetUp]
+        public void Setup()
+        {
+            _containerInfo = new ContainerInfo();
+            _con1 = new ConnectionInfo {Name = "a"};
+            _con2 = new ConnectionInfo {Name = "b"};
+            _con3 = new ConnectionInfo {Name = "c"};
+        }
+
+        [TearDown]
+        public void Teardown()
+        {
+            _containerInfo = null;
+            _con1 = null;
+            _con2 = null;
+            _con3 = null;
+        }
+
+        [Test]
+        public void AddSetsParentPropertyOnTheChild()
+        {
+            _containerInfo.AddChild(_con1);
+            Assert.That(_con1.Parent, Is.EqualTo(_containerInfo));
+        }
+
+        [Test]
+        public void AddAddsChildToChildrenList()
+        {
+            _containerInfo.AddChild(_con1);
+            Assert.That(_containerInfo.Children, Does.Contain(_con1));
+        }
+
+        [Test]
+        public void AddRangeAddsAllItems()
+        {
+            var collection = new[] { _con1, _con2, _con3 };
+            _containerInfo.AddChildRange(collection);
+            Assert.That(_containerInfo.Children, Is.EquivalentTo(collection));
+        }
+
+        [Test]
+        public void RemoveUnsetsParentPropertyOnChild()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.RemoveChild(_con1);
+            Assert.That(_con1.Parent, Is.Not.EqualTo(_containerInfo));
+        }
+
+        [Test]
+        public void RemoveRemovesChildFromChildrenList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.RemoveChild(_con1);
+            Assert.That(_containerInfo.Children, Does.Not.Contains(_con1));
+        }
+
+        [Test]
+        public void RemoveRangeRemovesAllIndicatedItems()
+        {
+            var collection = new[] { _con1, _con2, new ContainerInfo() };
+            _containerInfo.AddChildRange(collection);
+            _containerInfo.RemoveChildRange(collection);
+            Assert.That(_containerInfo.Children, Does.Not.Contains(collection[0]).And.Not.Contains(collection[1]).And.Not.Contains(collection[2]));
+        }
+
+        [Test]
+        public void RemoveRangeDoesNotRemoveUntargetedMembers()
+        {
+            var collection = new[] { _con1, _con2, new ContainerInfo() };
+            _containerInfo.AddChildRange(collection);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.RemoveChildRange(collection);
+            Assert.That(_containerInfo.Children, Does.Contain(_con3));
+        }
+
+        [Test]
+        public void AddingChildTriggersCollectionChangedEvent()
+        {
+            var wasCalled = false;
+            _containerInfo.CollectionChanged += (sender, args) => wasCalled = true;
+            _containerInfo.AddChild(_con1);
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void RemovingChildTriggersCollectionChangedEvent()
+        {
+            var wasCalled = false;
+            _containerInfo.AddChild(_con1);
+            _containerInfo.CollectionChanged += (sender, args) => wasCalled = true;
+            _containerInfo.RemoveChild(_con1);
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ChangingChildPropertyTriggersPropertyChangedEvent()
+        {
+            var wasCalled = false;
+            _containerInfo.AddChild(_con1);
+            _containerInfo.PropertyChanged += (sender, args) => wasCalled = true;
+            _con1.Name = "somethinghere";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void ChangingSubChildPropertyTriggersPropertyChangedEvent()
+        {
+            var wasCalled = false;
+            var container2 = new ContainerInfo();
+            _containerInfo.AddChild(container2);
+            container2.AddChild(_con1);
+            _containerInfo.PropertyChanged += (sender, args) => wasCalled = true;
+            _con1.Name = "somethinghere";
+            Assert.That(wasCalled, Is.True);
+        }
+
+        [Test]
+        public void SetChildPositionPutsChildInCorrectPosition()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.SetChildPosition(_con2, 2);
+            Assert.That(_containerInfo.Children.IndexOf(_con2), Is.EqualTo(2));
+        }
+
+        [Test]
+        public void SettingChildPositionAboveArrayBoundsPutsItAtEndOfList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var finalIndex = _containerInfo.Children.Count - 1;
+            _containerInfo.SetChildPosition(_con2, 5);
+            Assert.That(_containerInfo.Children.IndexOf(_con2), Is.EqualTo(finalIndex));
+        }
+
+        [Test]
+        public void SettingChildPositionBelowArrayBoundsDoesNotMoveTheChild()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var originalIndex = _containerInfo.Children.IndexOf(_con2);
+            _containerInfo.SetChildPosition(_con2, -1);
+            Assert.That(_containerInfo.Children.IndexOf(_con2), Is.EqualTo(originalIndex));
+        }
+
+        [Test]
+        public void SetChildAbovePutsChildInCorrectPosition()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var referenceChildIndexBeforeMove = _containerInfo.Children.IndexOf(_con2);
+            _containerInfo.SetChildAbove(_con3, _con2);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(referenceChildIndexBeforeMove));
+        }
+
+        [Test]
+        public void SetChildBelowPutsChildInCorrectPosition()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var referenceChildIndexBeforeMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.SetChildBelow(_con3, _con1);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(referenceChildIndexBeforeMove+1));
+        }
+
+        [Test]
+        public void PromoteChildMovesTargetUpOne()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con3);
+            _containerInfo.PromoteChild(_con3);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove - 1));
+        }
+
+        [Test]
+        public void PromoteChildDoesNothingWhenAlreadyAtTopOfList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.PromoteChild(_con1);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con1);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove));
+        }
+
+        [Test]
+        public void DemoteChildMovesTargetDownOne()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.DemoteChild(_con1);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con1);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove + 1));
+        }
+
+        [Test]
+        public void DemoteChildDoesNothingWhenAlreadyAtTopOfList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var targetsIndexBeforeMove = _containerInfo.Children.IndexOf(_con3);
+            _containerInfo.DemoteChild(_con3);
+            var targetsNewIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(targetsNewIndex, Is.EqualTo(targetsIndexBeforeMove));
+        }
+
+        [Test]
+        public void WhenChildAlreadyPresentAddChildAtDoesNothing()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var indexBeforeAttemptedMove = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.AddChildAt(_con1, 2);
+            var indexAfterAttemptedMove = _containerInfo.Children.IndexOf(_con1);
+            Assert.That(indexAfterAttemptedMove, Is.EqualTo(indexBeforeAttemptedMove));
+        }
+
+        [Test]
+        public void RemoveChildDoesNothingIfChildNotInList()
+        {
+            _containerInfo.AddChild(_con1);
+            var childListBeforeRemoval = _containerInfo.Children;
+            _containerInfo.RemoveChild(_con2);
+            var childListAfterRemoval = _containerInfo.Children;
+            Assert.That(childListAfterRemoval, Is.EquivalentTo(childListBeforeRemoval));
+        }
+
+        [Test]
+        public void ClonedContainerHasNewConstantId()
+        {
+            var clone = _containerInfo.Clone();
+            Assert.That(clone.ConstantID, Is.Not.EqualTo(_containerInfo.ConstantID));
+        }
+
+        [Test]
+        public void ClonedContainerDoesNotHaveParentSet()
+        {
+            _containerInfo.SetParent(new ContainerInfo());
+            var clone = _containerInfo.Clone();
+            Assert.That(clone.Parent, Is.Null);
+        }
+
+        [Test]
+        public void ClonedContainerContainsClonedChildren()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con3);
+            var clone = _containerInfo.Clone() as ContainerInfo;
+            var clonedChildNames = clone?.Children.Select((node) => node.Name);
+            var originalChildNames = _containerInfo?.Children.Select((node) => node.Name);
+            Assert.That(clonedChildNames, Is.EquivalentTo(originalChildNames));
+        }
+
+        [Test]
+        public void HasChildrenReturnsFalseForNoChildren()
+        {
+            var hasChildren = _containerInfo.HasChildren();
+            Assert.That(hasChildren, Is.False);
+        }
+
+        [Test]
+        public void HasChildrenReturnsTrueWhenChildrenPresent()
+        {
+            _containerInfo.AddChild(_con1);
+            var hasChildren = _containerInfo.HasChildren();
+            Assert.That(hasChildren, Is.True);
+        }
+
+        [Test]
+        public void AddChildAbovePutsNewChildInCorrectLocation()
+        {
+            _containerInfo.AddChild(_con1);
+            var referenceChildIndexBeforeInsertion = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.AddChildAbove(_con2, _con1);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con2);
+            Assert.That(newChildIndex, Is.EqualTo(referenceChildIndexBeforeInsertion));
+        }
+
+        [Test]
+        public void AddChildAbovePutsNewChildAtEndOfListIfReferenceChildNotInList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChildAbove(_con2, _con3);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con2);
+            var lastIndex = _containerInfo.Children.Count - 1;
+            Assert.That(newChildIndex, Is.EqualTo(lastIndex));
+        }
+
+        [Test]
+        public void AddChildBelowPutsNewChildInCorrectLocation()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con2);
+            var referenceChildIndexBeforeInsertion = _containerInfo.Children.IndexOf(_con1);
+            _containerInfo.AddChildBelow(_con3, _con1);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con3);
+            Assert.That(newChildIndex, Is.EqualTo(referenceChildIndexBeforeInsertion + 1));
+        }
+
+        [Test]
+        public void AddChildBelowPutsNewChildAtEndOfListIfReferenceChildNotInList()
+        {
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChildBelow(_con2, _con3);
+            var newChildIndex = _containerInfo.Children.IndexOf(_con2);
+            var lastIndex = _containerInfo.Children.Count - 1;
+            Assert.That(newChildIndex, Is.EqualTo(lastIndex));
+        }
+
+        [Test]
+        public void SortAscendingSortsCorrectlyByName()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.Sort();
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortDescendingSortsCorrectlyByName()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.Sort(ListSortDirection.Descending);
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortOnConstantIdAscendingSortsCorrectly()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.SortOn(node=> node.ConstantID);
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+
+        [Test]
+        public void SortOnConstantIdDescendingSortsCorrectly()
+        {
+            _containerInfo.AddChild(_con2);
+            _containerInfo.AddChild(_con1);
+            _containerInfo.AddChild(_con3);
+            _containerInfo.SortOn(node => node.ConstantID, ListSortDirection.Descending);
+            var orderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(orderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+
+        [Test]
+        public void SortAscendingRecursiveSortsGrandchildrenCorrectlyByName()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortRecursive();
+            var grandchildOrderAfterSort = childContainer.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortDescendingRecursiveSortsGrandchildrenCorrectlyByName()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortRecursive(ListSortDirection.Descending);
+            var grandchildOrderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.Name)));
+        }
+
+        [Test]
+        public void SortOnRecursiveConstantIdAscendingSortsGrandchildrenCorrectly()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortOnRecursive(node => node.ConstantID);
+            var grandchildOrderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Ascending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+
+        [Test]
+        public void SortOnRecursiveConstantIdDescendingSortsGrandchildrenCorrectly()
+        {
+            var childContainer = new ContainerInfo();
+            childContainer.AddChild(_con2);
+            childContainer.AddChild(_con1);
+            childContainer.AddChild(_con3);
+            _containerInfo.AddChild(childContainer);
+            _containerInfo.SortOnRecursive(node => node.ConstantID, ListSortDirection.Descending);
+            var grandchildOrderAfterSort = _containerInfo.Children.ToArray();
+            Assert.That(grandchildOrderAfterSort, Is.Ordered.Descending.By(nameof(ConnectionInfo.ConstantID)));
+        }
+    }
+}