From ff9292bc4236cb85fde0712d7872e3040053bea0 Mon Sep 17 00:00:00 2001
From: Faryan Rezagholi <faryan.rezagholi@gmail.com>
Date: Tue, 26 May 2020 12:22:24 +0200
Subject: [PATCH] migrated to PackageReference

---
 mRemoteNG.Specs/mRemoteNG.Specs.csproj | 149 +++++++++----------------
 mRemoteNG.Specs/packages.config        |  37 ------
 mRemoteNGTests/mRemoteNGTests.csproj   |  82 +++++++-------
 mRemoteNGTests/packages.config         |  22 ----
 mRemoteV1/Console.ico                  | Bin 32591 -> 0 bytes
 mRemoteV1/mRemoteV1.csproj             | 113 +++++++------------
 mRemoteV1/packages.config              |  24 ----
 7 files changed, 138 insertions(+), 289 deletions(-)
 delete mode 100644 mRemoteNG.Specs/packages.config
 delete mode 100644 mRemoteNGTests/packages.config
 delete mode 100644 mRemoteV1/Console.ico
 delete mode 100644 mRemoteV1/packages.config

diff --git a/mRemoteNG.Specs/mRemoteNG.Specs.csproj b/mRemoteNG.Specs/mRemoteNG.Specs.csproj
index 6ed9287da..6b810c9ca 100644
--- a/mRemoteNG.Specs/mRemoteNG.Specs.csproj
+++ b/mRemoteNG.Specs/mRemoteNG.Specs.csproj
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.props" Condition="Exists('..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.props')" />
-  <Import Project="..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -37,95 +34,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BoDi, Version=1.4.1.0, Culture=neutral, PublicKeyToken=ff7cd5ea2744b496, processorArchitecture=MSIL">
-      <HintPath>..\packages\BoDi.1.4.1\lib\net45\BoDi.dll</HintPath>
-    </Reference>
-    <Reference Include="Cucumber.Messages, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b10c5988214f940c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Cucumber.Messages.6.0.2\lib\net45\Cucumber.Messages.dll</HintPath>
-    </Reference>
-    <Reference Include="Gherkin, Version=6.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
-      <HintPath>..\packages\Gherkin.6.0.0\lib\net45\Gherkin.dll</HintPath>
-    </Reference>
-    <Reference Include="Google.Protobuf, Version=3.12.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.12.1\lib\net45\Google.Protobuf.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-      <Private>True</Private>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="TechTalk.SpecFlow, Version=3.1.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.3.1.97\lib\net45\TechTalk.SpecFlow.dll</HintPath>
-    </Reference>
-    <Reference Include="TechTalk.SpecFlow.NUnit.SpecFlowPlugin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.NUnit.3.1.97\lib\net45\TechTalk.SpecFlow.NUnit.SpecFlowPlugin.dll</HintPath>
-    </Reference>
-    <Reference Include="Utf8Json, Version=1.3.7.0, Culture=neutral, PublicKeyToken=8a73d3ba7e392e27, processorArchitecture=MSIL">
-      <HintPath>..\packages\Utf8Json.1.3.7\lib\net47\Utf8Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Features\CredentialRepository.feature.cs">
@@ -154,7 +71,6 @@
       <Generator>SpecFlowSingleFileGenerator</Generator>
       <LastGenOutput>CredentialRepositoryList.feature.cs</LastGenOutput>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -165,20 +81,59 @@
       <Name>mRemoteV1</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Include="Cucumber.Messages">
