From 6d8472184e3b43bc2ca8a5ea396166004f651abc Mon Sep 17 00:00:00 2001
From: MaxXor <admin@maxxor.org>
Date: Sat, 3 Jul 2021 20:55:36 +0200
Subject: [PATCH] Initial port to .NET 5.0

---
 Quasar.Client/ILRepack.targets                | 26 ----------------
 Quasar.Client/Quasar.Client.csproj            | 12 ++++----
 .../Quasar.Common.Tests.csproj                |  8 ++---
 Quasar.Common/Quasar.Common.csproj            |  7 +++--
 Quasar.Server/Quasar.Server.csproj            | 30 +++++++------------
 5 files changed, 24 insertions(+), 59 deletions(-)
 delete mode 100644 Quasar.Client/ILRepack.targets

diff --git a/Quasar.Client/ILRepack.targets b/Quasar.Client/ILRepack.targets
deleted file mode 100644
index 581ece8f..00000000
--- a/Quasar.Client/ILRepack.targets
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="ILRepacker" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
-
-  <ItemGroup>
-    <InputAssemblies Include="$(TargetPath)"/>
-    <InputAssemblies Include="$(TargetDir)protobuf-net.dll"/>
-    <InputAssemblies Include="$(TargetDir)Gma.System.MouseKeyHook.dll"/>
-    <InputAssemblies Include="$(TargetDir)Quasar.Common.dll"/>
-    <InputAssemblies Include="$(TargetDir)BouncyCastle.Crypto.dll"/>
-  </ItemGroup>
-
-  <ILRepack
-    Parallel="true"
-    Internalize="true"
-    InputAssemblies="@(InputAssemblies)"
-    TargetKind="SameAsPrimaryAssembly"
-    OutputFile="$(TargetPath)"/>
-  </Target>
-  <Target Name="CopyWindows" AfterTargets="PostBuildEvent" Condition="'$(OS)' == 'Windows_NT' ">
-    <Exec Command="copy $(TargetPath) $(TargetDir)client.bin /Y" />
-  </Target>
-  <Target Name="CopyUnix" AfterTargets="PostBuildEvent" Condition="'$(OS)' != 'Windows_NT' ">
-    <Exec Command="cp $(TargetPath) $(TargetDir)client.bin" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/Quasar.Client/Quasar.Client.csproj b/Quasar.Client/Quasar.Client.csproj
index 8284ed17..aae8c7ed 100644
--- a/Quasar.Client/Quasar.Client.csproj
+++ b/Quasar.Client/Quasar.Client.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>Client</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
@@ -57,15 +57,13 @@
     <ProjectReference Include="..\Quasar.Common\Quasar.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ILRepack.Lib.MSBuild.Task">
-      <Version>2.0.18.1</Version>
-    </PackageReference>
     <PackageReference Include="MouseKeyHook">
       <Version>5.6.0</Version>
     </PackageReference>
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.6.7" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
     <PackageReference Include="protobuf-net">
-      <Version>2.4.6</Version>
+      <Version>3.0.101</Version>
     </PackageReference>
+    <PackageReference Include="System.Management" Version="5.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Quasar.Common.Tests/Quasar.Common.Tests.csproj b/Quasar.Common.Tests/Quasar.Common.Tests.csproj
index 7ff75251..346d1da9 100644
--- a/Quasar.Common.Tests/Quasar.Common.Tests.csproj
+++ b/Quasar.Common.Tests/Quasar.Common.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -12,9 +12,9 @@
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Quasar.Common\Quasar.Common.csproj" />
diff --git a/Quasar.Common/Quasar.Common.csproj b/Quasar.Common/Quasar.Common.csproj
index 4c7f419a..b87b37c5 100644
--- a/Quasar.Common/Quasar.Common.csproj
+++ b/Quasar.Common/Quasar.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
@@ -19,9 +19,12 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="protobuf-net">
-      <Version>2.4.6</Version>
+      <Version>3.0.101</Version>
     </PackageReference>
+    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Include="System.Management" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Win32.Registry">
diff --git a/Quasar.Server/Quasar.Server.csproj b/Quasar.Server/Quasar.Server.csproj
index 097ecb38..5fd95b67 100644
--- a/Quasar.Server/Quasar.Server.csproj
+++ b/Quasar.Server/Quasar.Server.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AssemblyName>Quasar</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
@@ -34,9 +34,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Update="Controls\DotNetBarTabControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Update="Controls\DotNetBarTabControl.cs" />
     <Compile Update="Controls\HexEditor\HexEditor.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -46,9 +44,7 @@
     <Compile Update="Controls\RapidPictureBox.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Update="Controls\RegistryTreeView.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Update="Controls\RegistryTreeView.cs" />
     <Compile Update="Controls\WordTextBox.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -85,9 +81,7 @@
     <Compile Update="Forms\FrmConnections.Designer.cs">
       <DependentUpon>FrmConnections.cs</DependentUpon>
     </Compile>
-    <Compile Update="Forms\FrmFileManager.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Update="Forms\FrmFileManager.cs" />
     <Compile Update="Forms\FrmFileManager.Designer.cs">
       <DependentUpon>FrmFileManager.cs</DependentUpon>
     </Compile>
@@ -112,9 +106,7 @@
     <Compile Update="Forms\FrmPasswordRecovery.Designer.cs">
       <DependentUpon>FrmPasswordRecovery.cs</DependentUpon>
     </Compile>
-    <Compile Update="Forms\FrmRegistryEditor.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Update="Forms\FrmRegistryEditor.cs" />
     <Compile Update="Forms\FrmRegistryEditor.Designer.cs">
       <DependentUpon>FrmRegistryEditor.cs</DependentUpon>
     </Compile>
@@ -148,9 +140,7 @@
     <Compile Update="Forms\FrmRemoteDesktop.Designer.cs">
       <DependentUpon>FrmRemoteDesktop.cs</DependentUpon>
     </Compile>
-    <Compile Update="Forms\FrmRemoteShell.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Update="Forms\FrmRemoteShell.cs" />
     <Compile Update="Forms\FrmRemoteShell.Designer.cs">
       <DependentUpon>FrmRemoteShell.cs</DependentUpon>
     </Compile>
@@ -301,15 +291,15 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Mono.Cecil">
-      <Version>0.11.2</Version>
+      <Version>0.11.4</Version>
     </PackageReference>
     <PackageReference Include="MouseKeyHook">
       <Version>5.6.0</Version>
     </PackageReference>
     <PackageReference Include="Open.Nat" Version="2.1.0" />
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.6.7" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
     <PackageReference Include="protobuf-net">
-      <Version>2.4.6</Version>
+      <Version>3.0.101</Version>
     </PackageReference>
     <PackageReference Include="Vestris.ResourceLib">
       <Version>2.1.0</Version>