update PuTTY to v.0.75

.github/CONTRIBUTING.md

@@ -0,0 +1,58 @@
+# 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.
+
+### 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.
+
+# 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,30 @@
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide an unambiguous set of steps to reproduce -->
+<!--- this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Operating System and version (e.g. Windows 10 1709 x64):

.github/PULL_REQUEST_TEMPLATE.md

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

.gitignore

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

CREDITS.TXT

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

CREDITS.md

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

InstallerProjects/CustomActions/CustomActions.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CustomActions</RootNamespace>
     <AssemblyName>CustomActions</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
     <TargetFrameworkProfile />
@@ -23,7 +23,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>pdbonly</DebugType>
@@ -32,7 +31,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>

InstallerProjects/CustomActions/Properties/AssemblyInfo.cs

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

InstallerProjects/Installer/Fragments/MainExeFragment.wxs

@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
 	<Fragment>
-    <Component Id="C.MainExe" Directory="INSTALLDIR" Guid="a028ee50-3135-46c7-83c0-1d14d36e146c">
-      <File Id="MainExeFile" Source="$(var.SolutionDir)mRemoteNG\bin\$(var.Configuration)\mRemoteNG.exe" />
+    <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

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

InstallerProjects/Installer/Fragments/RegistryEntriesFragment.wxs

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

InstallerProjects/Installer/Fragments/ShortcutFragment.wxs

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

InstallerProjects/Installer/Installer.wixproj

@@ -14,16 +14,16 @@
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Debug;</DefineConstants>
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Release;</DefineConstants>
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug Portable' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Debug Portable;</DefineConstants>
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Debug Portable;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release Portable' ">
-    <DefineConstants>HarvestPath=..\mRemoteNG\bin\Release Portable;</DefineConstants>
+    <DefineConstants>HarvestPath=..\mRemoteV1\bin\Release Portable;</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CustomActions\CheckForInstalledWindowsUpdates.wxs" />
@@ -36,14 +36,15 @@
     <Compile Include="Fragments\PuTTYNGFragment.wxs" />
     <Compile Include="Fragments\RegistryEntriesFragment.wxs" />
     <Compile Include="Fragments\ShortcutFragment.wxs" />
-    <Compile Include="mRemoteNG.wxs" />
+    <Compile Include="mRemoteNGV1.wxs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Filters\Harvest_Filter.xslt" />
     <Content Include="Includes\Config.wxi" />
-    <Content Include="Resources\AppIcon.ico" />
-    <Content Include="Resources\Installer_Header.png" />
-    <Content Include="Resources\Installer_Side.png" />
+    <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" />
@@ -56,6 +57,10 @@
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Localizations\ru-RU.wxl" />
+    <EmbeddedResource Include="Localizations\ja-JP.wxl" />
+    <EmbeddedResource Include="Localizations\cs-CZ.wxl" />
+    <EmbeddedResource Include="Localizations\de-DE.wxl" />
     <EmbeddedResource Include="Localizations\en-US.wxl" />
   </ItemGroup>
   <ItemGroup>
@@ -73,13 +78,14 @@
     </WixExtension>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\mRemoteNG\mRemoteNG.csproj">
-      <Name>mRemoteNG</Name>
+    <ProjectReference Include="..\..\mRemoteV1\mRemoteV1.csproj">
+      <Name>mRemoteV1</Name>
       <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
       <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
+      <DoNotHarvest>
+      </DoNotHarvest>
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+      <RefTargetDir>APPLICATIONROOTDIRECTORY</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
@@ -94,33 +100,34 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <LinkerAdditionalOptions>
     </LinkerAdditionalOptions>
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteNG\bin\Release;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help</DefineConstants>
+    <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)mRemoteNG\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help</DefineConstants>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|x86' ">
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteNG\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help</DefineConstants>
+    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteV1\bin\Debug Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteV1\Resources\Help</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|x86' ">
-    <DefineConstants>HarvestPath=$(SolutionDir)mRemoteNG\bin\Release Portable;HelpFilesHarvestPath=$(SolutionDir)mRemoteNG\Resources\Help</DefineConstants>
+    <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
-
-:: Manual builds, set the cert password and uncomment below.
-:: IF "%25APPVEYOR_BUILD_FOLDER"=="" ( set cert_pwd=  )
+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 "$(SolutionDir)Tools\postbuild_installer.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "%25cd%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe"</PostBuildEvent>
+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
@@ -128,8 +135,8 @@ rmdir /S /Q "$(TargetDir)"
 
 echo $(ConfigurationName) &gt; buildenv.tmp
 
-REM Harvest bin directory of the mRemoteNG project
-"$(WIX)bin\heat.exe" dir "$(SolutionDir)mRemoteNG\bin\$(Configuration)" -ag -nologo -dr INSTALLDIR -var var.HarvestPath -srd -scom -sreg -cg MandatoryComponents -template fragment -out "$(ProjectDir)Fragments\FilesFragment.wxs" -t "$(ProjectDir)Filters\Harvest_Filter.xslt"
+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>

InstallerProjects/Installer/Localizations/cs-CZ.wxl

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

InstallerProjects/Installer/Localizations/de-DE.wxl

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

InstallerProjects/Installer/Localizations/en-US.wxl

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

InstallerProjects/Installer/Localizations/ja-JP.wxl

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

InstallerProjects/Installer/Localizations/ru-RU.wxl

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

InstallerProjects/Installer/mRemoteNGV1.wxs

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

Jenkinsfile_publish.groovy

@@ -2,7 +2,7 @@ node('windows') {
 	def jobDir = pwd()
 	def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\""
     def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe"
-    def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.10.0\\tools\\nunit3-console.exe"
+    def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe"
     def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe"
     def testResultFilePrefix = "TestResult"
     def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml"

README.MD

@@ -1,180 +1,59 @@
-**NOTICE: This project is currently stalled and we are transitioning to a new maintainer. Please see [this stickied issue](https://github.com/mRemoteNG/mRemoteNG/issues/1949) for more details. Development help would be greatly appreciated.**
+# Welcome to the mRemoteNG project!
 
-<br/><br/>
-<p align="center">
-  <img width="500" src="https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/Tools/img/logo.png">
-</p>
-  
-<p align="center">
-  An open source, multi-protocol, tabbed remote connections manager allowing you to view all of your connections in a simple yet powerful interface
-</p>
+[![Twitter Follow](https://img.shields.io/twitter/follow/mRemoteNG.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=mRemoteNG)
+[![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat)
+[![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer)
 
-<p align="center">
-  <img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/mremoteng/mremoteng/total?label=Overall%20Downloads&style=for-the-badge">
-</p>
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529)
 
-<p align="center">
-  <a href="https://www.reddit.com/r/mRemoteNG/">
-    <img alt="Subreddit subscribers" src="https://img.shields.io/reddit/subreddit-subscribers/mremoteng?label=Reddit&logo=Reddit&style=flat-square">
-  </a>
-  <a href="https://twitter.com/mremoteng">
-    <img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/mremoteng?color=%231DA1F2&label=Twitter&logo=Twitter&style=flat-square">
-  </a>
-  <a href="https://gitter.im/mRemoteNG/PublicChat">
-    <img alt="Gitter" src="https://img.shields.io/gitter/room/mRemoteNG/PublicChat?label=Join%20the%20Chat&logo=Gitter&style=flat-square">
-  </a>  
-  <a href="https://www.paypal.me/DavidSparer">
-    <img alt="PayPal" src="https://img.shields.io/badge/%24-PayPal-blue.svg?label=Donate&logo=PayPal&style=flat-square">
-  </a>
-  <a href="bitcoin:16fUnHUM3k7W9Fvpc6dug7TAdfeGEcLbSg">
-    <img alt="Bitcoin" src="https://img.shields.io/badge/%24-Bitcoin.svg?label=Donate&logo=bitcoin&style=flat-square">
-  </a>
-</p>
-
-<p align="center">
-  <a href="https://github.com/mRemoteNG/mRemoteNG/blob/develop/COPYING.TXT">
-    <img alt="License" src="https://img.shields.io/github/license/mremoteng/mremoteng?label=License&style=flat">
-  </a>
-  <a href="https://bestpractices.coreinfrastructure.org/projects/529">
-    <img alt="CII Best Practices" src="https://bestpractices.coreinfrastructure.org/projects/529/badge?style=flat">
-  </a>
-  <a href='https://mremoteng.readthedocs.io/en/latest/?badge=latest'>
-    <img src='https://readthedocs.org/projects/mremoteng/badge/?version=latest' alt='Documentation Status' />
-  </a>
-</p>
-
----
+[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG)
 
 | Update Channel | Build Status | Downloads |
 | ---------------|--------------|-----------|
-| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) |
-| Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) |
+| Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7012/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7012) |
+| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75.7012/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75.7012) |
+| Development | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76Alpha5/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76Alpha5) |
+
+mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
 
 ## Features
 