+      <Version>6.0.2</Version>
+    </PackageReference>
+    <PackageReference Include="Google.Protobuf">
+      <Version>3.12.1</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.12.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit.Runners">
+      <Version>3.11.1</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter">
+      <Version>3.16.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="SpecFlow.NUnit.Runners">
+      <Version>3.1.97</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>4.7.1</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" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\SpecFlow.3.1.97\build\SpecFlow.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.3.1.97\build\SpecFlow.targets'))" />
-    <Error Condition="!Exists('..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.props'))" />
-    <Error Condition="!Exists('..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.targets'))" />
-  </Target>
-  <Import Project="..\packages\SpecFlow.3.1.97\build\SpecFlow.targets" Condition="Exists('..\packages\SpecFlow.3.1.97\build\SpecFlow.targets')" />
-  <Import Project="..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.targets" Condition="Exists('..\packages\SpecFlow.NUnit.3.1.97\build\SpecFlow.NUnit.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">
diff --git a/mRemoteNG.Specs/packages.config b/mRemoteNG.Specs/packages.config
deleted file mode 100644
index d1804d23a..000000000
--- a/mRemoteNG.Specs/packages.config
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BoDi" version="1.4.1" targetFramework="net472" />
-  <package id="Cucumber.Messages" version="6.0.2" targetFramework="net472" />
-  <package id="Gherkin" version="6.0.0" targetFramework="net472" />
-  <package id="Google.Protobuf" version="3.12.1" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
-  <package id="NUnit" version="3.12.0" targetFramework="net472" />
-  <package id="NUnit.Console" version="3.11.1" targetFramework="net472" />
-  <package id="NUnit.ConsoleRunner" version="3.11.1" targetFramework="net472" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net472" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.8.0" targetFramework="net472" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net472" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.7" targetFramework="net472" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net472" />
-  <package id="NUnit.Runners" version="3.11.1" targetFramework="net472" />
-  <package id="NUnit3TestAdapter" version="3.16.1" targetFramework="net472" developmentDependency="true" />
-  <package id="SpecFlow" version="3.1.97" targetFramework="net472" />
-  <package id="SpecFlow.NUnit" version="3.1.97" targetFramework="net472" />
-  <package id="SpecFlow.NUnit.Runners" version="3.1.97" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.IO" version="4.3.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Reflection.Emit" version="4.7.0" targetFramework="net472" />
-  <package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="net472" />
-  <package id="System.Runtime" version="4.3.1" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-  <package id="Utf8Json" version="1.3.7" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj
index 87b376573..68f06e1ad 100644
--- a/mRemoteNGTests/mRemoteNGTests.csproj
+++ b/mRemoteNGTests/mRemoteNGTests.csproj
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" />
-  <Import Project="..\packages\ReportGenerator.4.5.8\build\netstandard2.0\ReportGenerator.props" Condition="Exists('..\packages\ReportGenerator.4.5.8\build\netstandard2.0\ReportGenerator.props')" />
-  <Import Project="..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -60,45 +57,18 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.6.1\lib\BouncyCastle.Crypto.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NSubstitute, Version=4.2.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <HintPath>..\packages\NSubstitute.4.2.1\lib\net46\NSubstitute.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="NUnitForms">
       <HintPath>nUnitForms\bin\NUnitForms.dll</HintPath>
     </Reference>
-    <Reference Include="ObjectListView, Version=2.9.1.1072, Culture=neutral, PublicKeyToken=b1c5bf581481bcd4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ObjectListView.Official.2.9.1\lib\net20\ObjectListView.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.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <Choose>
@@ -271,7 +241,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="Resources\confCons_v2_5.xml" />
     <None Include="Resources\test_puttyConnectionManager_database.dat" />
     <None Include="Resources\test_rdcman_badVersionNumber.rdg" />
@@ -319,6 +288,49 @@
       <Name>mRemoteV1</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle">
