From bef3032886a4c3efacf94b212d9a01389329d2e8 Mon Sep 17 00:00:00 2001
From: AtelierWindows <SilicaAndPina@AtelierWindows.com>
Date: Thu, 28 Jan 2021 20:47:18 +1300
Subject: [PATCH] Port to .NET Core

---
 .../Horse Isle Server.csproj                  | 140 ++----------------
 .../Horse Isle Server.csproj.user             |   9 ++
 .../Properties/launchSettings.json            |  27 ++++
 .../Horse Isle Server/Server/GameClient.cs    |   2 +-
 .../Horse Isle Server/packages.config         |  10 --
 5 files changed, 49 insertions(+), 139 deletions(-)
 create mode 100644 Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj.user
 create mode 100644 Horse Isle Server/Horse Isle Server/Properties/launchSettings.json
 delete mode 100644 Horse Isle Server/Horse Isle Server/packages.config

diff --git a/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj b/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj
index a0b7f3c..29cb443 100644
--- a/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj	
+++ b/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj	
@@ -1,155 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" 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.Web">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C48CBD82-AB30-494A-8FFA-4DE7069B5827}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>HISP</RootNamespace>
-    <AssemblyName>Horse Isle Server</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <LangVersion>7.0</LangVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>icon.ico</ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="MySqlConnector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySqlConnector.1.0.1\lib\net471\MySqlConnector.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="System" />
-    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.0\lib\netstandard2.0\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Game\AbuseReport.cs" />
-    <Compile Include="Game\Chat\Command.cs" />
-    <Compile Include="Game\GameExceptions.cs" />
-    <Compile Include="Game\Horse\HorseInfo.cs" />
-    <Compile Include="Game\Horse\HorseInstance.cs" />
-    <Compile Include="Game\Horse\WildHorse.cs" />
-    <Compile Include="Game\Inventory\HorseInventory.cs" />
-    <Compile Include="Game\Inventory\InventoryItem.cs" />
-    <Compile Include="Game\Quest.cs" />
-    <Compile Include="Game\Services\Inn.cs" />
-    <Compile Include="Game\Services\Shop.cs" />
-    <Compile Include="Game\Inventory\ShopInventory.cs" />
-    <Compile Include="Game\Services\Vet.cs" />
-    <Compile Include="Game\SwfModules\Brickpoet.cs" />
-    <Compile Include="Game\Tracking.cs" />
-    <Compile Include="Player\Award.cs" />
-    <Compile Include="Player\Equips\Jewelry.cs" />
-    <Compile Include="Player\Equips\CompetitionGear.cs" />
-    <Compile Include="Player\Highscore.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
+    <Compile Update="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Security\Authentication.cs" />
-    <Compile Include="Game\Chat\Chat.cs" />
-    <Compile Include="Server\GameClient.cs" />
-    <Compile Include="Server\Converters.cs" />
-    <Compile Include="Server\Database.cs" />
-    <Compile Include="Player\Friends.cs" />
-    <Compile Include="Server\GameDataJson.cs" />
-    <Compile Include="Game\Inventory\IInventory.cs" />
-    <Compile Include="Game\DroppedItems.cs" />
-    <Compile Include="Game\ItemInstance.cs" />
-    <Compile Include="Server\Logger.cs" />
-    <Compile Include="Server\ConfigReader.cs" />
-    <Compile Include="Security\CrossDomainPolicy.cs" />
-    <Compile Include="Player\Mailbox.cs" />
-    <Compile Include="Game\Map.cs" />
-    <Compile Include="Game\Messages.cs" />
-    <Compile Include="Game\Item.cs" />
-    <Compile Include="Game\Meta.cs" />
-    <Compile Include="Game\Npc.cs" />
-    <Compile Include="Server\PacketBuilder.cs" />
-    <Compile Include="Game\Inventory\PlayerInventory.cs" />
-    <Compile Include="Player\PlayerQuests.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Security\RandomID.cs" />
-    <Compile Include="Server\GameServer.cs" />
-    <Compile Include="Player\TrackedQuest.cs" />
-    <Compile Include="Game\Services\Transport.cs" />
-    <Compile Include="Player\User.cs" />
-    <Compile Include="Game\World.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-    <None Include="Resources\server.properties" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\default_cross_domain.xml" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <PackageReference Include="MySqlConnector" Version="1.2.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
   <PropertyGroup>
     <PostBuildEvent>copy "$(SolutionDir)..\DataCollection\GameData.json" "$(TargetDir)GameData.json" /Y
 copy "$(SolutionDir)..\DataCollection\HI1.MAP" "$(TargetDir)HI1.MAP" /Y</PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj.user b/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj.user
new file mode 100644
index 0000000..6698dbc
--- /dev/null
+++ b/Horse Isle Server/Horse Isle Server/Horse Isle Server.csproj.user	
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ActiveDebugProfile>Horse Isle Server</ActiveDebugProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Horse Isle Server/Horse Isle Server/Properties/launchSettings.json b/Horse Isle Server/Horse Isle Server/Properties/launchSettings.json
new file mode 100644
index 0000000..c6d8646
--- /dev/null
+++ b/Horse Isle Server/Horse Isle Server/Properties/launchSettings.json	
@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:15584/",
+      "sslPort": 44326
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Horse Isle Server": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Horse Isle Server/Horse Isle Server/Server/GameClient.cs b/Horse Isle Server/Horse Isle Server/Server/GameClient.cs
index 3d1557c..c657642 100644
--- a/Horse Isle Server/Horse Isle Server/Server/GameClient.cs	
+++ b/Horse Isle Server/Horse Isle Server/Server/GameClient.cs	
@@ -291,7 +291,7 @@ namespace HISP.Server
             LoggedinUser = null;
             ClientSocket.Close();
             ClientSocket.Dispose();
-            recvPackets.Abort();
+            //recvPackets.Anort();
         }
 
        public void Kick(string Reason)
diff --git a/Horse Isle Server/Horse Isle Server/packages.config b/Horse Isle Server/Horse Isle Server/packages.config
deleted file mode 100644
index 550ff67..0000000
--- a/Horse Isle Server/Horse Isle Server/packages.config	
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="MySqlConnector" version="1.0.1" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
-  <package id="System.Buffers" version="4.4.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.0" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net48" />
-</packages>
\ No newline at end of file