-The following protocols are supported:
+mRemoteNG is a fork of mRemote: an open source, tabbed, multi-protocol, remote connections manager. mRemoteNG adds bug fixes and new features to mRemote.
 
-* RDP (Remote Desktop Protocol)
+It allows you to view all of your remote connections in a simple yet powerful tabbed interface.
+
+mRemoteNG supports the following protocols:
+
+* RDP (Remote Desktop/Terminal Server)
 * VNC (Virtual Network Computing)
+* ICA (Citrix Independent Computing Architecture)
 * SSH (Secure Shell)
 * Telnet (TELecommunication NETwork)
 * HTTP/HTTPS (Hypertext Transfer Protocol)
 * rlogin (Remote Login)
 * Raw Socket Connections
-* Powershell remoting
 
-For a detailed feature list and general usage support, refer to the [Documentation](https://mremoteng.readthedocs.io/en/latest/).
+For a detailed feature list and general usage support, refer to the [User Manual](https://github.com/mRemoteNG/mRemoteNG/wiki/User-Manual).
 
 ## Installation
 
-### Supported Operating Systems
+Before installing make sure you have all the required [prerequisites](https://github.com/mRemoteNG/mRemoteNG/wiki/Prerequisites).
 
-- [Windows 10](https://en.wikipedia.org/wiki/Windows_10)
-- [Windows 8.1](https://en.wikipedia.org/wiki/Windows_8.1)
-- [Windows Server 2019](https://en.wikipedia.org/wiki/Windows_Server_2019)
-- [Windows Server 2016](https://en.wikipedia.org/wiki/Windows_Server_2016)
-- [Windows Server 2012 R2](https://en.wikipedia.org/wiki/Windows_Server_2012_R2)
-
-### Packaging
-
-Downloads are provided in three different packages.
-
-#### Binary package
-
-The binary package of mRemoteNG is a compiled version of mRemoteNG which comes in an MSI installer.
-This is the most common way to install mRemoteNG and get up and running.
-
-#### Portable package
-
-The portable package contains a modified version of the executable which stores and loads all your settings from files in the application's directory.
-This package can be used to run mRemoteNG from a USB stick and preserve your configuration wherever you go.
-
-#### Source package
-
-This contains the source code from which mRemoteNG is build.
-You will need to compile it yourself using Visual Studio.
-
-### Minimum Requirements
-
-* [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
-* [Microsoft .NET Framework 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=17851)
-* Microsoft Terminal Service Client 6.0 or later
-  * Needed if you use RDP. mstscax.dll and/or msrdp.ocx be registered.
-* [Citrix ICA Client](https://www.citrix.com/downloads/citrix-receiver.html)
-  * Needed if you use ICA. wfica.ocx must be registered
-
-### Download
-
-mRemoteNG is available as a redistributable MSI package or as a portable ZIP package and can be downloaded from the following locations:
+mRemoteNG is available as a redistributable msi package, and can be downloaded from the following locations:
 * [GitHub](https://github.com/mRemoteNG/mRemoteNG/releases)
 * [Project Website](https://mremoteng.org/download)
 
-### Command line install
-
-The MSI package of mRemoteNG can be installed using the command line:
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.exe [INSTALLDIR=value] [IGNOREPREREQUISITES=value]`
-
-| Property | Value | Description |
-|-|-|-|
-| INSTALLDIR | `folder path` | This allows you to set the installation directory from the command line. For paths that contain spaces, enclose the path in double quotes (""). This overrides any value found in the registry. |
-| IGNOREPREREQUISITES | `0` or `1` | When set to `1`, the installer will not be halted if any prerequisite check is not met. You must still run the installer as administrator. |
-
-#### Examples
-
-**Install to a custom folder**
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi INSTALLDIR="D:\Work Apps\mRemoteNG"`
-
-**Ignore prerequisites during a normal install**
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi IGNOREPREREQUISITES=1`
-
-**Ignore prerequisites during a silent install**
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /qn IGNOREPREREQUISITES=1`
-
-### Troubleshooting installation
-
-Turn on verbose logging by using the `/lv* <log path>` argument at the command line.
-
-`msiexec /i C:\Path\To\mRemoteNG-Installer.msi /l*v C:\mremoteng_install.log`
-
-## Uninstall
-
-### Standard Uninstall
-
-mRemoteNG basic binary package can be uninstalled with Windows Control Panel. If for some reason it does not work please
-follow information provided below for Manual Uninstall.
-
-### Manual Uninstall
-
-_If you are using the Portable version, simply deleting the folder that contains mRemoteNG should be sufficient. These uninstall instructions are only necessary for the normal binary .MSI installed version of mRemoteNG_
-
-* Delete the folder where mRemoteNG was installed. By default, this is:
-	`%PROGRAMFILES%\mRemoteNG`
-
-* Delete the mRemoteNG install entry from one of the following locations. Search for "mRemoteNG" in the DisplayName field:
-  * x86: ``HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\``
-  * x64: ``HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\``
-
-* (Optional) If you would also like to delete user data remove `%LOCALAPPDATA%\mRemoteNG`
-
-## Featured Projects
-
-* [PSmRemoteNG](https://github.com/realslacker/PSmRemoteNG) A module to create mRemoteNG connection files from PowerShell.
+mRemoteNG is supported on Windows 7 or later.
+Windows 7 and Windows Server 2008 installations must ensure the [listed required updates](https://github.com/mRemoteNG/mRemoteNG/wiki/Prerequisites#full-list-of-required-windows-updates-for-windows-7--server-2008-clients) are installed and active.
 
 ## Contribute
 
 If you find mRemoteNG useful and would like to contribute, it would be greatly appreciated. When you contribute, you make it possible for the team to cover the costs of producing mRemoteNG.
 
 ### Submit Code
-Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to configure your development environment and submit a pull request.
+Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/Development) on how to configure your development environment and submit a pull request.
 
 ### Translate
-Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to help make mRemoteNG a polyglot.
+Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki/How%20to%20Help%20Translating%20mRemoteNG) on how to help make mRemoteNG a polygot
 
-</br>
-<p align="center">
-  <img alt="Developed with ReSharper" src="https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/Tools/img/icon_ReSharper.png">
-</p>
+[![Developed with ReSharper](https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/develop/.github/icon_ReSharper.png)](https://www.jetbrains.com/resharper/)

Readme.txt

@@ -0,0 +1,25 @@
+mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager.
+
+It allows you to store all your remote connections in a simple yet powerful interface.
+
+Currently these protocols are supported:
+
+ * RDP (Remote Desktop)
+ * VNC (Virtual Network Computing)
+ * ICA (Independent Computing Architecture)
+ * SSH (Secure Shell)
+ * Telnet (TELecommunication NETwork)
+ * HTTP/S (Hypertext Transfer Protocol)
+ * Rlogin (Rlogin)
+ * RAW
+
+mRemoteNG can be installed on Windows 7 or later.
+
+Windows 7 systems require RDP version 8:   
+https://support.microsoft.com/en-us/kb/2592687   
+OR   
+https://support.microsoft.com/en-us/kb/2923545   
+
+Windows 8+ support RDP version 8+ out of the box.
+
+RDP versions are backwards compatible, so an mRemoteNG client running on Windows 10 can connection successfully to a Windows 2003 host (for example).

Tools/7zip/License.txt

@@ -3,7 +3,7 @@
       License for use and distribution
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-      Copyright (C) 1999-2019 Igor Pavlov.
+      Copyright (C) 1999-2018 Igor Pavlov.
 
       7-Zip Extra files are under the GNU LGPL license.
 

Tools/7zip/history.txt

@@ -5,21 +5,6 @@ This file contains only information about changes related to that package exclus
 The full history of changes is listed in history.txt in main 7-Zip program.
 
 
-19.00          2019-02-21
--------------------------
-- Encryption strength for 7z archives was increased:
-  the size of random initialization vector was increased from 64-bit to 128-bit,
-  and the pseudo-random number generator was improved.
-- Some bugs were fixed.
-
-
-18.06          2018-12-30
--------------------------
-- The speed for LZMA/LZMA2 compressing was increased by 3-10%,
-  and there are minor changes in compression ratio.
-- Some bugs were fixed.
-
-
 18.05          2018-04-30
 -------------------------
 - The speed for LZMA/LZMA2 compressing was increased 

Tools/7zip/readme.txt

@@ -1,9 +1,9 @@
-7-Zip Extra 19.00
+7-Zip Extra 18.05
 -----------------
 
 7-Zip Extra is package of extra modules of 7-Zip. 
 
-7-Zip Copyright (C) 1999-2019 Igor Pavlov.
+7-Zip Copyright (C) 1999-2018 Igor Pavlov.
 
 7-Zip is free software. Read License.txt for more information about license.
 

Tools/CreateBulkConnections_ConfCons2_6.ps1

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

Tools/build-relport.cmd

@@ -0,0 +1,45 @@
+@echo off
+
+setlocal enabledelayedexpansion
+
+set SOLUTIONDIR=%~dp0..
+
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%SOLUTIONDIR%\Tools\exes\sigcheck.exe"
+set SEVENZIP="%SOLUTIONDIR%\Tools\7zip\7za.exe"
+
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+call %VCVARSALL% x86
+
+IF NOT "%~1"=="build" goto skipbuild
+echo Building...
+"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" "%SOLUTIONDIR%\mRemoteV1.sln" /Rebuild "Release Portable"
+
+:skipbuild
+IF NOT EXIST "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe" echo Did you forget to build? && goto end
+set SIGCHECK=!SIGCHECK:"=^"!
+set SIGCHECK=!SIGCHECK: =^^ !
+set SIGCHECK=!SIGCHECK:(=^^(!
+set SIGCHECK=!SIGCHECK:)=^^)!
+for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   set PRODUCT_VERSION=%%i.%%j.%%k.%%l
+)
+echo Version is %PRODUCT_VERSION%
+
+set PORTABLEZIP="%SOLUTIONDIR%\Release\mRemoteNG-Portable-%PRODUCT_VERSION%.zip"
+
+rmdir /S /Q "%SOLUTIONDIR%\mRemoteV1\bin\package"
+mkdir "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\*.txt" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+copy "%SOLUTIONDIR%\Installer Projects\Installer\Dependencies\PuTTYNG.exe" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+xcopy /S /Y "%SOLUTIONDIR%\mRemoteV1\bin\Release Portable" "%SOLUTIONDIR%\mRemoteV1\bin\package"
+
+echo Creating portable ZIP file...
+echo %PORTABLEZIP% 
+del /f /q %PORTABLEZIP% > nul 2>&1
+%SEVENZIP% a -bt -mx=9 -tzip -y -r %PORTABLEZIP% "%SOLUTIONDIR%\mRemoteV1\bin\package\*.*"
+%SEVENZIP% a -bt -mx=9 -tzip -y %PORTABLEZIP% "%SOLUTIONDIR%\*.TXT"
+
+:end

Tools/copy_puttyng.ps1

@@ -10,6 +10,6 @@ param (
 
 Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 Write-Output "Copying PUTTYNG to correct directory"
-Copy-Item -Path (Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\Resources\PuTTYNG.exe") -Destination $TargetDir -Force
+Copy-Item -Path (Join-Path -Path $SolutionDir -ChildPath "mRemoteV1\Resources\PuTTYNG.exe") -Destination $TargetDir -Force
 
 Write-Output ""

Tools/copy_themes.ps1

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

Tools/copy_tiles.ps1

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

Tools/create_upg_chk_files.ps1

@@ -30,7 +30,7 @@ function New-MsiUpdateFileContent {
     $fileContents = `
 "Version: $version
 dURL: https://github.com/mRemoteNG/mRemoteNG/releases/download/$TagName/$($MsiFile.Name)
-clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.md
+clURL: https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/$TagName/CHANGELOG.TXT
 CertificateThumbprint: $certThumbprint
 Checksum: $hash"
     Write-Output $fileContents

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

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

Tools/postbuild_mremotev1.ps1

@@ -26,14 +26,13 @@ param (
 )
 
 Write-Output "+=================================================================+"
-Write-Output "|                  Beginning mRemoteNG Post Build                 |"
+Write-Output "|                  Beginning mRemoteV1 Post Build                 |"
 Write-Output "+=================================================================+"
 Format-Table -AutoSize -Wrap -InputObject @{
     "SolutionDir" = $SolutionDir
     "TargetDir" = $TargetDir
     "TargetFileName" = $TargetFileName
     "ConfigurationName" = $ConfigurationName
-    "CertificatePath" = $CertificatePath
     "ExcludeFromSigning" = $ExcludeFromSigning
 }
 
@@ -41,12 +40,11 @@ Format-Table -AutoSize -Wrap -InputObject @{
 
 & "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
 & "$PSScriptRoot\copy_themes.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
-& "$PSScriptRoot\copy_tiles.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
-& "$PSScriptRoot\sphinx_docs.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir
+& "$PSScriptRoot\move_help_files.ps1" -TargetDir $TargetDir
 & "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
-& "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir
-& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir
+& "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning
+& "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath
 & "$PSScriptRoot\zip_symbols.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName
 & "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName

Tools/rename_installer_with_version.ps1

@@ -8,7 +8,7 @@ $renameTarget = $SolutionDir + "InstallerProjects\Installer\bin\Release\en-US\mR
 Write-Host $SolutionDir
 Write-Host $renameTarget
 
-$targetVersionedFile = "$SolutionDir\mRemoteNG\bin\Release\mRemoteNG.exe"
+$targetVersionedFile = "$SolutionDir\mRemoteV1\bin\Release\mRemoteNG.exe"
 $version = &"$SolutionDir\Tools\exes\sigcheck.exe" /accepteula -q -n $targetVersionedFile
 
 

Tools/sign_binaries.ps1

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

Tools/sphinx_docs.ps1

@@ -1,33 +0,0 @@
-param (	
-	[string]
-    [Parameter(Mandatory=$true)]
-    $SolutionDir,
-	
-	[string]
-    [Parameter(Mandatory=$true)]
-    $TargetDir
-)
-
-Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
-
-Write-Output "Building HTML-Documentation with Sphinx"
-
-$path_HelpFilesDir = Join-Path -Path $TargetDir -ChildPath "Help"
-$path_SphinxSourceDir = Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\Documentation"
-
-# Remove stale Help files, if they exist
-if (Test-Path -Path $path_HelpFilesDir) {
-    Remove-Item -Path $path_HelpFilesDir -Recurse -Force
-}
-
-# Build docs
-sphinx-build $path_SphinxSourceDir $path_HelpFilesDir
-
-# Place dummy html file if build failed
-if (-Not (Test-Path $path_HelpFilesDir\index.html -PathType Leaf)) {
-    New-Item -Path $path_HelpFilesDir -ItemType "directory"
-    New-Item $path_HelpFilesDir\index.html
-    Set-Content $path_HelpFilesDir\index.html 'Welcome to mRemoteNG!'
-} 
-
-Write-Output ""

Tools/tidy_files_for_release.ps1

@@ -13,12 +13,7 @@ Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) ====="
 # Remove unnecessary files from Release versions
 if ($ConfigurationName -match "Release") {
     Write-Output "Removing unnecessary files from Release versions"
-
-    $test = Join-Path -Path $TargetDir -ChildPath "app.publish"
-    if (Test-Path  $test -PathType Container) {
-        Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
-    }
-
+    Remove-Item -Path (Join-Path -Path $TargetDir -ChildPath "app.publish") -Recurse -Force
     $filesToDelete = Get-ChildItem -Path $TargetDir -Recurse -Include @(
         "*.publish",
         "*.xml",
@@ -26,9 +21,7 @@ if ($ConfigurationName -match "Release") {
         "*.log",
         "*vshost*",
         "*.tmp"
-    ) -Exclude @(
-        "mRemoteNG.VisualElementsManifest.xml"
-	)
+    )
     Remove-Item -Path $filesToDelete.FullName
     Write-Output $filesToDelete.FullName
 }

Tools/verify_binary_signatures.ps1

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

Tools/zip_portable_files.ps1

@@ -33,21 +33,21 @@ $SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
 if ($ConfigurationName -eq "Release Portable") {
     Write-Output "Packaging Release Portable ZIP"
    
-    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteNG\bin\$($ConfigurationName)\mRemoteNG.exe"
+    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
 
     Write-Output "Version is $($version)"
 
     $PortableZip="$($SolutionDir)Release\mRemoteNG-Portable-$($version).zip"
 
-    $tempFolderPath = Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\bin\package"
+    $tempFolderPath = Join-Path -Path $SolutionDir -ChildPath "mRemoteV1\bin\package"
     Remove-Item -Recurse $tempFolderPath -ErrorAction SilentlyContinue | Out-Null
     New-Item $tempFolderPath -ItemType  "directory" | Out-Null
     
-    Copy-Item "$($SolutionDir)mRemoteNG\Resources\PuTTYNG.exe" -Destination $tempFolderPath
+    Copy-Item "$($SolutionDir)mRemoteV1\Resources\PuTTYNG.exe" -Destination $tempFolderPath
 
-    #Write-Output "$($SolutionDir)mRemoteNG\bin\$ConfigurationName" 
-    #Write-Output "$($SolutionDir)mRemoteNG\bin\package"
-    Copy-Item "$($SolutionDir)mRemoteNG\bin\$ConfigurationName\*" -Destination $tempFolderPath -Recurse  -Force
+    #Write-Output "$($SolutionDir)mRemoteV1\bin\$ConfigurationName" 
+    #Write-Output "$($SolutionDir)mRemoteV1\bin\package"
+    Copy-Item "$($SolutionDir)mRemoteV1\bin\$ConfigurationName\*" -Destination $tempFolderPath -Recurse  -Force
     # Delete any PDB files that accidentally get copied into the temp folder
     Get-ChildItem -Path $tempFolderPath -Filter "*.pdb" | Remove-Item
     Copy-Item "$($SolutionDir)*.txt" -Destination $tempFolderPath

Tools/zip_portable_files_appv.ps1

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

Tools/zip_symbols.ps1

@@ -33,7 +33,7 @@ $SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe"
 if ($ConfigurationName -match "Release") {
     Write-Output "Packaging debug symbols"
    
-    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteNG\bin\$($ConfigurationName)\mRemoteNG.exe"
+    $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteV1\bin\$($ConfigurationName)\mRemoteNG.exe"
 
     Write-Output "Version is $($version)"
 

appveyor.yml

@@ -0,0 +1,28 @@
+version: 1.76.{build}
+pull_requests:
+  do_not_increment_build_number: true
+image: Visual Studio 2017
+configuration:
+- Release
+- Release Portable
+- Release Installer
+platform: x86
+clone_depth: 1
+install:
+- ps: C:\projects\mremoteng\mRemoteV1\Resources\CitrixReceiver.exe DONOTSTARTCC=1 ENABLE_SSON="No" /silent | out-null
+before_build:
+- cmd: nuget restore
+build:
+  project: mRemoteV1.sln
+  verbosity: normal
+after_build:
+- ps: "if([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) {\n    Write-Output \"NOT running via Appveyor - Exiting\"\n    Exit\n}\n\n$appvDir = $Env:APPVEYOR_BUILD_FOLDER\n\nWrite-Output \"Appveyor Build Dir: '$($appvDir)'\"\n$ConfigurationName = $Env:CONFIGURATION.Trim()\nWrite-Output \"Config Name (tirmmed): '$($ConfigurationName)'\"\n\n\n$SIGCHECK=\"$($SolutionDir)Tools\\exes\\sigcheck.exe\"\n$SEVENZIP=\"$($SolutionDir)Tools\\7zip\\7za.exe\"\n\nif ($ConfigurationName -eq \"Release Portable\") {\n    Write-Output \"Packaging Release Portable ZIP\"\n   \n    $version = & $SIGCHECK /accepteula -q -n \"$($SolutionDir)mRemoteV1\\bin\\$($ConfigurationName)\\mRemoteNG.exe\"\n\n    Write-Output \"Version is $($version)\"\n\n    $PortableZip=\"$($SolutionDir)Release\\mRemoteNG-Portable-$($version).zip\"\n\n    Remove-Item -Recurse \"$($SolutionDir)mRemoteV1\\bin\\package\" -ErrorAction SilentlyContinue | Out-Null\n    New-Item \"$($SolutionDir)mRemoteV1\\bin\\package\" -ItemType  \"directory\" | Out-Null\n    \n    Copy-Item \"$($SolutionDir)mRemoteV1\\Resources\\PuTTYNG.exe\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\"\n\n    Copy-Item \"$($SolutionDir)mRemoteV1\\bin\\$ConfigurationName\\*\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\" -Recurse  -Force \n    Copy-Item \"$($SolutionDir)*.txt\" -Destination \"$($SolutionDir)mRemoteV1\\bin\\package\"\n\n    Write-Output \"Creating portable ZIP file $($PortableZip)\"\n    Remove-Item -Force  $PortableZip -ErrorAction SilentlyContinue\n    & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip \"$($SolutionDir)mRemoteV1\\bin\\package\\*.*\"\n}\nelse {\n    Write-Output \"We will not zip anything - this isnt a portable release build.\"\n}"
+test:
+  assemblies:
+    only:
+    - mRemoteNGTests\bin\$(configuration)\mRemoteNGTests.dll
+artifacts:
+- path: Release\*.msi
+  name: mRemoteNG-installer.msi
+- path: Release\*.zip
+  name: mRemoteNG-portable.zip

mRemoteNG.Specs/App.config

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
+  </configSections>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.16.0.0" newVersion="2.16.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
+  <specFlow>
+    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
+    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
+    <unitTestProvider name="NUnit" />
+  </specFlow>
+</configuration>

mRemoteNG.Specs/Features/CredentialRepository.feature.cs

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

mRemoteNG.Specs/Features/CredentialRepositoryList.feature.cs

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

mRemoteNG.Specs/Properties/AssemblyInfo.cs

@@ -1,14 +1,15 @@
 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("mRemoteNGSpecs")]
+[assembly: AssemblyTitle("mRemoteNG.Specs")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("mRemoteNGSpecs")]
+[assembly: AssemblyProduct("mRemoteNG.Specs")]
 [assembly: AssemblyCopyright("Copyright ©  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

mRemoteNG.Specs/StepDefinitions/CredentialRepositoryListSteps.cs

@@ -1,10 +1,10 @@
 using System.Linq;
 using mRemoteNG.Credential.Repositories;
-using mRemoteNGSpecs.Utilities;
+using mRemoteNG.Specs.Utilities;
 using NUnit.Framework;
 using TechTalk.SpecFlow;
 
-namespace mRemoteNGSpecs.StepDefinitions
+namespace mRemoteNG.Specs.StepDefinitions
 {
     [Binding]
     public class CredentialRepositoryListSteps

mRemoteNG.Specs/StepDefinitions/CredentialRepositorySteps.cs

@@ -1,11 +1,11 @@
 using System.Security;
 using mRemoteNG.Credential;
 using mRemoteNG.Security;
-using mRemoteNGSpecs.Utilities;
+using mRemoteNG.Specs.Utilities;
 using NUnit.Framework;
 using TechTalk.SpecFlow;
 
-namespace mRemoteNGSpecs.StepDefinitions
+namespace mRemoteNG.Specs.StepDefinitions
 {
     [Binding]
     public class CredentialRepositorySteps

mRemoteNG.Specs/Utilities/CredRepoXmlFileBuilder.cs

@@ -1,4 +1,4 @@
-namespace mRemoteNGSpecs.Utilities
+namespace mRemoteNG.Specs.Utilities
 {
     public class CredRepoXmlFileBuilder
     {

mRemoteNG.Specs/Utilities/XmlCredentialRepoBuilder.cs

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

mRemoteNG.Specs/mRemoteNG.Specs.csproj

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>mRemoteNG.Specs</RootNamespace>
+    <AssemblyName>mRemoteNG.Specs</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <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|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="TechTalk.SpecFlow, Version=2.2.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
+      <HintPath>..\packages\SpecFlow.2.2.1\lib\net45\TechTalk.SpecFlow.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Features\CredentialRepository.feature.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>CredentialRepository.feature</DependentUpon>
+    </Compile>
+    <Compile Include="Features\CredentialRepositoryList.feature.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>CredentialRepositoryList.feature</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StepDefinitions\CredentialRepositoryListSteps.cs" />
+    <Compile Include="StepDefinitions\CredentialRepositorySteps.cs" />
+    <Compile Include="Utilities\CredRepoXmlFileBuilder.cs" />
+    <Compile Include="Utilities\XmlCredentialRepoBuilder.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="Features\CredentialRepository.feature">
+      <Generator>SpecFlowSingleFileGenerator</Generator>
+      <LastGenOutput>CredentialRepository.feature.cs</LastGenOutput>
+    </None>
+    <None Include="Features\CredentialRepositoryList.feature">
+      <Generator>SpecFlowSingleFileGenerator</Generator>
+      <LastGenOutput>CredentialRepositoryList.feature.cs</LastGenOutput>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mRemoteV1\mRemoteV1.csproj">
+      <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
+      <Name>mRemoteV1</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

mRemoteNG.Specs/packages.config

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

mRemoteNG/.editorconfig

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

mRemoteNG/App/Export.cs

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

mRemoteNG/App/Info/GeneralAppInfo.cs

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

mRemoteNG/App/Info/SettingsFileInfo.cs

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

mRemoteNG/App/Initialization/MessageCollectorSetup.cs

@@ -1,75 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using mRemoteNG.Messages;
-using mRemoteNG.Messages.MessageFilteringOptions;
-using mRemoteNG.Messages.MessageWriters;
-using mRemoteNG.Messages.WriterDecorators;
-
-namespace mRemoteNG.App.Initialization
-{
-    public class MessageCollectorSetup
-    {
-        public static void SetupMessageCollector(MessageCollector messageCollector,
-                                                 IList<IMessageWriter> messageWriterList)
-        {
-            messageCollector.CollectionChanged += (o, args) =>
-            {
-                var messages = args.NewItems.Cast<IMessage>().ToArray();
-                foreach (var printer in messageWriterList)
-                    foreach (var message in messages)
-                        printer.Write(message);
-            };
-        }
-
-        public static void BuildMessageWritersFromSettings(IList<IMessageWriter> messageWriterList)
-        {
-#if DEBUG
-            messageWriterList.Add(BuildDebugConsoleWriter());
-#endif
-            messageWriterList.Add(BuildTextLogMessageWriter());
-            messageWriterList.Add(BuildNotificationPanelMessageWriter());
-            messageWriterList.Add(BuildPopupMessageWriter());
-        }
-
-        private static IMessageWriter BuildDebugConsoleWriter()
-        {
-            return new DebugConsoleMessageWriter();
-        }
-
-        private static IMessageWriter BuildTextLogMessageWriter()
-        {
-            return new MessageTypeFilterDecorator(
-                                                  new LogMessageTypeFilteringOptions(),
-                                                  new TextLogMessageWriter(Logger.Instance)
-                                                 );
-        }
-
-        private static IMessageWriter BuildNotificationPanelMessageWriter()
-        {
-            return new OnlyLogMessageFilter(
-                                            new MessageTypeFilterDecorator(
-                                                                           new
-                                                                               NotificationPanelMessageFilteringOptions(),
-                                                                           new MessageFocusDecorator(
-                                                                                                     Windows.ErrorsForm,
-                                                                                                     new
-                                                                                                         NotificationPanelSwitchOnMessageFilteringOptions(),
-                                                                                                     new
-                                                                                                         NotificationPanelMessageWriter(Windows
-                                                                                                                                            .ErrorsForm)
-                                                                                                    )
-                                                                          )
-                                           );
-        }
-
-        private static IMessageWriter BuildPopupMessageWriter()
-        {
-            return new OnlyLogMessageFilter(
-                                            new MessageTypeFilterDecorator(
-                                                                           new PopupMessageFilteringOptions(),
-                                                                           new PopupMessageWriter()
-                                                                          )
-                                           );
-        }
-    }
-}

mRemoteNG/App/SupportedCultures.cs

@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime.Serialization;
-using mRemoteNG.Properties;
-
-// ReSharper disable ArrangeAccessorOwnerBody
-
-namespace mRemoteNG.App
-{
-    [Serializable]
-    public sealed class SupportedCultures : Dictionary<string, string>
-    {
-        private static SupportedCultures _Instance;
-
-        private static SupportedCultures SingletonInstance
-        {
-            get { return _Instance ?? (_Instance = new SupportedCultures()); }
-        }
-
-
-        private SupportedCultures()
-        {
-            foreach (var CultureName in Settings.Default.SupportedUICultures.Split(','))
-            {
-                try
-                {
-                    var CultureInfo = new CultureInfo(CultureName.Trim());
-                    Add(CultureInfo.Name, CultureInfo.TextInfo.ToTitleCase(CultureInfo.NativeName));
-                }
-                catch (Exception ex)
-                {
-                    Debug.Print(
-                                $"An exception occurred while adding the culture {CultureName} to the list of supported cultures. {ex.StackTrace}");
-                }
-            }
-        }
-
-        // fix CA2229 - https://docs.microsoft.com/en-us/visualstudio/code-quality/ca2229-implement-serialization-constructors?view=vs-2017
-        private SupportedCultures(SerializationInfo info, StreamingContext context)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static bool IsNameSupported(string CultureName)
-        {
-            return SingletonInstance.ContainsKey(CultureName);
-        }
-
-        public static bool IsNativeNameSupported(string CultureNativeName)
-        {
-            return SingletonInstance.ContainsValue(CultureNativeName);
-        }
-
-        public static string get_CultureName(string CultureNativeName)
-        {
-            var Names = new string[SingletonInstance.Count + 1];
-            var NativeNames = new string[SingletonInstance.Count + 1];
-
-            SingletonInstance.Keys.CopyTo(Names, 0);
-            SingletonInstance.Values.CopyTo(NativeNames, 0);
-
-            for (var Index = 0; Index <= SingletonInstance.Count; Index++)
-            {
-                if (NativeNames[Index] == CultureNativeName)
-                {
-                    return Names[Index];
-                }
-            }
-
-            throw (new KeyNotFoundException());
-        }
-
-        public static string get_CultureNativeName(string CultureName)
-        {
-            return SingletonInstance[CultureName];
-        }
-
-        public static List<string> CultureNativeNames
-        {
-            get
-            {
-                var ValueList = new List<string>();
-                foreach (var Value in SingletonInstance.Values)
-                {
-                    ValueList.Add(Value);
-                }
-
-                return ValueList;
-            }
-        }
-    }
-}

mRemoteNG/Config/ConfirmCloseEnum.cs

@@ -1,11 +0,0 @@
-namespace mRemoteNG.Config
-{
-    public enum ConfirmCloseEnum
-    {
-        Unspecified = 0,
-        Never = 1,
-        Exit = 2,
-        Multiple = 3,
-        All = 4
-    }
-}

mRemoteNG/Config/DataProviders/SqlDataProvider.cs

@@ -1,114 +0,0 @@
-using System.Data;
-using mRemoteNG.Config.DatabaseConnectors;
-using mRemoteNG.Messages;
-using mRemoteNG.App;
-using MySql.Data.MySqlClient;
-using System.Data.SqlClient;
-
-namespace mRemoteNG.Config.DataProviders
-{
-    public class SqlDataProvider : IDataProvider<DataTable>
-    {
-        public IDatabaseConnector DatabaseConnector { get; }
-
-        public SqlDataProvider(IDatabaseConnector databaseConnector)
-        {
-            DatabaseConnector = databaseConnector;
-        }
-
-        public DataTable Load()
-        {
-            var dataTable = new DataTable();
-            var dbQuery = DatabaseConnector.DbCommand("SELECT * FROM tblCons ORDER BY PositionID ASC");
-            DatabaseConnector.AssociateItemToThisConnector(dbQuery);
-            if (!DatabaseConnector.IsConnected)
-                OpenConnection();
-            var dbDataReader = dbQuery.ExecuteReader(CommandBehavior.CloseConnection);
-
-            if (dbDataReader.HasRows)
-                dataTable.Load(dbDataReader);
-            dbDataReader.Close();
-            return dataTable;
-        }
-
-        public void Save(DataTable dataTable)
-        {
-            if (DbUserIsReadOnly())
-            {
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                    "Trying to save connections but the SQL read only checkbox is checked, aborting!");
-                return;
-            }
-
-            if (!DatabaseConnector.IsConnected)
-                OpenConnection();
-            if (DatabaseConnector.GetType() == typeof(MSSqlDatabaseConnector))
-            {
-                SqlConnection sqlConnection = (SqlConnection)DatabaseConnector.DbConnection();
-                using (SqlTransaction transaction = sqlConnection.BeginTransaction(System.Data.IsolationLevel.Serializable))
-                {
-                    using (SqlCommand sqlCommand = new SqlCommand())
-                    {
-                        sqlCommand.Connection = sqlConnection;
-                        sqlCommand.Transaction = transaction;
-                        sqlCommand.CommandText = "SELECT * FROM tblCons";
-                        using (SqlDataAdapter dataAdpater = new SqlDataAdapter())
-                        {
-                            dataAdpater.SelectCommand = sqlCommand;
-
-                            SqlCommandBuilder builder = new SqlCommandBuilder(dataAdpater);
-                            // Avoid optimistic concurrency, check if it is necessary.
-                            builder.ConflictOption = ConflictOption.OverwriteChanges;
-
-                            dataAdpater.UpdateCommand = builder.GetUpdateCommand();
-
-                            dataAdpater.DeleteCommand = builder.GetDeleteCommand();
-                            dataAdpater.InsertCommand = builder.GetInsertCommand();
-
-                            dataAdpater.Update(dataTable);
-                            transaction.Commit();
-                        }
-                    }
-                }
-
-            }
-            else if (DatabaseConnector.GetType() == typeof(MySqlDatabaseConnector))
-            {
-                var dbConnection = (MySqlConnection) DatabaseConnector.DbConnection();
-                using (MySqlTransaction transaction = dbConnection.BeginTransaction(System.Data.IsolationLevel.Serializable))
-                {
-                    using (MySqlCommand sqlCommand = new MySqlCommand())
-                    {
-                        sqlCommand.Connection = dbConnection;
-                        sqlCommand.Transaction = transaction;
-                        sqlCommand.CommandText = "SELECT * FROM tblCons";
-                        using (MySqlDataAdapter dataAdapter = new MySqlDataAdapter(sqlCommand))
-                        {
-                            dataAdapter.UpdateBatchSize = 1000;
-                            using (MySqlCommandBuilder cb = new MySqlCommandBuilder(dataAdapter))
-                            {
-                                dataAdapter.Update(dataTable);
-                                transaction.Commit();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public void OpenConnection()
-        {
-            DatabaseConnector.Connect();
-        }
-
-        public void CloseConnection()
-        {
-            DatabaseConnector.Disconnect();
-        }
-
-        private bool DbUserIsReadOnly()
-        {
-            return Properties.Settings.Default.SQLReadOnly;
-        }
-    }
-}

mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs

@@ -1,32 +0,0 @@
-using mRemoteNG.App;
-using mRemoteNG.Security.SymmetricEncryption;
-
-namespace mRemoteNG.Config.DatabaseConnectors
-{
-    public class DatabaseConnectorFactory
-    {
-        public static IDatabaseConnector DatabaseConnectorFromSettings()
-        {
-            var sqlType = Properties.Settings.Default.SQLServerType;
-            var sqlHost = Properties.Settings.Default.SQLHost;
-            var sqlCatalog = Properties.Settings.Default.SQLDatabaseName;
-            var sqlUsername = Properties.Settings.Default.SQLUser;
-            var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-            var sqlPassword = cryptographyProvider.Decrypt(Properties.Settings.Default.SQLPass, Runtime.EncryptionKey);
-
-            return DatabaseConnector(sqlType, sqlHost, sqlCatalog, sqlUsername, sqlPassword);
-        }
-
-        public static IDatabaseConnector DatabaseConnector(string type, string server, string database, string username, string password)
-        {
-            switch (type)
-            {
-                case "mysql":
-                    return new MySqlDatabaseConnector(server, database, username, password);
-                case "mssql":
-                default:
-                    return new MSSqlDatabaseConnector(server, database, username, password);
-            }
-        }
-    }
-}

mRemoteNG/Config/DatabaseConnectors/IDatabaseConnector.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Data.Common;
-using System.Threading.Tasks;
-
-namespace mRemoteNG.Config.DatabaseConnectors
-{
-    public interface IDatabaseConnector : IDisposable
-    {
-        DbConnection DbConnection();
-        DbCommand DbCommand(string dbCommand);
-        bool IsConnected { get; }
-        void Connect();
-        Task ConnectAsync();
-        void Disconnect();
-        void AssociateItemToThisConnector(DbCommand dbCommand);
-    }
-}

mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs

@@ -1,96 +0,0 @@
-using System.Data;
-using System.Data.Common;
-using System.Data.SqlClient;
-using System.Threading.Tasks;
-
-// ReSharper disable ArrangeAccessorOwnerBody
-
-namespace mRemoteNG.Config.DatabaseConnectors
-{
-    public class MSSqlDatabaseConnector : IDatabaseConnector
-    {
-        private DbConnection _dbConnection { get; set; } = default(SqlConnection);
-        private string _dbConnectionString = "";
-        private readonly string _dbHost;
-        private readonly string _dbCatalog;
-        private readonly string _dbUsername;
-        private readonly string _dbPassword;
-
-        public DbConnection DbConnection()
-        {
-            return _dbConnection;
-        }
-
-        public DbCommand DbCommand(string dbCommand)
-        {
-            return new SqlCommand(dbCommand, (SqlConnection) _dbConnection);
-        }
-
-        public bool IsConnected => (_dbConnection.State == ConnectionState.Open);
-
-        public MSSqlDatabaseConnector(string sqlServer, string catalog, string username, string password)
-        {
-            _dbHost = sqlServer;
-            _dbCatalog = catalog;
-            _dbUsername = username;
-            _dbPassword = password;
-            Initialize();
-        }
-
-        private void Initialize()
-        {
-            BuildSqlConnectionString();
-            _dbConnection = new SqlConnection(_dbConnectionString);
-        }
-
-        private void BuildSqlConnectionString()
-        {
-            if (_dbUsername != "")
-                BuildDbConnectionStringWithCustomCredentials();
-            else
-                BuildDbConnectionStringWithDefaultCredentials();
-        }
-
-        private void BuildDbConnectionStringWithCustomCredentials()
-        {
-            _dbConnectionString = $"Data Source={_dbHost};Initial Catalog={_dbCatalog};User Id={_dbUsername};Password={_dbPassword}";
-        }
-
-        private void BuildDbConnectionStringWithDefaultCredentials()
-        {
-            _dbConnectionString = $"Data Source={_dbHost};Initial Catalog={_dbCatalog};Integrated Security=True";
-        }
-
-        public void Connect()
-        {
-            _dbConnection.Open();
-        }
-
-        public async Task ConnectAsync()
-        {
-            await _dbConnection.OpenAsync();
-        }
-
-        public void Disconnect()
-        {
-            _dbConnection.Close();
-        }
-
-        public void AssociateItemToThisConnector(DbCommand dbCommand)
-        {
-            dbCommand.Connection = (SqlConnection) _dbConnection;
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        private void Dispose(bool itIsSafeToFreeManagedObjects)
-        {
-            if (!itIsSafeToFreeManagedObjects) return;
-            _dbConnection.Close();
-            _dbConnection.Dispose();
-        }
-    }
-}

mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs

@@ -1,85 +0,0 @@
-using System.Data;
-using System.Data.Common;
-using System.Threading.Tasks;
-using MySql.Data.MySqlClient;
-
-// ReSharper disable ArrangeAccessorOwnerBody
-
-namespace mRemoteNG.Config.DatabaseConnectors
-{
-    public class MySqlDatabaseConnector : IDatabaseConnector
-    {
-        private DbConnection _dbConnection { get; set; } = default(MySqlConnection);
-        private string _dbConnectionString = "";
-        private readonly string _dbHost;
-        private readonly string _dbPort;
-        private readonly string _dbName;
-        private readonly string _dbUsername;
-        private readonly string _dbPassword;
-
-        public DbConnection DbConnection()
-        {
-            return _dbConnection;
-        }
-
-        public DbCommand DbCommand(string dbCommand)
-        {
-            return new MySqlCommand(dbCommand, (MySqlConnection) _dbConnection);
-        }
-
-        public bool IsConnected => (_dbConnection.State == ConnectionState.Open);
-
-        public MySqlDatabaseConnector(string host, string database, string username, string password)
-        {
-            string[] hostParts = host.Split(new char[]{':'}, 2);
-            _dbHost = hostParts[0];
-            _dbPort = (hostParts.Length == 2)?hostParts[1]:"3306";
-            _dbName = database;
-            _dbUsername = username;
-            _dbPassword = password;
-            Initialize();
-        }
-
-        private void Initialize()
-        {
-            BuildSqlConnectionString();
-            _dbConnection = new MySqlConnection(_dbConnectionString);
-        }
-
-        private void BuildSqlConnectionString()
-        {
-            _dbConnectionString = $"server={_dbHost};user={_dbUsername};database={_dbName};port={_dbPort};password={_dbPassword}";
-        }
-
-        public void Connect()
-        {
-            _dbConnection.Open();
-        }
-
-        public async Task ConnectAsync()
-        {
-            await _dbConnection.OpenAsync();
-        }
-
-        public void Disconnect()
-        {
-            _dbConnection.Close();
-        }
-
-        public void AssociateItemToThisConnector(DbCommand dbCommand)
-        {
-            dbCommand.Connection = (MySqlConnection) _dbConnection;
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-        private void Dispose(bool itIsSafeToFreeManagedObjects)
-        {
-            if (!itIsSafeToFreeManagedObjects) return;
-            _dbConnection.Close();
-            _dbConnection.Dispose();
-        }
-    }
-}

mRemoteNG/Config/Import/ActiveDirectoryImporter.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Linq;
-using mRemoteNG.App;
-using mRemoteNG.Config.Serializers.MiscSerializers;
-using mRemoteNG.Container;
-using mRemoteNG.Tools;
-
-namespace mRemoteNG.Config.Import
-{
-    public class ActiveDirectoryImporter : IConnectionImporter<string>
-    {
-        public void Import(string ldapPath, ContainerInfo destinationContainer)
-        {
-            Import(ldapPath, destinationContainer, false);
-        }
-
-        public static void Import(string ldapPath, ContainerInfo destinationContainer, bool importSubOu)
-        {
-            try
-            {
-                ldapPath.ThrowIfNullOrEmpty(nameof(ldapPath));
-                var deserializer = new ActiveDirectoryDeserializer(ldapPath, importSubOu);
-                var connectionTreeModel = deserializer.Deserialize();
-                var importedRootNode = connectionTreeModel.RootNodes.First();
-                if (importedRootNode == null) return;
-                var childrenToAdd = importedRootNode.Children.ToArray();
-                destinationContainer.AddChildRange(childrenToAdd);
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddExceptionMessage("Config.Import.ActiveDirectory.Import() failed.", ex);
-            }
-        }
-    }
-}

mRemoteNG/Config/Import/MRemoteNGXmlImporter.cs

@@ -1,37 +0,0 @@
-using System.IO;
-using System.Linq;
-using mRemoteNG.App;
-using mRemoteNG.Config.DataProviders;
-using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml;
-using mRemoteNG.Container;
-using mRemoteNG.Messages;
-
-
-namespace mRemoteNG.Config.Import
-{
-    // ReSharper disable once InconsistentNaming
-    public class MRemoteNGXmlImporter : IConnectionImporter<string>
-    {
-        public void Import(string fileName, ContainerInfo destinationContainer)
-        {
-            if (fileName == null)
-            {
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "Unable to import file. File path is null.");
-                return;
-            }
-
-            if (!File.Exists(fileName))
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    $"Unable to import file. File does not exist. Path: {fileName}");
-
-            var dataProvider = new FileDataProvider(fileName);
-            var xmlString = dataProvider.Load();
-            var xmlConnectionsDeserializer = new XmlConnectionsDeserializer();
-            var connectionTreeModel = xmlConnectionsDeserializer.Deserialize(xmlString, true);
-
-            var rootImportContainer = new ContainerInfo {Name = Path.GetFileNameWithoutExtension(fileName)};
-            rootImportContainer.AddChildRange(connectionTreeModel.RootNodes.First().Children.ToArray());
-            destinationContainer.AddChild(rootImportContainer);
-        }
-    }
-}

mRemoteNG/Config/Putty/PuttySessionsManager.cs

@@ -1,168 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using mRemoteNG.Tools;
-using mRemoteNG.Tree.Root;
-
-// ReSharper disable ArrangeAccessorOwnerBody
-
-namespace mRemoteNG.Config.Putty
-{
-    public class PuttySessionsManager
-    {
-        public static PuttySessionsManager Instance { get; } = new PuttySessionsManager();
-
-        private readonly List<AbstractPuttySessionsProvider> _providers = new List<AbstractPuttySessionsProvider>();
-
-        public IEnumerable<AbstractPuttySessionsProvider> Providers => _providers;
-
-        public List<RootPuttySessionsNodeInfo> RootPuttySessionsNodes { get; } = new List<RootPuttySessionsNodeInfo>();
-
-        private PuttySessionsManager()
-        {
-            AddProvider(new PuttySessionsRegistryProvider());
-        }
-
-
-        #region Public Methods
-
-        public void AddSessions()
-        {
-            foreach (var provider in Providers)
-            {
-                AddSessionsFromProvider(provider);
-            }
-        }
-
-        private void AddSessionsFromProvider(AbstractPuttySessionsProvider puttySessionProvider)
-        {
-            puttySessionProvider.ThrowIfNull(nameof(puttySessionProvider));
-
-            var rootTreeNode = puttySessionProvider.RootInfo;
-            puttySessionProvider.GetSessions();
-
-            if (!RootPuttySessionsNodes.Contains(rootTreeNode) && rootTreeNode.HasChildren())
-                RootPuttySessionsNodes.Add(rootTreeNode);
-            rootTreeNode.SortRecursive();
-        }
-
-        public void StartWatcher()
-        {
-            foreach (var provider in Providers)
-            {
-                provider.StartWatcher();
-                provider.PuttySessionChanged += PuttySessionChanged;
-            }
-        }
-
-        public void StopWatcher()
-        {
-            foreach (var provider in Providers)
-            {
-                provider.StopWatcher();
-                provider.PuttySessionChanged -= PuttySessionChanged;
-            }
-        }
-
-        public void AddProvider(AbstractPuttySessionsProvider newProvider)
-        {
-            if (_providers.Contains(newProvider)) return;
-            _providers.Add(newProvider);
-            newProvider.PuttySessionsCollectionChanged += RaisePuttySessionCollectionChangedEvent;
-            RaiseSessionProvidersCollectionChangedEvent(
-                                                        new
-                                                            NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add,
-                                                                                             newProvider));
-        }
-
-        public void AddProviders(IEnumerable<AbstractPuttySessionsProvider> newProviders)
-        {
-            foreach (var provider in newProviders)
-                AddProvider(provider);
-        }
-
-        public void RemoveProvider(AbstractPuttySessionsProvider providerToRemove)
-        {
-            if (!_providers.Contains(providerToRemove)) return;
-            _providers.Remove(providerToRemove);
-            providerToRemove.PuttySessionsCollectionChanged -= RaisePuttySessionCollectionChangedEvent;
-            RaiseSessionProvidersCollectionChangedEvent(
-                                                        new
-                                                            NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove,
-                                                                                             providerToRemove));
-        }
-
-        public void PuttySessionChanged(object sender, PuttySessionChangedEventArgs e)
-        {
-            AddSessions();
-        }
-
-        #endregion
-
-        #region Private Methods
-
-        private string[] GetSessionNames(bool raw = false)
-        {
-            var sessionNames = new List<string>();
-            foreach (var provider in Providers)
-            {
-                if (!IsProviderEnabled(provider))
-                {
-                    continue;
-                }
-
-                sessionNames.AddRange(provider.GetSessionNames(raw));
-            }
-
-            return sessionNames.ToArray();
-        }
-
-        private bool IsProviderEnabled(AbstractPuttySessionsProvider puttySessionsProvider)
-        {
-            var enabled = true;
-            if (!(puttySessionsProvider is PuttySessionsRegistryProvider)) enabled = false;
-
-            return enabled;
-        }
-
-        #endregion
-
-        #region Public Classes
-
-        public class SessionList : StringConverter
-        {
-            public static string[] Names => Instance.GetSessionNames();
-
-            public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
-            {
-                return new StandardValuesCollection(Names);
-            }
-
-            public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
-            {
-                return true;
-            }
-
-            public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
-            {
-                return true;
-            }
-        }
-
-        #endregion
-
-        public event NotifyCollectionChangedEventHandler PuttySessionsCollectionChanged;
-
-        protected void RaisePuttySessionCollectionChangedEvent(object sender, NotifyCollectionChangedEventArgs args)
-        {
-            PuttySessionsCollectionChanged?.Invoke(sender, args);
-        }
-
-        public event NotifyCollectionChangedEventHandler SessionProvidersCollectionChanged;
-
-        protected void RaiseSessionProvidersCollectionChangedEvent(NotifyCollectionChangedEventArgs args)
-        {
-            SessionProvidersCollectionChanged?.Invoke(this, args);
-        }
-    }
-}