+      <Version>1.8.6.1</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.8</Version>
+    </PackageReference>
+    <PackageReference Include="NSubstitute">
+      <Version>4.2.1</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit">
+      <Version>3.12.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit.Console">
+      <Version>3.11.1</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter">
+      <Version>3.16.1</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="OpenCover">
+      <Version>4.7.922</Version>
+    </PackageReference>
+    <PackageReference Include="ReportGenerator">
+      <Version>4.5.8</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>4.7.1</Version>
+    </PackageReference>
+    <PackageReference Include="System.Threading.Tasks.Extensions">
+      <Version>4.5.4</Version>
+    </PackageReference>
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
@@ -339,14 +351,6 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\ReportGenerator.4.5.8\build\netstandard2.0\ReportGenerator.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ReportGenerator.4.5.8\build\netstandard2.0\ReportGenerator.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/mRemoteNGTests/packages.config b/mRemoteNGTests/packages.config
deleted file mode 100644
index 7038a532b..000000000
--- a/mRemoteNGTests/packages.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BouncyCastle" version="1.8.6.1" targetFramework="net472" />
-  <package id="Castle.Core" version="4.4.1" targetFramework="net472" />
-  <package id="DockPanelSuite" version="3.0.6" targetFramework="net472" />
-  <package id="log4net" version="2.0.8" targetFramework="net472" />
-  <package id="NSubstitute" version="4.2.1" targetFramework="net472" />
-  <package id="NUnit" version="3.12.0" targetFramework="net472" />
-  <package id="NUnit.Console" version="3.11.1" targetFramework="net472" />
-  <package id="NUnit.ConsoleRunner" version="3.11.1" targetFramework="net472" />
-  <package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net472" />
-  <package id="NUnit.Extension.NUnitV2Driver" version="3.8.0" targetFramework="net472" />
-  <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net472" />
-  <package id="NUnit.Extension.TeamCityEventListener" version="1.0.7" targetFramework="net472" />
-  <package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net472" />
-  <package id="NUnit3TestAdapter" version="3.16.1" targetFramework="net472" developmentDependency="true" />
-  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net472" />
-  <package id="OpenCover" version="4.7.922" targetFramework="net472" />
-  <package id="ReportGenerator" version="4.5.8" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/mRemoteV1/Console.ico b/mRemoteV1/Console.ico
deleted file mode 100644
index 6800624b9fccaaeda43ddd7ac4696492640f2780..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32591
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
U|0aZb`dfi!)xSdmR1V?)0m^j7jsO4v

diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 8e2e3f4d9..d57f74107 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <Import Project="..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.props')" />
   <Import Project="..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.props')" />
   <Import Project="..\packages\cef.redist.x86.79.1.35\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.79.1.35\build\cef.redist.x86.props')" />
@@ -53,45 +52,9 @@
     <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.6.1\lib\BouncyCastle.Crypto.dll</HintPath>
-    </Reference>
-    <Reference Include="ConsoleControl, Version=1.3.0.0, Culture=neutral, PublicKeyToken=7edd23586f5e297f, processorArchitecture=MSIL">
-      <HintPath>..\packages\ConsoleControl.1.3.0\lib\net40-client\ConsoleControl.dll</HintPath>
-    </Reference>
-    <Reference Include="ConsoleControlAPI, Version=1.3.0.0, Culture=neutral, PublicKeyToken=7c86b8a36b9c33e2, processorArchitecture=MSIL">
-      <HintPath>..\packages\ConsoleControlAPI.1.3.0\lib\net40\ConsoleControlAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="Google.Protobuf, Version=3.12.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.12.1\lib\net45\Google.Protobuf.dll</HintPath>
-    </Reference>
-    <Reference Include="K4os.Compression.LZ4, Version=1.1.11.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll</HintPath>
-    </Reference>
-    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.1.11.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.1.11\lib\net46\K4os.Compression.LZ4.Streams.dll</HintPath>
-    </Reference>
-    <Reference Include="K4os.Hash.xxHash, Version=1.0.6.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="mscorlib" />
-    <Reference Include="MySql.Data, Version=8.0.20.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.20\lib\net452\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="ObjectListView, Version=2.9.1.1072, Culture=neutral, PublicKeyToken=b1c5bf581481bcd4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ObjectListView.Official.2.9.1\lib\net20\ObjectListView.dll</HintPath>
-    </Reference>
-    <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -101,48 +64,18 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Security" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.20\lib\net452\Ubiety.Dns.Core.dll</HintPath>
-    </Reference>
     <Reference Include="VncSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=61974755c7bfea7c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\VncSharp.dll</HintPath>
     </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
-    </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2003, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.ThemeVS2003.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2003.dll</HintPath>
-    </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2012, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.ThemeVS2012.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012.dll</HintPath>
-    </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2013, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.ThemeVS2013.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2013.dll</HintPath>
-    </Reference>
-    <Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.ThemeVS2015.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
-    <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.20\lib\net452\Zstandard.Net.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Credential\Records\" />
@@ -1205,7 +1138,6 @@
     <None Include="Documentation\user_interface\port_scan.rst" />
     <None Include="Documentation\user_interface\quick_connect.rst" />
     <None Include="Documentation\howtos\vmrdp.rst" />
-    <None Include="packages.config" />
     <None Include="Resources\Templates\AppIcon.psd" />
     <None Include="Resources\Templates\Header_dark.psd" />
     <None Include="Resources\Templates\Header_light.psd" />
@@ -1237,7 +1169,6 @@
     </None>
     <None Include="Documentation\images\connections_status.png" />
     <None Include="Documentation\images\putty.png" />
-    <Content Include="Console.ico" />
     <Content Include="Documentation\images\ssh_tunnel.png" />
     <Content Include="Documentation\mssql_db_setup.sql" />
     <Content Include="Documentation\mysql_db_setup.sql" />
@@ -1696,6 +1627,49 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle">
+      <Version>1.8.6.1</Version>
+    </PackageReference>
+    <PackageReference Include="ConsoleControl">
+      <Version>1.3.0</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.12.1</Version>
+    </PackageReference>
+    <PackageReference Include="log4net">
+      <Version>2.0.8</Version>
+    </PackageReference>
+    <PackageReference Include="MySql.Data">
+      <Version>8.0.20</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter">
+      <Version>3.16.1</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="System.Memory">
+      <Version>4.5.4</Version>
+    </PackageReference>
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
+      <Version>4.7.1</Version>
+    </PackageReference>
+  </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.
@@ -1791,7 +1765,6 @@ powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_mrem
     <Error Condition="!Exists('..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets'))" />
     <Error Condition="!Exists('..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Geckofx60.32.60.0.39\build\Geckofx60.32.targets'))" />
     <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.15.1\build\net35\NUnit3TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.16.1\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
   <Import Project="..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.79.1.350\build\CefSharp.Common.targets')" />
   <Import Project="..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.79.1.350\build\CefSharp.WinForms.targets')" />
diff --git a/mRemoteV1/packages.config b/mRemoteV1/packages.config
deleted file mode 100644
index b2cfe403d..000000000
--- a/mRemoteV1/packages.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="BouncyCastle" version="1.8.6.1" targetFramework="net472" />
-  <package id="ConsoleControl" version="1.3.0" targetFramework="net472" />
-  <package id="ConsoleControlAPI" version="1.3.0" targetFramework="net472" />
-  <package id="DockPanelSuite" version="3.0.6" targetFramework="net472" />
-  <package id="DockPanelSuite.ThemeVS2003" version="3.0.6" targetFramework="net472" />
-  <package id="DockPanelSuite.ThemeVS2012" version="3.0.6" targetFramework="net472" />
-  <package id="DockPanelSuite.ThemeVS2013" version="3.0.6" targetFramework="net472" />
-  <package id="DockPanelSuite.ThemeVS2015" version="3.0.6" targetFramework="net472" />
-  <package id="Google.Protobuf" version="3.12.1" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4" version="1.1.11" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4.Streams" version="1.1.11" targetFramework="net472" />
-  <package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net472" />
-  <package id="log4net" version="2.0.8" targetFramework="net472" />
-  <package id="MySql.Data" version="8.0.20" targetFramework="net472" />
-  <package id="NUnit3TestAdapter" version="3.16.1" targetFramework="net472" developmentDependency="true" />
-  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net472" />
-  <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net472" />
-</packages>
\ No newline at end of file