diff --git a/mRemoteNG.sln b/mRemoteNG.sln
index 86d0d2f3..724b8bcd 100644
--- a/mRemoteNG.sln
+++ b/mRemoteNG.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 14.0.25420.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mRemoteNGInstaller", "mRemoteNGInstaller", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}"
 EndProject
@@ -16,108 +16,60 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "mRemoteNGInsta
 		{5423D985-CB48-4344-B47F-E8C6D60C8B04} = {5423D985-CB48-4344-B47F-E8C6D60C8B04}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug Portable|Any CPU = Debug Portable|Any CPU
-		Debug Portable|x86 = Debug Portable|x86
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release Installer|Any CPU = Release Installer|Any CPU
-		Release Installer|x86 = Release Installer|x86
-		Release Portable|Any CPU = Release Portable|Any CPU
-		Release Portable|x86 = Release Portable|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
+		Debug Portable|x64 = Debug Portable|x64
+		Debug|x64 = Debug|x64
+		Release Installer|x64 = Release Installer|x64
+		Release Portable|x64 = Release Portable|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.Build.0 = Debug Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.ActiveCfg = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.Build.0 = Debug|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.Build.0 = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.ActiveCfg = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.Build.0 = Release Portable|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.ActiveCfg = Release|x86
-		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.Build.0 = Debug Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.ActiveCfg = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.Build.0 = Debug|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.ActiveCfg = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.Build.0 = Release Portable|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.ActiveCfg = Release|x86
-		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x86.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.ActiveCfg = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.Build.0 = Debug|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x86.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86
-		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x86.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x86.ActiveCfg = Debug Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x86.ActiveCfg = Debug|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.Build.0 = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x86.ActiveCfg = Release Portable|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.ActiveCfg = Release|x86
-		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.ActiveCfg = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.Build.0 = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.Build.0 = Debug|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.Build.0 = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.ActiveCfg = Release|x86
-		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.Build.0 = Release|x86
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.Build.0 = Debug Portable|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.ActiveCfg = Debug|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.Build.0 = Debug|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.ActiveCfg = Release|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.Build.0 = Release|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.ActiveCfg = Release Portable|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.Build.0 = Release Portable|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.ActiveCfg = Release|x64
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.Build.0 = Release|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.ActiveCfg = Debug Portable|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.Build.0 = Debug Portable|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.ActiveCfg = Debug|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.Build.0 = Debug|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.ActiveCfg = Release|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.Build.0 = Release|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.ActiveCfg = Release Portable|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.Build.0 = Release Portable|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.ActiveCfg = Release|x64
+		{1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.Build.0 = Release|x64
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.Build.0 = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.Build.0 = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x86
+		{5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.Build.0 = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.ActiveCfg = Debug Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.Build.0 = Debug Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.ActiveCfg = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.Build.0 = Release|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.ActiveCfg = Release Portable|x86
+		{F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x86
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.ActiveCfg = Release|x64
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.Build.0 = Release|x64
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.ActiveCfg = Debug|x64
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.ActiveCfg = Release|x64
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.Build.0 = Release|x64
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.ActiveCfg = Release|x64
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.Build.0 = Release|x64
+		{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index c08004c1..f11e3252 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -1,1492 +1,278 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4934A491-40BC-4E5B-9166-EA1169A220F6}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <StartupObject>mRemoteNG.App.ProgramRoot</StartupObject>
-    <RootNamespace>mRemoteNG</RootNamespace>
-    <AssemblyName>mRemoteNG</AssemblyName>
-    <MyType>WindowsForms</MyType>
-    <OptionExplicit>On</OptionExplicit>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-    <ApplicationIcon>Resources\mRemoteNG_Icon.ico</ApplicationIcon>
-    <OptionStrict>Off</OptionStrict>
-    <ManifestCertificateThumbprint>B249710A6BB08171F8E75082CF2355AE2890911A</ManifestCertificateThumbprint>
-    <ManifestKeyFile>mRemoteV1_TemporaryKey.pfx</ManifestKeyFile>
-    <GenerateManifests>false</GenerateManifests>
-    <SignManifests>false</SignManifests>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <ResolveComReferenceSilent>True</ResolveComReferenceSilent>
-    <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.64.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ApplicationIcon>Icons\mRemoteNG.ico</ApplicationIcon>
+    <Version>1.77.2</Version>
+    <Description>Multi-protocol remote connections manager</Description>
+    <Copyright>2020 mRemoteNG Dev Team, 2010-2013 Riley McArdle, 2007-2009 Felix Deimel</Copyright>
+    <PackageLicenseFile>COPYING.TXT</PackageLicenseFile>
+    <PackageProjectUrl>https://mremoteng.org/</PackageProjectUrl>
+    <Platforms>AnyCPU;ARM64;x64</Platforms>
+    <Configurations>Debug;Release;Debug Portable;Release Portable;Release Installer</Configurations>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DefineConstants>DEBUG</DefineConstants>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+    <OutputPath>bin\Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DefineConstants />
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Portable|x64'">
+    <DefineConstants>DEBUG;PORTABLE</DefineConstants>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug Portable\</OutputPath>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Portable|x64'">
+    <DefineConstants>PORTABLE</DefineConstants>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release Portable\</OutputPath>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningsAsErrors />
+  </PropertyGroup>
+
   <ItemGroup>
-    <Folder Include="Credential\Records\" />
+    <None Remove="buildenv.tmp" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="App\CompatibilityChecker.cs" />
-    <Compile Include="App\Info\GeneralAppInfo.cs" />
-    <Compile Include="App\Initialization\ConnectionIconLoader.cs" />
-    <Compile Include="App\Initialization\CredsAndConsSetup.cs" />
-    <Compile Include="App\Initialization\StartupDataLogger.cs" />
-    <Compile Include="App\Logger.cs" />
-    <Compile Include="App\Initialization\MessageCollectorSetup.cs" />
-    <Compile Include="App\NativeMethods.cs" />
-    <Compile Include="App\Runtime.cs" />
-    <Compile Include="App\Screens.cs" />
-    <Compile Include="App\Shutdown.cs" />
-    <Compile Include="App\Startup.cs" />
-    <Compile Include="App\SupportedCultures.cs" />
-    <Compile Include="App\Update\AppUpdater.cs" />
-    <Compile Include="App\Export.cs" />
-    <Compile Include="App\Import.cs" />
-    <Compile Include="App\Info\ConnectionsFileInfo.cs" />
-    <Compile Include="App\Info\CredentialsFileInfo.cs" />
-    <Compile Include="App\Info\SettingsFileInfo.cs" />
-    <Compile Include="App\Info\UpdateChannelInfo.cs" />
-    <Compile Include="App\Update\UpdateFile.cs" />
-    <Compile Include="App\Update\UpdateInfo.cs" />
-    <Compile Include="App\Windows.cs" />
-    <Compile Include="Config\Connections\ConnectionsLoadedEventArgs.cs" />
-    <Compile Include="Config\Connections\ConnectionsSavedEventArgs.cs" />
-    <Compile Include="Config\Connections\CsvConnectionsSaver.cs" />
-    <Compile Include="Config\Connections\IConnectionsLoader.cs" />
-    <Compile Include="Config\Connections\SaveConnectionsOnEdit.cs" />
-    <Compile Include="Config\Connections\SaveFormat.cs" />
-    <Compile Include="Config\Connections\Multiuser\ConnectionsUpdateCheckFinishedEventArgs.cs" />
-    <Compile Include="Config\Connections\Multiuser\IConnectionsUpdateChecker.cs" />
-    <Compile Include="Config\Connections\Multiuser\ConnectionsUpdateAvailableEventArgs.cs" />
-    <Compile Include="Config\Connections\Multiuser\RemoteConnectionsSyncronizer.cs" />
-    <Compile Include="Config\Connections\SqlConnectionsLoader.cs" />
-    <Compile Include="Config\Connections\SqlConnectionsSaver.cs" />
-    <Compile Include="Config\Connections\XmlConnectionsLoader.cs" />
-    <Compile Include="Config\Connections\XmlConnectionsSaver.cs" />
-    <Compile Include="Config\CredentialHarvester.cs" />
-    <Compile Include="Config\CredentialRecordLoader.cs" />
-    <Compile Include="Config\CredentialRecordSaver.cs" />
-    <Compile Include="Config\CredentialRepositoryListSaver.cs" />
-    <Compile Include="Config\DatabaseConnectors\ConnectionTestResult.cs" />
-    <Compile Include="Config\DatabaseConnectors\DatabaseConnectorFactory.cs" />
-    <Compile Include="Config\DatabaseConnectors\DatabaseConnectionTester.cs" />
-    <Compile Include="Config\DatabaseConnectors\MSSqlDatabaseConnector.cs" />
-    <Compile Include="Config\DataProviders\FileBackupCreator.cs" />
-    <Compile Include="Config\DataProviders\FileBackupPruner.cs" />
-    <Compile Include="Config\DataProviders\InMemoryStringDataProvider.cs" />
-    <Compile Include="Config\ILoader.cs" />
-    <Compile Include="Config\Import\MRemoteNGCsvImporter.cs" />
-    <Compile Include="Config\ISaver.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionNodeSerializer27.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\MsSql\LocalConnectionPropertiesModel.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\MsSql\LocalConnectionPropertiesXmlSerializer.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\MsSql\SqlConnectionListMetaData.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionSerializerFactory.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlExtensions.cs" />
-    <Compile Include="Config\Serializers\CredentialProviderSerializer\CredentialRepositoryListDeserializer.cs" />
-    <Compile Include="Config\CredentialRepositoryListLoader.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializer\XmlCredentialPasswordDecryptorDecorator.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializer\XmlCredentialPasswordEncryptorDecorator.cs" />
-    <Compile Include="Config\Serializers\ISecureDeserializer.cs" />
-    <Compile Include="Config\Serializers\ISecureSerializer.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\ActiveDirectoryDeserializer.cs" />
-    <Compile Include="Config\Serializers\CredentialProviderSerializer\CredentialRepositoryListSerializer.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsDeserializerMremotengFormat.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsSerializerMremotengFormat.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\MsSql\DataTableDeserializer.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\MsSql\DataTableSerializer.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\PortScanDeserializer.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\PuttyConnectionManagerDeserializer.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionDeserializer.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManagerDeserializer.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionNodeSerializer26.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\MsSql\SqlDatabaseMetaDataRetriever.cs" />
-    <Compile Include="Config\Serializers\Versioning\IVersionUpgrader.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion22To23Upgrader.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion23To24Upgrader.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion24To25Upgrader.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion25To26Upgrader.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion27To28Upgrader.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion26To27Upgrader.cs" />
-    <Compile Include="Config\Serializers\XmlConnectionsDecryptor.cs" />
-    <Compile Include="Config\DataProviders\FileDataProviderWithRollingBackup.cs" />
-    <Compile Include="Config\DataProviders\SqlDataProvider.cs" />
-    <Compile Include="Config\Serializers\IDeserializer.cs" />
-    <Compile Include="Config\Import\IConnectionImporter.cs" />
-    <Compile Include="Config\Serializers\ISerializer.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentCompiler.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentEncryptor.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsSerializer.cs" />
-    <Compile Include="Config\DataProviders\FileDataProvider.cs" />
-    <Compile Include="Config\DataProviders\IDataProvider.cs" />
-    <Compile Include="Config\Connections\Multiuser\SqlConnectionsUpdateChecker.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDeserializer.cs" />
-    <Compile Include="Config\Putty\PuttySessionChangedEventArgs.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializer\XmlCredentialRecordDeserializer.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializer\XmlCredentialRecordSerializer.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlRootNodeSerializer.cs" />
-    <Compile Include="Config\Serializers\ConfConsEnsureConnectionsHaveIds.cs" />
-    <Compile Include="Config\Settings\DockPanelLayoutSerializer.cs" />
-    <Compile Include="Config\Settings\ExternalAppsLoader.cs" />
-    <Compile Include="Config\Settings\ExternalAppsSaver.cs" />
-    <Compile Include="Config\Settings\DockPanelLayoutLoader.cs" />
-    <Compile Include="Config\Settings\DockPanelLayoutSaver.cs" />
-    <Compile Include="Config\Settings\Providers\ChooseProvider.cs" />
-    <Compile Include="Config\Settings\SettingsLoader.cs" />
-    <Compile Include="Config\Settings\Providers\PortableSettingsProvider.cs" />
-    <Compile Include="Config\Settings\SettingsSaver.cs" />
-    <Compile Include="Config\ConfirmCloseEnum.cs" />
-    <Compile Include="Config\Import\ActiveDirectoryImporter.cs" />
-    <Compile Include="Config\Import\MRemoteNGXmlImporter.cs" />
-    <Compile Include="Config\Import\PortScanImporter.cs" />
-    <Compile Include="Config\Import\PuttyConnectionManagerImporter.cs" />
-    <Compile Include="Config\Import\RemoteDesktopConnectionImporter.cs" />
-    <Compile Include="Config\Import\RemoteDesktopConnectionManagerImporter.cs" />
-    <Compile Include="Config\Putty\PuttySessionsRegistryProvider.cs" />
-    <Compile Include="Config\Putty\PuttySessionsManager.cs" />
-    <Compile Include="Config\Putty\AbstractPuttySessionsProvider.cs" />
-    <Compile Include="Config\DatabaseConnectors\IDatabaseConnector.cs" />
-    <Compile Include="Config\DatabaseConnectors\MySqlDatabaseConnector.cs" />
-    <Compile Include="Connection\AbstractConnectionRecord.cs" />
-    <Compile Include="Connection\ConnectionInfoComparer.cs" />
-    <Compile Include="Connection\ConnectionInfoInheritance.cs" />
-    <Compile Include="App\ProgramRoot.cs" />
-    <Compile Include="Connection\ConnectionInitiator.cs" />
-    <Compile Include="Connection\ConnectionsService.cs" />
-    <Compile Include="Connection\Converter.cs" />
-    <Compile Include="Connection\DefaultConnectionInfo.cs" />
-    <Compile Include="Connection\DefaultConnectionInheritance.cs" />
-    <Compile Include="Connection\IConnectionInitiator.cs" />
-    <Compile Include="Connection\IInheritable.cs" />
-    <Compile Include="Connection\IHasParent.cs" />
-    <Compile Include="Connection\Protocol\ProtocolFactory.cs" />
-    <Compile Include="Connection\Protocol\RDP\AuthenticationLevel.cs" />
-    <Compile Include="Connection\Protocol\RDP\AzureLoadBalanceInfoEncoder.cs" />
-    <Compile Include="Connection\Protocol\ISupportsViewOnly.cs" />
-    <Compile Include="Connection\Protocol\RDP\RDGatewayUsageMethod.cs" />
-    <Compile Include="Connection\Protocol\RDP\RDGatewayUseConnectionCredentials.cs" />
-    <Compile Include="Connection\Protocol\RDP\RDPColors.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpErrorCodes.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpExtensions.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpNetworkConnectionType.cs" />
-    <Compile Include="Connection\Protocol\RDP\RDPPerformanceFlags.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpProtocol7.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpProtocol8.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpProtocol9.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpProtocolFactory.cs" />
-    <Compile Include="Connection\Protocol\RDP\RDPResolutions.cs" />
-    <Compile Include="Connection\Protocol\RDP\RDPSoundQuality.cs" />
-    <Compile Include="Connection\Protocol\RDP\RDPSounds.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpVersion.cs" />
-    <Compile Include="Connection\Protocol\VNC\VNCEnum.cs" />
-    <Compile Include="Connection\WebHelper.cs" />
-    <Compile Include="Credential\PlaceholderCredentialRecord.cs" />
-    <Compile Include="Credential\Repositories\CompositeRepositoryUnlocker.cs" />
-    <Compile Include="Credential\CredentialChangedEventArgs.cs" />
-    <Compile Include="Credential\CredentialDeletionMsgBoxConfirmer.cs" />
-    <Compile Include="Credential\CredentialDomainUserComparer.cs" />
-    <Compile Include="Credential\Repositories\CredentialRepoUnlockerBuilder.cs" />
-    <Compile Include="Credential\CredentialServiceFactory.cs" />
-    <Compile Include="Credential\CredentialServiceFacade.cs" />
-    <Compile Include="Connection\Protocol\PowerShell\Connection.Protocol.PowerShell.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Resources\ImageConverter.cs" />
-    <Compile Include="Language\Language.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Language.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Themes\ColorMapTheme.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ColorMapTheme.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Security\Factories\CryptoProviderFactoryFromSettings.cs" />
-    <Compile Include="Security\Factories\LegacyInsecureCryptoProviderFactory.cs" />
-    <Compile Include="Security\ICryptoProviderFactory.cs" />
-    <Compile Include="Security\IKeyProvider.cs" />
-    <Compile Include="Security\RandomGenerator.cs" />
-    <Compile Include="Themes\ExtendedColorPalette.cs" />
-    <Compile Include="Themes\MremoteNGPaletteManipulator.cs" />
-    <Compile Include="Themes\MremoteNGThemeBase.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Tools\ADhelper.cs" />
-    <Compile Include="Tools\Attributes\AttributeUsedInAllProtocolsExcept.cs" />
-    <Compile Include="Tools\Clipboard\WindowsClipboard.cs" />
-    <Compile Include="Tools\CustomCollections\IFullyNotifiableList.cs" />
-    <Compile Include="Tools\CustomCollections\FullyObservableCollection.cs" />
-    <Compile Include="Credential\Repositories\CredentialRepositoryChangedArgs.cs" />
-    <Compile Include="Credential\Repositories\CredentialRepositoryList.cs" />
-    <Compile Include="Credential\CredentialRecord.cs" />
-    <Compile Include="Credential\CredentialRecordTypeConverter.cs" />
-    <Compile Include="Credential\Repositories\CredentialRepositoryConfig.cs" />
-    <Compile Include="Credential\ICredentialRecord.cs" />
-    <Compile Include="Credential\ICredentialRepositoryList.cs" />
-    <Compile Include="Credential\ICredentialRepository.cs" />
-    <Compile Include="Credential\Repositories\XmlCredentialRepositoryFactory.cs" />
-    <Compile Include="Credential\Repositories\ICredentialRepositoryConfig.cs" />
-    <Compile Include="Credential\Repositories\XmlCredentialRepository.cs" />
-    <Compile Include="Messages\MessageFilteringOptions\LogMessageTypeFilteringOptions.cs" />
-    <Compile Include="Messages\WriterDecorators\MessageTypeFilterDecorator.cs" />
-    <Compile Include="Messages\MessageWriters\DebugConsoleMessageWriter.cs" />
-    <Compile Include="Messages\IMessage.cs" />
-    <Compile Include="Messages\MessageFilteringOptions\IMessageTypeFilteringOptions.cs" />
-    <Compile Include="Messages\WriterDecorators\MessageFocusDecorator.cs" />
-    <Compile Include="Messages\MessageWriters\NotificationPanelMessageWriter.cs" />
-    <Compile Include="Messages\MessageWriters\IMessageWriter.cs" />
-    <Compile Include="Messages\MessageClassEnum.cs" />
-    <Compile Include="Messages\MessageCollector.cs" />
-    <Compile Include="Messages\WriterDecorators\OnlyLogMessageFilterDecorator.cs" />
-    <Compile Include="Messages\MessageWriters\PopupMessageWriter.cs" />
-    <Compile Include="Messages\MessageWriters\TextLogMessageWriter.cs" />
-    <Compile Include="Messages\MessageFilteringOptions\NotificationPanelMessageFilteringOptions.cs" />
-    <Compile Include="Messages\MessageFilteringOptions\NotificationPanelSwitchOnMessageFilteringOptions.cs" />
-    <Compile Include="Messages\MessageFilteringOptions\PopupMessageFilteringOptions.cs" />
-    <Compile Include="Security\Authentication\PasswordAuthenticator.cs" />
-    <Compile Include="Security\BlockCipherEngines.cs" />
-    <Compile Include="Security\BlockCipherModes.cs" />
-    <Compile Include="Security\EncryptedSecureString.cs" />
-    <Compile Include="Security\Authentication\IAuthenticator.cs" />
-    <Compile Include="Security\EncryptionException.cs" />
-    <Compile Include="Security\PasswordCreation\IPasswordConstraint.cs" />
-    <Compile Include="Security\KeyDerivation\IKeyDerivationFunction.cs" />
-    <Compile Include="Security\KeyDerivation\Pkcs5S2KeyGenerator.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesSpecialCharactersConstraint.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesUpperCaseConstraint.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesLowerCaseConstraint.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesNumbersConstraint.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordLengthConstraint.cs" />
-    <Compile Include="Security\SymmetricEncryption\AeadCryptographyProvider.cs" />
-    <Compile Include="Security\SymmetricEncryption\LegacyRijndaelCryptographyProvider.cs" />
-    <Compile Include="Security\ICryptographyProvider.cs" />
-    <Compile Include="Security\SecureStringExtensions.cs" />
-    <Compile Include="Security\Factories\CryptoProviderFactory.cs" />
-    <Compile Include="Security\Factories\CryptoProviderFactoryFromXml.cs" />
-    <Compile Include="Tools\Cmdline\StartupArgumentsInterpreter.cs" />
-    <Compile Include="Tools\CustomCollections\CollectionUpdatedEventArgs.cs" />
-    <Compile Include="Config\Settings\Settings.cs" />
-    <Compile Include="Tools\DisposableAction.cs" />
-    <Compile Include="Tools\DisposableOptional.cs" />
-    <Compile Include="Tools\Extensions.cs" />
-    <Compile Include="Tools\ExternalToolArgumentParser.cs" />
-    <Compile Include="Tools\Cmdline\CmdArgumentsInterpreter.cs" />
-    <Compile Include="Tools\ConnectionsTreeToMenuItemsConverter.cs" />
-    <Compile Include="Tools\ExternalToolsService.cs" />
-    <Compile Include="Tools\SshTunnelTypeConverter.cs" />
-    <Compile Include="Tools\ExternalToolsTypeConverter.cs" />
-    <Compile Include="Tools\CustomCollections\INotifyCollectionUpdated.cs" />
-    <Compile Include="Tools\Optional.cs" />
-    <Compile Include="Tools\MouseClickSimulator.cs" />
-    <Compile Include="Tools\NotificationAreaIcon.cs" />
-    <Compile Include="Tools\Attributes\AttributeUsedInProtocol.cs" />
-    <Compile Include="Tools\WindowsRegistry\IRegistry.cs" />
-    <Compile Include="Tools\WindowsRegistry\RegistryHive.cs" />
-    <Compile Include="Tools\WindowsRegistry\WindowsRegistry.cs" />
-    <Compile Include="Tools\ScanHost.cs" />
-    <Compile Include="Tools\SecureTransfer.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlDatabaseVersionVerifier.cs" />
-    <Compile Include="Tree\AlwaysConfirmYes.cs" />
-    <Compile Include="Tools\Clipboard\IClipboard.cs" />
-    <Compile Include="Tree\SelectedConnectionDeletionConfirmer.cs" />
-    <Compile Include="Tree\ConnectionTreeDragAndDropHandler.cs" />
-    <Compile Include="Tree\ConnectionTreeModel.cs" />
-    <Compile Include="Tree\ClickHandlers\ExpandNodeClickHandler.cs" />
-    <Compile Include="Tree\ClickHandlers\ITreeNodeClickHandler.cs" />
-    <Compile Include="Tree\IConfirm.cs" />
-    <Compile Include="Tree\NodeSearcher.cs" />
-    <Compile Include="Tree\NodeType.cs" />
-    <Compile Include="Tree\ClickHandlers\OpenConnectionClickHandler.cs" />
-    <Compile Include="Tree\PreviouslyOpenedFolderExpander.cs" />
-    <Compile Include="Tree\PreviousSessionOpener.cs" />
-    <Compile Include="Tree\RootNodeExpander.cs" />
-    <Compile Include="Tree\Root\RootNodeTypeEnum.cs" />
-    <Compile Include="Tree\ClickHandlers\SwitchToConnectionClickHandler.cs" />
-    <Compile Include="Tree\ClickHandlers\TreeNodeCompositeClickHandler.cs" />
-    <Compile Include="UI\Controls\MrngAdTree.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngAdTree.Designer.cs">
-      <DependentUpon>MrngAdTree.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\MrngButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngCheckBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngGroupBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngLabel.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngListView.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngNumericUpDown.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngPictureBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngPictureBox.Designer.cs">
-      <DependentUpon>MrngPictureBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\MrngProgressBar.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngRadioButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngSearchBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MrngTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\ConnectionContextMenu.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\ConnectionInfoPropertyGrid\ConnectionInfoPropertyGrid.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\ConnectionInfoPropertyGrid\ConnectionInfoPropertyGrid.Designer.cs">
-      <DependentUpon>ConnectionInfoPropertyGrid.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\ConnectionInfoPropertyGrid\PropertyMode.cs" />
-    <Compile Include="UI\Controls\ConnectionTree\ConnectionTree.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\ConnectionTree\ConnectionTree.Designer.cs">
-      <DependentUpon>ConnectionTree.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\ConnectionTree\ConnectionTreeSearchTextFilter.cs" />
-    <Compile Include="UI\Controls\CredentialRecordComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\CredentialRecordComboBox.Designer.cs">
-      <DependentUpon>CredentialRecordComboBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\Adapters\CredentialRecordListAdaptor.cs" />
-    <Compile Include="UI\Controls\CredentialRecordListBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\CredentialRecordListBox.Designer.cs">
-      <DependentUpon>CredentialRecordListBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\CredentialRecordListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\CredentialRecordListView.Designer.cs">
-      <DependentUpon>CredentialRecordListView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\CredentialRepositoryListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\CredentialRepositoryListView.Designer.cs">
-      <DependentUpon>CredentialRepositoryListView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\ExternalToolsToolStrip.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\FilteredPropertyGrid\FilteredPropertyGrid.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\FilteredPropertyGrid\FilteredPropertyGrid.designer.cs">
-      <DependentUpon>FilteredPropertyGrid.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\FilteredPropertyGrid\ObjectWrapper.cs" />
-    <Compile Include="UI\Controls\ConnectionTree\IConnectionTree.cs" />
-    <Compile Include="UI\Controls\HeadlessTabControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\ISelectionTarget.cs" />
-    <Compile Include="UI\Controls\MrngIpTextBox.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\ConnectionTree\IConnectionTreeDelegate.cs" />
-    <Compile Include="UI\Controls\ConnectionTree\NameColumn.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\MultiSshToolStrip.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\PageSequence\ISequenceChangingNotifier.cs" />
-    <Compile Include="UI\Controls\NewPasswordWithVerification.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\NewPasswordWithVerification.Designer.cs">
-      <DependentUpon>NewPasswordWithVerification.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\NotificationMessageListViewItem.cs" />
-    <Compile Include="UI\Controls\PageSequence\PageSequence.cs" />
-    <Compile Include="UI\Controls\PageSequence\SequencedControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\PageSequence\SequencedPageReplcementRequestArgs.cs" />
-    <Compile Include="UI\Controls\QuickConnectComboBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\QuickConnectToolStrip.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\SecureTextBox.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\SecureTextBox.Designer.cs">
-      <DependentUpon>SecureTextBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\StatusImageList.cs" />
-    <Compile Include="UI\TextBoxExtensions.cs" />
-    <Compile Include="UI\Controls\MrngToolStripSplitButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\DialogFactory.cs" />
-    <Compile Include="UI\DisplayProperties.cs" />
-    <Compile Include="UI\FontOverrider.cs" />
-    <Compile Include="UI\FormExtensions.cs" />
-    <Compile Include="UI\Forms\FrmOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmOptions.Designer.cs">
-      <DependentUpon>FrmOptions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\FrmSplashScreen.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmSplashScreen.Designer.cs">
-      <DependentUpon>FrmSplashScreen.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\FullscreenHandler.cs" />
-    <Compile Include="UI\Forms\FrmInputBox.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmInputBox.Designer.cs">
-      <DependentUpon>FrmInputBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\AdvancedPage.Designer.cs">
-      <DependentUpon>AdvancedPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\AdvancedPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\AppearancePage.Designer.cs">
-      <DependentUpon>AppearancePage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\AppearancePage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\CredentialsPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\CredentialsPage.Designer.cs">
-      <DependentUpon>CredentialsPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\NotificationsPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\NotificationsPage.Designer.cs">
-      <DependentUpon>NotificationsPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\ConnectionsPage.Designer.cs">
-      <DependentUpon>ConnectionsPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\ConnectionsPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\OptionsPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\SecurityPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\SecurityPage.Designer.cs">
-      <DependentUpon>SecurityPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\SqlServerPage.Designer.cs">
-      <DependentUpon>SqlServerPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\SqlServerPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\StartupExitPage.Designer.cs">
-      <DependentUpon>StartupExitPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\StartupExitPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\TabsPanelsPage.Designer.cs">
-      <DependentUpon>TabsPanelsPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\TabsPanelsPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\ThemePage.Designer.cs">
-      <DependentUpon>ThemePage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\ThemePage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\UpdatesPage.Designer.cs">
-      <DependentUpon>UpdatesPage.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\OptionsPages\UpdatesPage.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tools\Authenticode.cs" />
-    <Compile Include="Tools\EnumWindows.cs" />
-    <Compile Include="Tools\PropertyGridCommandSite.cs" />
-    <Compile Include="Connection\PuttySessionInfo.cs" />
-    <Compile Include="Tree\Root\RootPuttySessionsNodeInfo.cs" />
-    <Compile Include="Themes\ThemeManager.cs" />
-    <Compile Include="Themes\ThemeSerializer.cs" />
-    <Compile Include="Connection\ConnectionIcon.cs" />
-    <Compile Include="Connection\ConnectionInfo.cs" />
-    <Compile Include="Connection\InterfaceControl.Designer.cs">
-      <DependentUpon>InterfaceControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Connection\InterfaceControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Connection\Protocol\ProtocolBase.cs" />
-    <Compile Include="Connection\Protocol\Http\Connection.Protocol.HTTP.cs" />
-    <Compile Include="Connection\Protocol\Http\Connection.Protocol.HTTPBase.cs" />
-    <Compile Include="Connection\Protocol\Http\Connection.Protocol.HTTPS.cs" />
-    <Compile Include="Connection\Protocol\IntegratedProgram.cs" />
-    <Compile Include="Connection\Protocol\ProtocolList.cs" />
-    <Compile Include="Connection\Protocol\ProtocolType.cs" />
-    <Compile Include="Connection\Protocol\PuttyBase.cs" />
-    <Compile Include="Connection\Protocol\RAW\RawProtocol.cs" />
-    <Compile Include="Connection\Protocol\RDP\RdpProtocol6.cs" />
-    <Compile Include="Connection\Protocol\Rlogin\Connection.Protocol.Rlogin.cs" />
-    <Compile Include="Connection\Protocol\Serial\Connection.Protocol.Serial.cs" />
-    <Compile Include="Connection\Protocol\SSH\Connection.Protocol.SSH1.cs" />
-    <Compile Include="Connection\Protocol\SSH\Connection.Protocol.SSH2.cs" />
-    <Compile Include="Connection\Protocol\Telnet\Connection.Protocol.Telnet.cs" />
-    <Compile Include="Connection\Protocol\VNC\Connection.Protocol.VNC.cs" />
-    <Compile Include="Themes\ThemeInfo.cs" />
-    <Compile Include="Tools\Cmdline\CommandLineArguments.cs" />
-    <Compile Include="Container\ContainerInfo.cs" />
-    <Compile Include="UI\Forms\FrmChoosePanel.Designer.cs">
-      <DependentUpon>FrmChoosePanel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\FrmChoosePanel.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmMain.Designer.cs">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\FrmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmPassword.Designer.cs">
-      <DependentUpon>FrmPassword.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\FrmPassword.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Messages\Message.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <Compile Include="Tree\Root\RootNodeInfo.cs" />
-    <Compile Include="Security\SaveFilter.cs" />
-    <Compile Include="Tools\IeBrowserEmulation.cs" />
-    <Compile Include="Tools\ProcessController.cs" />
-    <Compile Include="Tools\PuttyTypeDetector.cs" />
-    <Compile Include="Tools\PuttyProcessController.cs" />
-    <Compile Include="Tools\ReconnectGroup.Designer.cs">
-      <DependentUpon>ReconnectGroup.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Tools\ReconnectGroup.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Tools\ExternalTool.cs" />
-    <Compile Include="Tools\Tools.LocalizedAttributes.cs" />
-    <Compile Include="Tools\MiscTools.cs" />
-    <Compile Include="Tools\PortScanner.cs" />
-    <Compile Include="Tools\WindowMenu.cs" />
-    <Compile Include="Tools\Tools.WindowPlacement.cs" />
-    <Compile Include="UI\Forms\FrmUnhandledException.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmUnhandledException.Designer.cs">
-      <DependentUpon>FrmUnhandledException.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\GraphicsUtilities\GdiPlusGraphicsProvider.cs" />
-    <Compile Include="UI\GraphicsUtilities\IGraphicsProvider.cs" />
-    <Compile Include="UI\Menu\HelpMenu.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Menu\FileMenu.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Menu\AdvancedWindowMenu.cs" />
-    <Compile Include="UI\Menu\ToolsMenu.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Menu\ViewMenu.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Panels\PanelAdder.cs" />
-    <Compile Include="UI\Tabs\Enums.cs" />
-    <Compile Include="UI\Tabs\ConnectionTab.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Tabs\ConnectionTab.Designer.cs">
-      <DependentUpon>ConnectionTab.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Tabs\DockPaneStripNG.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Tabs\FloatWindowNG.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Tabs\MremoteNGAutoHideStrip.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\Tabs\TabHelper.cs" />
-    <Compile Include="UI\TaskDialog\CommandButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UI\TaskDialog\CommandButton.designer.cs">
-      <DependentUpon>CommandButton.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\TaskDialog\cTaskDialog.cs" />
-    <Compile Include="UI\TaskDialog\frmTaskDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\TaskDialog\frmTaskDialog.designer.cs">
-      <DependentUpon>frmTaskDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Forms\FrmAbout.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmAbout.Designer.cs">
-      <DependentUpon>FrmAbout.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\ActiveDirectoryImportWindow.Designer.cs">
-      <DependentUpon>ActiveDirectoryImportWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\ActiveDirectoryImportWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Window\BaseWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Window\ConfigWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Window\ConnectionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Window\ConnectionWindow.Designer.cs">
-      <DependentUpon>ConnectionWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\ErrorAndInfoWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmExport.Designer.cs">
-      <DependentUpon>FrmExport.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\ErrorAndInfoWindow.Designer.cs">
-      <DependentUpon>ErrorAndInfoWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\ExternalToolsWindow.Designer.cs">
-      <DependentUpon>ExternalToolsWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\ExternalToolsWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\WindowList.cs" />
-    <Compile Include="UI\Window\PortScanWindow.Designer.cs">
-      <DependentUpon>PortScanWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\PortScanWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Forms\FrmExport.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Window\SSHTransferWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Window\ConnectionTreeWindow.Designer.cs">
-      <DependentUpon>ConnectionTreeWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\ConnectionTreeWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\WindowType.cs" />
-    <Compile Include="UI\Window\UltraVNCWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Window\UpdateWindow.Designer.cs">
-      <DependentUpon>UpdateWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Window\UpdateWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <COMReference Include="MSTSCLib">
+      <WrapperTool>tlbimp</WrapperTool>
+      <VersionMinor>0</VersionMinor>
+      <VersionMajor>1</VersionMajor>
+      <Guid>8c11efa1-92c3-11d1-bc1e-00c04fa31489</Guid>
+      <Lcid>0</Lcid>
+      <Isolated>false</Isolated>
+      <EmbedInteropTypes>true</EmbedInteropTypes>
+    </COMReference>
   </ItemGroup>
+
   <ItemGroup>
-    <EmbeddedResource Include="Language\Language.cs-CZ.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.lt.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.ja-JP.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.ko-KR.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.tr-TR.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Themes\ColorMapTheme.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ColorMapTheme.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>mRemoteNG</CustomToolNamespace>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngAdTree.resx">
-      <DependentUpon>MrngAdTree.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngButton.resx">
-      <DependentUpon>MrngButton.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngCheckBox.resx">
-      <DependentUpon>MrngCheckBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngComboBox.resx">
-      <DependentUpon>MrngComboBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngGroupBox.resx">
-      <DependentUpon>MrngGroupBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngLabel.resx">
-      <DependentUpon>MrngLabel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngListView.resx">
-      <DependentUpon>MrngListView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngNumericUpDown.resx">
-      <DependentUpon>MrngNumericUpDown.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngRadioButton.resx">
-      <DependentUpon>MrngRadioButton.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngSearchBox.resx">
-      <DependentUpon>MrngSearchBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngTextBox.resx">
-      <DependentUpon>MrngTextBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\ConnectionTree\ConnectionTree.resx">
-      <DependentUpon>ConnectionTree.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\CredentialRecordComboBox.resx">
-      <DependentUpon>CredentialRecordComboBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\CredentialRecordListBox.resx">
-      <DependentUpon>CredentialRecordListBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\CredentialRecordListView.resx">
-      <DependentUpon>CredentialRecordListView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\CredentialRepositoryListView.resx">
-      <DependentUpon>CredentialRepositoryListView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\FilteredPropertyGrid\FilteredPropertyGrid.resx">
-      <DependentUpon>FilteredPropertyGrid.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\HeadlessTabControl.resx">
-      <DependentUpon>HeadlessTabControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\MrngIpTextBox.resx">
-      <DependentUpon>MrngIpTextBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\NewPasswordWithVerification.resx">
-      <DependentUpon>NewPasswordWithVerification.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\PageSequence\SequencedControl.resx">
-      <DependentUpon>SequencedControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\SecureTextBox.resx">
-      <DependentUpon>SecureTextBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmChoosePanel.resx">
-      <DependentUpon>FrmChoosePanel.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmMain.resx">
-      <DependentUpon>FrmMain.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmOptions.resx">
-      <DependentUpon>FrmOptions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmSplashScreen.resx">
-      <DependentUpon>FrmSplashScreen.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmInputBox.resx">
-      <DependentUpon>FrmInputBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\AdvancedPage.resx">
-      <DependentUpon>AdvancedPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\AppearancePage.resx">
-      <DependentUpon>AppearancePage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\ConnectionsPage.resx">
-      <DependentUpon>ConnectionsPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\CredentialsPage.resx">
-      <DependentUpon>CredentialsPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\NotificationsPage.resx">
-      <DependentUpon>NotificationsPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\OptionsPage.resx">
-      <DependentUpon>OptionsPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\SecurityPage.resx">
-      <DependentUpon>SecurityPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\SqlServerPage.resx">
-      <DependentUpon>SqlServerPage.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\StartupExitPage.resx">
-      <DependentUpon>StartupExitPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\TabsPanelsPage.resx">
-      <DependentUpon>TabsPanelsPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\ThemePage.resx">
-      <DependentUpon>ThemePage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\OptionsPages\UpdatesPage.resx">
-      <DependentUpon>UpdatesPage.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmPassword.resx">
-      <DependentUpon>FrmPassword.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.de.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.el.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.en-US.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.es-AR.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.es.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.hu.resx" />
-    <EmbeddedResource Include="Language\Language.it.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.nb-NO.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.nl.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.pt-BR.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.pt.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <CustomToolNamespace>mRemoteNG</CustomToolNamespace>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Language.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.fr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.pl.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.ru.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.uk.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.zh-CN.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Language\Language.zh-TW.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <CustomToolNamespace>mRemoteNG</CustomToolNamespace>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Tools\ReconnectGroup.resx">
-      <DependentUpon>ReconnectGroup.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmUnhandledException.resx">
-      <DependentUpon>FrmUnhandledException.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Tabs\ConnectionTab.resx">
-      <DependentUpon>ConnectionTab.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\TaskDialog\CommandButton.resx">
-      <DependentUpon>CommandButton.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\TaskDialog\frmTaskDialog.resx">
-      <DependentUpon>frmTaskDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmAbout.resx">
-      <DependentUpon>FrmAbout.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\ActiveDirectoryImportWindow.resx">
-      <DependentUpon>ActiveDirectoryImportWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\BaseWindow.resx">
-      <DependentUpon>BaseWindow.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\ConfigWindow.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>ConfigWindow.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\ConnectionWindow.resx">
-      <DependentUpon>ConnectionWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\ErrorAndInfoWindow.resx">
-      <DependentUpon>ErrorAndInfoWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\FrmExport.resx">
-      <DependentUpon>FrmExport.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\ConnectionTreeWindow.resx">
-      <DependentUpon>ConnectionTreeWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\UltraVNCWindow.resx">
-      <DependentUpon>UltraVNCWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Window\UpdateWindow.resx">
-      <DependentUpon>UpdateWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <PackageReference Include="BouncyCastle" Version="1.8.9" />
+    <PackageReference Include="Castle.Core" Version="4.4.1" />
+    <PackageReference Include="cef.redist.x64" Version="92.0.25" />
+    <PackageReference Include="CefSharp.Common" Version="91.1.230" />
+    <PackageReference Include="CefSharp.WinForms.NETCore" Version="91.1.230" />
+    <PackageReference Include="ConsoleControl" Version="1.3.0" />
+    <PackageReference Include="Cucumber.Messages" Version="16.0.1" />
+    <PackageReference Include="DockPanelSuite" Version="3.1.0-beta7" />
+    <PackageReference Include="DockPanelSuite.ThemeVS2003" Version="3.1.0-beta7" />
+    <PackageReference Include="DockPanelSuite.ThemeVS2005" Version="3.1.0-beta7" />
+    <PackageReference Include="DockPanelSuite.ThemeVS2012" Version="3.1.0-beta7" />
+    <PackageReference Include="DockPanelSuite.ThemeVS2013" Version="3.1.0-beta7" />
+    <PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0-beta7" />
+    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.902.49" />
+    <PackageReference Include="MySql.Data" Version="8.0.26" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="ObjectListView" Version="2.7.1.5" />
+    <PackageReference Include="ObjectListView.Official" Version="2.9.1" />
+    <PackageReference Include="OpenCover" Version="4.7.1221" />
+    <PackageReference Include="Renci.SshNet.Async" Version="1.4.0" />
+    <PackageReference Include="ReportGenerator" Version="4.8.12" />
+    <PackageReference Include="System.Data.Common" Version="4.3.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <PackageReference Include="System.DirectoryServices" Version="5.0.0" />
+    <PackageReference Include="System.Management" Version="5.0.0" />
+    <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
+    <PackageReference Include="VncSharp" Version="1.0.7" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include=".editorconfig" />
-    <None Include="app.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="..\CHANGELOG.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\CREDITS.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\README.md">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\COPYING.TXT">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Themes\darcula.vstheme">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Themes\vs2015blue.vstheme">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Themes\vs2015dark.vstheme">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Themes\vs2015light.vstheme">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Schemas\mremoteng_confcons_v2_5.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Schemas\mremoteng_confcons_v2_7.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="Icons\Console.ico" />
-    <Content Include="Icons\Admin.ico" />
-    <Content Include="Icons\Apple.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="mRemoteNG.VisualElementsManifest.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="VisualElements_70.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="VisualElements_150.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <Content Include="Icons\Infrastructure.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Production.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Staging.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\PowerShell.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="Resources\ConnectedOverlay.png" />
-    <None Include="Resources\Loading_Spinner.gif" />
-    <None Include="Resources\AddFolder_16x.png" />
-    <None Include="Resources\CloseSolution_16x.png" />
-    <None Include="Resources\CollapseAll_16x.png" />
-    <None Include="Resources\Copy_16x.png" />
-    <None Include="Resources\Diagram_16x.png" />
-    <None Include="Resources\Disconnect_16x.png" />
-    <None Include="Resources\Document_16x.png" />
-    <None Include="Resources\ExpandAll_16x.png" />
-    <None Include="Resources\ExpandDown_16x.png" />
-    <None Include="Resources\F1Help_16x.png" />
-    <None Include="Resources\Favorite_16x.png" />
-    <None Include="Resources\FolderClosed_16x.png" />
-    <None Include="Resources\FullScreen_16x.png" />
-    <None Include="Resources\GlyphDown_16x.png" />
-    <None Include="Resources\GlyphLeft_16x.png" />
-    <None Include="Resources\GlyphRight_16x.png" />
-    <None Include="Resources\GlyphUp_16x.png" />
-    <None Include="Resources\Header_dark.png" />
-    <None Include="Resources\HostStatus_Check.png" />
-    <None Include="Resources\HostStatus_Off.png" />
-    <None Include="Resources\HostStatus_On.png" />
-    <None Include="Resources\Message_16x.png" />
-    <None Include="Resources\PuttyConfig.png" />
-    <None Include="Resources\PuttySessions.png" />
-    <None Include="Resources\Refresh_16x.png" />
-    <None Include="Resources\Rename_16x.png" />
-    <None Include="Resources\RunUpdate_16x.png" />
-    <None Include="Resources\Save_16x.png" />
-    <None Include="Resources\Search_16x.png" />
-    <None Include="Resources\Settings_16x.png" />
-    <None Include="Resources\SortAscending_16x.png" />
-    <None Include="Resources\SortDescending_16x.png" />
-    <None Include="Resources\Test_16x.png" />
-    <None Include="Resources\ToggleOfficeKeyboardScheme_16x.png" />
-    <None Include="Resources\NewFile_16x.png" />
-    <None Include="Resources\UIAboutBox_16x.png" />
-    <None Include="Resources\AddItem_16x.png" />
-    <None Include="Resources\ASPWebSite_16x.png" />
-    <None Include="Resources\OpenFile_16x.png" />
-    <None Include="Resources\Console_16x.png" />
-    <None Include="Resources\SearchAndApps_16x.png" />
-    <None Include="Resources\Panel_16x.png" />
-    <None Include="Resources\InsertPanel_16x.png" />
-    <None Include="Resources\Run_16x.png" />
-    <None Include="Resources\Stop_16x.png" />
-    <None Include="Resources\Close_16x.png" />
-    <None Include="Resources\Resize_16x.png" />
-    <None Include="Resources\Remove_16x.png" />
-    <None Include="Resources\Add_16x.png" />
-    <None Include="Resources\Monitor_16x.png" />
-    <None Include="Resources\UniqueKeyError_16x.png" />
-    <None Include="Resources\SyncArrow_16x.png" />
-    <None Include="Resources\ViewDownBySchema_16x.png" />
-    <None Include="Resources\SchemaObjectProperty_16x.png" />
-    <None Include="Resources\Schema_16x.png" />
-    <None Include="Resources\StatusInformation_16x.png" />
-    <None Include="Resources\LogWarning_16x.png" />
-    <None Include="Resources\LogError_16x.png" />
-    <None Include="Resources\mRemoteNG_Icon.ico" />
-    <None Include="Resources\Tab_16x.png" />
-    <None Include="Resources\SQLDatabase_16x.png" />
-    <None Include="Resources\Key_16x.png" />
-    <None Include="Resources\StartupProject_16x.png" />
-    <None Include="Resources\AppearanceEditor_16x.png" />
-    <None Include="Resources\Lock_16x.png" />
-    <None Include="Resources\Export_16x.png" />
-    <None Include="Resources\Property_16x.png" />
-    <None Include="Resources\ExtendedProperty_16x.png" />
-    <Content Include="PuTTYNG.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Schemas\mremoteng_confcons_v2_6.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="Schemas\mremoteng_credrepo_list_v1_0.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Schemas\mremoteng_creds_v1_0.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Icons\Anti Virus.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Backup.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Build Server.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Database.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Domain Controller.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\ESX.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Fax.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\File Server.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Finance.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Firewall.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Linux.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Log.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Mail Server.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\mRemote.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\mRemoteNG.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\PuTTY.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Remote Desktop.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Router.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\SharePoint.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\SSH.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Switch.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Tel.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Telnet.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Terminal Server.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Test Server.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Virtual Machine.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Web Server.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\WiFi.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Windows.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icons\Workstation.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="Properties\Settings.settings">
-      <CustomToolNamespace>mRemoteNG</CustomToolNamespace>
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="VncSharp">
-      <HintPath>References\VncSharp.dll</HintPath>
+    <Reference Include="AxMSTSCLib">
+      <HintPath>..\..\..\..\Program Files (x86)\Common Files\Microsoft Shared\Windows Simulator\16.0\AxMSTSCLib.dll</HintPath>
     </Reference>
   </ItemGroup>
+
   <ItemGroup>
-    <Reference Include="mscorlib" />
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="BouncyCastle">
-      <Version>1.8.9</Version>
-    </PackageReference>
-    <PackageReference Include="ConsoleControl">
-      <Version>1.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="DockPanelSuite">
-      <Version>3.0.6</Version>
-    </PackageReference>
-    <PackageReference Include="DockPanelSuite.ThemeVS2003">
-      <Version>3.0.6</Version>
-    </PackageReference>
-    <PackageReference Include="DockPanelSuite.ThemeVS2012">
-      <Version>3.0.6</Version>
-    </PackageReference>
-    <PackageReference Include="DockPanelSuite.ThemeVS2013">
-      <Version>3.0.6</Version>
-    </PackageReference>
-    <PackageReference Include="DockPanelSuite.ThemeVS2015">
-      <Version>3.0.6</Version>
-    </PackageReference>
-    <PackageReference Include="Google.Protobuf">
-      <Version>3.17.3</Version>
-    </PackageReference>
-    <PackageReference Include="log4net">
-      <Version>2.0.12</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Web.WebView2">
-      <Version>1.0.902.49</Version>
-    </PackageReference>
-    <PackageReference Include="MySql.Data">
-      <Version>8.0.26</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter">
-      <Version>4.0.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="ObjectListView.Official">
-      <Version>2.9.1</Version>
-    </PackageReference>
-    <PackageReference Include="Renci.SshNet.Async">
-      <Version>1.4.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.DirectoryServices">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Drawing.Common">
-      <Version>5.0.2</Version>
-    </PackageReference>
-    <PackageReference Include="System.IO.Packaging">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Memory">
-      <Version>4.5.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.ProtectedData">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Xml.Linq">
-      <Version>3.5.21022.801</Version>
-    </PackageReference>
+    <None Update="Icons\Admin.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Anti Virus.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Apple.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Backup.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Build Server.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Console.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Database.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Domain Controller.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\ESX.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Fax.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\File Server.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Finance.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Firewall.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Infrastructure.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Linux.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Log.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Mail Server.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\mRemote.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\mRemoteNG.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\PowerShell.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Production.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\PuTTY.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\RaspberryPi.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Remote Desktop.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Router.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\SharePoint.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\SSH.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Staging.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Switch.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Tel.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Telnet.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Terminal Server.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Test Server.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Virtual Machine.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Web Server.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\WiFi.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Windows.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Icons\Workstation.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <None Update="mRemoteNG.VisualElementsManifest.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\PuTTYNG.exe">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Schemas\mremoteng_confcons_v2_5.xsd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Schemas\mremoteng_confcons_v2_6.xsd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Schemas\mremoteng_confcons_v2_7.xsd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Schemas\mremoteng_credrepo_list_v1_0.xsd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Schemas\mremoteng_creds_v1_0.xsd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="VisualElements_150.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="VisualElements_70.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\COPYING.TXT">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="AxMSTSCLib">
-      <Guid>{8C11EFA1-92C3-11D1-BC1E-00C04FA31489}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>aximp</WrapperTool>
-      <Isolated>False</Isolated>
-    </COMReference>
-    <COMReference Include="MSTSCLib">
-      <Guid>{8C11EFA1-92C3-11D1-BC1E-00C04FA31489}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-    </COMReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <PostBuildEvent>:: When passing paths to powershell scripts, check if the path ends with a backslash "\"
-:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.
 
-powershell -noprofile -command "sleep 2"
-
-set /p buildenv=&lt;buildenv.tmp
-
-:: Manual builds, set the cert password and uncomment below.
-:: IF "%25APPVEYOR_BUILD_FOLDER"=="" ( set cert_pwd= )
-
-:: Call the post build powershell script
-powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_mremoteng.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "%25cd%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe"</PostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <NoWarn>1591,660,661</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Release\</OutputPath>
-    <NoWarn>1591,660,661</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>1</WarningLevel>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <Prefer32Bit>false</Prefer32Bit>
-    <DefineConstants>
-    </DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Portable|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Release Portable\</OutputPath>
-    <DefineConstants>PORTABLE</DefineConstants>
-    <NoWarn>1591,660,661</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Portable|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug Portable\</OutputPath>
-    <DefineConstants>DEBUG;PORTABLE</DefineConstants>
-    <NoWarn>1591,660,661,618</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetZone>LocalIntranet</TargetZone>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-  </PropertyGroup>
-  <!-- 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 Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <Exec Command="echo $(ConfigurationName) &gt; buildenv.tmp" />
   </Target>
-  <Target Name="AfterBuild">
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command=":: When passing paths to powershell scripts, check if the path ends with a backslash &quot;\&quot;&#xD;&#xA;:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one.&#xD;&#xA;&#xD;&#xA;powershell -noprofile -command &quot;sleep 2&quot;&#xD;&#xA;&#xD;&#xA;set /p buildenv=&lt;buildenv.tmp&#xD;&#xA;&#xD;&#xA;:: Manual builds, set the cert password and uncomment below.&#xD;&#xA;:: IF &quot;%25APPVEYOR_BUILD_FOLDER&quot;==&quot;&quot; ( set cert_pwd= )&#xD;&#xA;&#xD;&#xA;:: Call the post build powershell script&#xD;&#xA;powershell.exe -ExecutionPolicy Bypass -File &quot;$(SolutionDir)Tools\postbuild_mremoteng.ps1&quot; -SolutionDir &quot;$(SolutionDir)\&quot; -TargetDir &quot;$(TargetDir)\&quot; -TargetFileName &quot;mRemoteNG.exe&quot; -ConfigurationName &quot;%25buildenv%25&quot; -CertificatePath &quot;$(CertPath)&quot; -CertificatePassword &quot;$(CertPassword)&quot; -ExcludeFromSigning &quot;PuTTYNG.exe&quot;" />
   </Target>
-  -->
-  <Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>echo $(ConfigurationName) &gt; buildenv.tmp</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Update="chromiumembeddedframework.runtime.win-x64" Version="92.0.25" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="chromiumembeddedframework.runtime.win-x86" Version="92.0.25" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/mRemoteNGInstaller/CustomActions/CustomActions.csproj b/mRemoteNGInstaller/CustomActions/CustomActions.csproj
index 929e6071..9bd8f6f4 100644
--- a/mRemoteNGInstaller/CustomActions/CustomActions.csproj
+++ b/mRemoteNGInstaller/CustomActions/CustomActions.csproj
@@ -38,6 +38,78 @@
     <StartupObject>
     </StartupObject>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Portable|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug Portable\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Portable|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug Portable\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Portable|x86'">
+    <OutputPath>bin\x86\Release Portable\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Portable|x64'">
+    <OutputPath>bin\x64\Release Portable\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Installer|x86'">
+    <OutputPath>bin\x86\Release Installer\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Installer|x64'">
+    <OutputPath>bin\x64\Release Installer\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Management" />
diff --git a/mRemoteNGSpecs/mRemoteNGSpecs.csproj b/mRemoteNGSpecs/mRemoteNGSpecs.csproj
index 9affc23c..9a9ec486 100644
--- a/mRemoteNGSpecs/mRemoteNGSpecs.csproj
+++ b/mRemoteNGSpecs/mRemoteNGSpecs.csproj
@@ -1,131 +1,42 @@
-<?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')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <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>mRemoteNGSpecs</RootNamespace>
-    <AssemblyName>mRemoteNGSpecs</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Platforms>AnyCPU;x64</Platforms>
+    <Configurations>Debug;Release;Debug Portable;Release Portable;Release Installer</Configurations>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="BouncyCastle" Version="1.8.9" />
+    <PackageReference Include="Cucumber.Messages" Version="16.0.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.17.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit.Runners" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="SpecFlow" Version="3.9.22" />
+    <PackageReference Include="SpecRun.Runner" Version="3.9.7" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
+    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
+    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <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" />
+    <Folder Include="Properties\" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Features\CredentialRepository.feature" />
-    <None Include="Features\CredentialRepositoryList.feature" />
+    <ProjectReference Include="..\mRemoteNG\mRemoteNG.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\mRemoteNG\mRemoteNG.csproj">
-      <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
-      <Name>mRemoteNG</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="BouncyCastle">
-      <Version>1.8.9</Version>
-    </PackageReference>
-    <PackageReference Include="Cucumber.Messages">
-      <Version>6.0.2</Version>
-    </PackageReference>
-    <PackageReference Include="Google.Protobuf">
-      <Version>3.17.3</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit">
-      <Version>3.13.2</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit.Runners">
-      <Version>3.12.0</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter">
-      <Version>4.0.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="SpecFlow.NUnit.Runners">
-      <Version>3.9.8</Version>
-    </PackageReference>
-    <PackageReference Include="System.Memory">
-      <Version>4.5.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.Reflection.Emit">
-      <Version>4.7.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Reflection.Emit.Lightweight">
-      <Version>4.7.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime">
-      <Version>4.3.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.Algorithms">
-      <Version>4.3.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.X509Certificates">
-      <Version>4.3.2</Version>
-    </PackageReference>
-    <PackageReference Include="System.Threading.Tasks.Extensions">
-      <Version>4.5.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
-  </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>
\ No newline at end of file
diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj
index c5bf2b2c..283549bb 100644
--- a/mRemoteNGTests/mRemoteNGTests.csproj
+++ b/mRemoteNGTests/mRemoteNGTests.csproj
@@ -1,361 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1453B37F-8621-499E-B0B2-6091F76DC0BB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>mRemoteNGTests</RootNamespace>
-    <AssemblyName>mRemoteNGTests</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Portable|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug Portable\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PORTABLE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Portable|x86'">
-    <OutputPath>bin\Release Portable\</OutputPath>
-    <DefineConstants>TRACE;PORTABLE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFramework>net5.0-windows</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
+    <Platforms>AnyCPU;x64</Platforms>
+
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+
+    <Configurations>Debug;Release;Debug Portable;Release Portable;Release Installer</Configurations>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NUnitForms">
-      <HintPath>nUnitForms\bin\NUnitForms.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-  <ItemGroup>
-    <Compile Include="App\ImportTests.cs" />
-    <Compile Include="App\UpdaterTests.cs" />
-    <Compile Include="BinaryFileTests.cs" />
-    <Compile Include="Config\Connections\Multiuser\ConnectionsUpdateAvailableEventArgsTests.cs" />
-    <Compile Include="Config\DataProviders\FileBackupCreatorTests.cs" />
-    <Compile Include="Config\DataProviders\FileDataProviderTests.cs" />
-    <Compile Include="Config\DataProviders\FileDataProviderWithRollingBackupTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\ValidateXmlSchemas.cs" />
-    <Compile Include="Config\Serializers\DataTableDeserializerTests.cs" />
-    <Compile Include="Config\CredentialHarvesterTests.cs" />
-    <Compile Include="Config\CredentialRecordLoaderTests.cs" />
-    <Compile Include="Config\Serializers\ConfConsEnsureConnectionsHaveIdsTests.cs" />
-    <Compile Include="Config\Serializers\CredentialProviderSerializerTests.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialPasswordDecryptorDecoratorTests.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialPasswordEncryptorDecoratorTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsDeserializerMremotengFormatTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Csv\CsvConnectionsSerializerMremotengFormatTests.cs" />
-    <Compile Include="Config\Serializers\DataTableSerializerTests.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\PortScanDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\PuttyConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManager27DeserializerTests.cs" />
-    <Compile Include="Config\Serializers\MiscSerializers\RemoteDesktopConnectionManagerDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentCompilerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsDocumentEncryptorTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlConnectionsSerializerTests.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialRecordDeserializerTests.cs" />
-    <Compile Include="Config\Serializers\CredentialSerializers\XmlCredentialSerializerTests.cs" />
-    <Compile Include="Config\Serializers\ConnectionSerializers\Xml\XmlRootNodeSerializerTests.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion22To23UpgraderTests.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion23To24UpgraderTests.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion24To25UpgraderTests.cs" />
-    <Compile Include="Config\Serializers\Versioning\SqlVersion25To26UpgraderTests.cs" />
-    <Compile Include="Config\Settings\DockPanelSerializerTests.cs" />
-    <Compile Include="Connection\AbstractConnectionInfoDataTests.cs" />
-    <Compile Include="Connection\ConnectionInfoComparerTests.cs" />
-    <Compile Include="Connection\Protocol\IntegratedProgramTests.cs" />
-    <Compile Include="Connection\Protocol\ProtocolListTests.cs" />
-    <Compile Include="Container\RootNodeInfoTests.cs" />
-    <Compile Include="Credential\CompositeRepositoryUnlockerTests.cs" />
-    <Compile Include="Credential\CredentialChangedEventArgsTests.cs" />
-    <Compile Include="Credential\CredentialDeletionMsgBoxConfirmerTests.cs" />
-    <Compile Include="Credential\CredentialDomainUserComparerTests.cs" />
-    <Compile Include="Credential\CredentialRecordTypeConverterTests.cs" />
-    <Compile Include="Credential\CredentialRepositoryListTests.cs" />
-    <Compile Include="Credential\CredentialRecordTests.cs" />
-    <Compile Include="Credential\CredentialServiceFacadeTests.cs" />
-    <Compile Include="IntegrationTests\XmlCredentialSerializerLifeCycleTests.cs" />
-    <Compile Include="IntegrationTests\XmlSerializationLifeCycleTests.cs" />
-    <Compile Include="Messages\MessageCollectorTests.cs" />
-    <Compile Include="Messages\MessageWriters\MessageTypeFilterDecoratorTests.cs" />
-    <Compile Include="Messages\MessageWriters\OnlyLogMessageFilterTests.cs" />
-    <Compile Include="NUnitExtensions\SecureTextBoxTester.cs" />
-    <Compile Include="Security\Authentication\PasswordAuthenticatorTests.cs" />
-    <Compile Include="Security\KeyDerivation\Pkcs5S2KeyGeneratorTests.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesSpecialCharactersConstraintTests.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesUpperCaseConstraintTests.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesLowerCaseConstraintTests.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordIncludesNumbersConstraintTests.cs" />
-    <Compile Include="Security\PasswordCreation\PasswordLengthConstraintTests.cs" />
-    <Compile Include="Security\RandomGeneratorTests.cs" />
-    <Compile Include="Security\SecureStringExtensionsTests.cs" />
-    <Compile Include="TestHelpers\ConnectionInfoHelpers.cs" />
-    <Compile Include="TestHelpers\ConnectionTreeModelBuilder.cs" />
-    <Compile Include="Security\XmlCryptoProviderBuilderTests.cs" />
-    <Compile Include="TestHelpers\FileTestHelpers.cs" />
-    <Compile Include="TestHelpers\Randomizer.cs" />
-    <Compile Include="TestHelpers\SerializableConnectionInfoAllPropertiesOfType.cs" />
-    <Compile Include="Tools\DisposableActionTests.cs" />
-    <Compile Include="Tools\ExternalToolsArgumentParserTests.cs" />
-    <Compile Include="Tools\FullyObservableCollectionTests.cs" />
-    <Compile Include="Tools\OptionalTests.cs" />
-    <Compile Include="Tools\Registry\WindowsRegistryTests.cs" />
-    <Compile Include="Tree\ClickHandlers\TreeNodeCompositeClickHandlerTests.cs" />
-    <Compile Include="Tree\ConnectionTreeDragAndDropHandlerTests.cs" />
-    <Compile Include="Tree\ConnectionTreeModelTests.cs" />
-    <Compile Include="Connection\ConnectionInfoInheritanceTests.cs" />
-    <Compile Include="Connection\ConnectionInfoTests.cs" />
-    <Compile Include="Connection\DefaultConnectionInfoTests.cs" />
-    <Compile Include="Connection\DefaultConnectionInheritanceTests.cs" />
-    <Compile Include="Container\ContainerInfoTests.cs" />
-    <Compile Include="IntegrationTests\ConnectionInheritanceIntegrationTests.cs" />
-    <Compile Include="ListViewTester.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Security\AeadCryptographyProviderTests.cs" />
-    <Compile Include="Security\CryptographyProviderFactoryTests.cs" />
-    <Compile Include="Security\EncryptedSecureStringTests.cs" />
-    <Compile Include="Security\LegacyRijndaelCryptographyProviderTests.cs" />
-    <Compile Include="Tree\ConnectionTreeTests.cs" />
-    <Compile Include="Tree\ClickHandlers\ExpandNodeClickHandlerTests.cs" />
-    <Compile Include="Tree\NodeSearcherTests.cs" />
-    <Compile Include="Tree\ClickHandlers\OpenConnectionClickHandlerTests.cs" />
-    <Compile Include="Tree\PreviouslyOpenedFolderExpanderTests.cs" />
-    <Compile Include="Tree\PreviousSessionOpenerTests.cs" />
-    <Compile Include="Tree\RootNodeInfoTests.cs" />
-    <Compile Include="Tree\ClickHandlers\SwitchToConnectionClickHandlerTests.cs" />
-    <Compile Include="Tree\SelectedConnectionDeletionConfirmerTests.cs" />
-    <Compile Include="UI\Controls\ConnectionTreeTests.cs" />
-    <Compile Include="UI\Controls\FilteredPropertyGridTests.cs" />
-    <Compile Include="UI\Controls\PageSequenceTests.cs" />
-    <Compile Include="UI\Controls\SecureTextBoxTestForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\SecureTextBoxTestForm.designer.cs">
-      <DependentUpon>SecureTextBoxTestForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\SecureTextBoxTests.cs" />
-    <Compile Include="UI\Controls\TestForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\TestForm.Designer.cs">
-      <DependentUpon>TestForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\TextBoxExtensionsTestForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\Controls\TextBoxExtensionsTestForm.designer.cs">
-      <DependentUpon>TextBoxExtensionsTestForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\Controls\TextBoxExtensionsTests.cs" />
-    <Compile Include="UI\DisplayPropertiesTests.cs" />
-    <Compile Include="UI\Forms\OptionsFormSetupAndTeardown.cs" />
-    <Compile Include="UI\Forms\PasswordFormTests.cs" />
-    <Compile Include="UI\WindowListTests.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowGeneralTests.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowRdpSpecialTests.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowSpecialTestsBase.cs" />
-    <Compile Include="UI\Window\ConfigWindowTests\ConfigWindowVncSpecialTests.cs" />
-    <Compile Include="UI\Window\ConnectionTreeWindowTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\SecureTextBoxTestForm.resx">
-      <DependentUpon>SecureTextBoxTestForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\TestForm.resx">
-      <DependentUpon>TestForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\Controls\TextBoxExtensionsTestForm.resx">
-      <DependentUpon>TextBoxExtensionsTestForm.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_5.xml" />
-    <None Include="Resources\test_puttyConnectionManager_database.dat" />
-    <None Include="Resources\test_rdcman_badVersionNumber.rdg" />
-    <None Include="Resources\test_rdcman_noversion.rdg" />
-    <None Include="Resources\test_rdcman_v2_2_badschemaversion.rdg" />
-    <None Include="Resources\test_rdcman_v2_2_schema1.rdg" />
-    <None Include="Resources\test_RDCMan_v2_7_schema3.rdg" />
-    <None Include="Resources\test_rdcman_v2_7_schema3_empty_values.rdg" />
-    <None Include="Resources\test_rdcman_v2_7_schema3_null_values.rdg" />
-    <None Include="Resources\test_remotedesktopconnection.rdp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_6.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_6_fullencryption.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_6_passwordis_Password.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_6_passwordis_Password_fullencryption.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_6_5k-iterations.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_5_fullencryption.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\confCons_v2_5_passwordis_Password_fullencryption.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\beta-update-portable.txt" />
-    <Content Include="Resources\beta-update.txt" />
-    <Content Include="Resources\dev-update-portable.txt" />
-    <Content Include="Resources\dev-update.txt" />
-    <None Include="Resources\TestImage.bmp" />
-    <Content Include="Resources\update-portable.txt" />
-    <Content Include="Resources\update.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\mRemoteNG\mRemoteNG.csproj">
-      <Project>{4934a491-40bc-4e5b-9166-ea1169a220f6}</Project>
-      <Name>mRemoteNG</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="BouncyCastle">
-      <Version>1.8.9</Version>
-    </PackageReference>
-    <PackageReference Include="Castle.Core">
-      <Version>4.4.1</Version>
-    </PackageReference>
-    <PackageReference Include="DockPanelSuite">
-      <Version>3.0.6</Version>
-    </PackageReference>
-    <PackageReference Include="log4net">
-      <Version>2.0.12</Version>
-    </PackageReference>
-    <PackageReference Include="NSubstitute">
-      <Version>4.2.2</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit">
-      <Version>3.13.2</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit.Console">
-      <Version>3.12.0</Version>
-    </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter">
-      <Version>4.0.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit.Console" Version="3.12.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
+    <PackageReference Include="NUnit.Extensions" Version="2.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ObjectListView.Official">
-      <Version>2.9.1</Version>
-    </PackageReference>
-    <PackageReference Include="OpenCover">
-      <Version>4.7.1221</Version>
-    </PackageReference>
-    <PackageReference Include="ReportGenerator">
-      <Version>4.8.11</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Threading.Tasks.Extensions">
-      <Version>4.5.4</Version>
-    </PackageReference>
+    <PackageReference Include="NUnitForms.Framework" Version="1.3.1" />
   </ItemGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <Private>False</Private>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <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>
\ No newline at end of file
+
+  <ItemGroup>
+    <ProjectReference Include="..\mRemoteNG\mRemoteNG.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
+
+</Project>