From 24b545f8e22395bb409f3a55f0913b9fff3c9597 Mon Sep 17 00:00:00 2001
From: Ray Koopa <ray@syroot.com>
Date: Tue, 1 Jan 2019 22:03:10 +0100
Subject: [PATCH] Move server to correct subdirectory.

---
 .../Syroot.Worms.OnlineWorms.Server.csproj          | 11 -----------
 .../Client.cs                                       |  0
 .../Log.cs                                          |  0
 .../Net/GameConnection.cs                           |  2 +-
 .../Net/Packet.cs                                   |  0
 .../Net/PacketAttribute.cs                          |  0
 .../Net/PacketFactory.cs                            |  0
 .../Net/PacketStream.cs                             |  2 ++
 .../Net/Packets/ConnectQueryPacket.cs               |  0
 .../Net/Packets/ConnectReplyPacket.cs               |  0
 .../Net/Packets/LoginQueryPacket.cs                 |  0
 .../Net/Packets/LoginReplyPacket.cs                 |  0
 .../Net/Packets/RawQueryPacket.cs                   |  0
 .../Program.cs                                      |  0
 .../Server.cs                                       |  0
 .../Syroot.Worms.OnlineWorms.Server.csproj          | 13 +++++++++++++
 16 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 src/Syroot.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Client.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Log.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/GameConnection.cs (99%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/Packet.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/PacketAttribute.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/PacketFactory.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/PacketStream.cs (99%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/Packets/ConnectQueryPacket.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/Packets/ConnectReplyPacket.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/Packets/LoginQueryPacket.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/Packets/LoginReplyPacket.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Net/Packets/RawQueryPacket.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Program.cs (100%)
 rename src/{Syroot.OnlineWorms.Server => Syroot.Worms.OnlineWorms.Server}/Server.cs (100%)
 create mode 100644 src/Syroot.Worms.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj

diff --git a/src/Syroot.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj b/src/Syroot.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj
deleted file mode 100644
index 0d8db27..0000000
--- a/src/Syroot.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
-        <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-    <ItemGroup>
-      <PackageReference Include="Syroot.BinaryData" Version="5.0.0" />
-      <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
-    </ItemGroup>
-</Project>
diff --git a/src/Syroot.OnlineWorms.Server/Client.cs b/src/Syroot.Worms.OnlineWorms.Server/Client.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Client.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Client.cs
diff --git a/src/Syroot.OnlineWorms.Server/Log.cs b/src/Syroot.Worms.OnlineWorms.Server/Log.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Log.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Log.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/GameConnection.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/GameConnection.cs
similarity index 99%
rename from src/Syroot.OnlineWorms.Server/Net/GameConnection.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/GameConnection.cs
index 09886f1..c50bd1a 100644
--- a/src/Syroot.OnlineWorms.Server/Net/GameConnection.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/GameConnection.cs
@@ -82,7 +82,7 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
             {
                 if (disposing)
                 {
-                    TcpClient.Dispose();
+                    TcpClient.Close();
                     _sendStream.Dispose();
                 }
 
diff --git a/src/Syroot.OnlineWorms.Server/Net/Packet.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packet.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/Packet.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packet.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/PacketAttribute.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/PacketAttribute.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/PacketAttribute.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/PacketAttribute.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/PacketFactory.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/PacketFactory.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/PacketFactory.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/PacketFactory.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/PacketStream.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/PacketStream.cs
similarity index 99%
rename from src/Syroot.OnlineWorms.Server/Net/PacketStream.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/PacketStream.cs
index 2fee786..f91b9fb 100644
--- a/src/Syroot.OnlineWorms.Server/Net/PacketStream.cs
+++ b/src/Syroot.Worms.OnlineWorms.Server/Net/PacketStream.cs
@@ -20,7 +20,9 @@ namespace Syroot.Worms.OnlineWorms.Server.Net
 
         static PacketStream()
         {
+#if NETCOREAPP2_1
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+#endif
             _win949Encoding = Encoding.GetEncoding(949);
         }
 
diff --git a/src/Syroot.OnlineWorms.Server/Net/Packets/ConnectQueryPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQueryPacket.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/Packets/ConnectQueryPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectQueryPacket.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/Packets/ConnectReplyPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReplyPacket.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/Packets/ConnectReplyPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/ConnectReplyPacket.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/Packets/LoginQueryPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQueryPacket.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/Packets/LoginQueryPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginQueryPacket.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/Packets/LoginReplyPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReplyPacket.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/Packets/LoginReplyPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/LoginReplyPacket.cs
diff --git a/src/Syroot.OnlineWorms.Server/Net/Packets/RawQueryPacket.cs b/src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQueryPacket.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Net/Packets/RawQueryPacket.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Net/Packets/RawQueryPacket.cs
diff --git a/src/Syroot.OnlineWorms.Server/Program.cs b/src/Syroot.Worms.OnlineWorms.Server/Program.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Program.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Program.cs
diff --git a/src/Syroot.OnlineWorms.Server/Server.cs b/src/Syroot.Worms.OnlineWorms.Server/Server.cs
similarity index 100%
rename from src/Syroot.OnlineWorms.Server/Server.cs
rename to src/Syroot.Worms.OnlineWorms.Server/Server.cs
diff --git a/src/Syroot.Worms.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj b/src/Syroot.Worms.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj
new file mode 100644
index 0000000..c5dccc7
--- /dev/null
+++ b/src/Syroot.Worms.OnlineWorms.Server/Syroot.Worms.OnlineWorms.Server.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Syroot.BinaryData" Version="5.0.0" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
+    </ItemGroup>
+</Project>