调整服务器代码目录结构

9f9c8516 · tanghai · 6f67e5c0 · 6f67e5c0 · 9f9c8516 · 9f9c8516
109 changed file
--- a/Server/Lib/ENet.dll
+++ b/Server/Lib/ENet.dll
--- a/Server/Server.App/Server.App.csproj
+++ b/Server/Server.App/Server.App.csproj
@@ -50,20 +50,20 @@
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Base\Server.Base.csproj">
+    <None Include="NLog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Server.Base\Server.Base.csproj">
      <Project>{afbad3d5-c827-4ba6-9940-7060b6c39306}</Project>
      <Name>Server.Base</Name>
    </ProjectReference>
-    <ProjectReference Include="..\Model\Server.Model.csproj">
+    <ProjectReference Include="..\Server.Model\Server.Model.csproj">
      <Project>{e997a298-c1e1-4dc7-85a3-4b0e2a6e196d}</Project>
      <Name>Server.Model</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
-    <None Include="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </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.

--- a/Server/Base/Config/ACategory.cs
+++ b/Server/Base/Config/ACategory.cs
--- a/Server/Base/Config/AConfig.cs
+++ b/Server/Base/Config/AConfig.cs
--- a/Server/Base/Config/ConfigAttribute.cs
+++ b/Server/Base/Config/ConfigAttribute.cs
--- a/Server/Base/Config/ICategory.cs
+++ b/Server/Base/Config/ICategory.cs
--- a/Server/Base/DoubleMap.cs
+++ b/Server/Base/DoubleMap.cs
--- a/Server/Base/Helper/ArrayHelper.cs
+++ b/Server/Base/Helper/ArrayHelper.cs
--- a/Server/Base/Helper/ByteHelper.cs
+++ b/Server/Base/Helper/ByteHelper.cs
--- a/Server/Base/Helper/EnumHelper.cs
+++ b/Server/Base/Helper/EnumHelper.cs
--- a/Server/Base/Helper/FileHelper.cs
+++ b/Server/Base/Helper/FileHelper.cs
--- a/Server/Base/Helper/IdGenerater.cs
+++ b/Server/Base/Helper/IdGenerater.cs
--- a/Server/Base/Helper/MD5Helper.cs
+++ b/Server/Base/Helper/MD5Helper.cs
--- a/Server/Base/Helper/MongoHelper.cs
+++ b/Server/Base/Helper/MongoHelper.cs
--- a/Server/Base/Helper/ProtobufHelper.cs
+++ b/Server/Base/Helper/ProtobufHelper.cs
--- a/Server/Base/Helper/RandomHelper.cs
+++ b/Server/Base/Helper/RandomHelper.cs
--- a/Server/Base/Helper/StringHelper.cs
+++ b/Server/Base/Helper/StringHelper.cs
--- a/Server/Base/Helper/TimeHelper.cs
+++ b/Server/Base/Helper/TimeHelper.cs
--- a/Server/Base/Helper/ZipHelper.cs
+++ b/Server/Base/Helper/ZipHelper.cs
--- a/Server/Base/Log/ALogDecorater.cs
+++ b/Server/Base/Log/ALogDecorater.cs
--- a/Server/Base/Log/ILog.cs
+++ b/Server/Base/Log/ILog.cs
--- a/Server/Base/Log/Log.cs
+++ b/Server/Base/Log/Log.cs
--- a/Server/Base/Log/NLogAdapter.cs
+++ b/Server/Base/Log/NLogAdapter.cs
--- a/Server/Base/Log/StackInfoDecorater.cs
+++ b/Server/Base/Log/StackInfoDecorater.cs
--- a/Server/Base/MultiMap.cs
+++ b/Server/Base/MultiMap.cs
--- a/Server/Base/Network/AChannel.cs
+++ b/Server/Base/Network/AChannel.cs
--- a/Server/Base/Network/AService.cs
+++ b/Server/Base/Network/AService.cs
--- a/Server/Base/Network/TNet/PacketParser.cs
+++ b/Server/Base/Network/TNet/PacketParser.cs
--- a/Server/Base/Network/TNet/TBuffer.cs
+++ b/Server/Base/Network/TNet/TBuffer.cs
--- a/Server/Base/Network/TNet/TChannel.cs
+++ b/Server/Base/Network/TNet/TChannel.cs
--- a/Server/Base/Network/TNet/TPoller.cs
+++ b/Server/Base/Network/TNet/TPoller.cs
--- a/Server/Base/Network/TNet/TService.cs
+++ b/Server/Base/Network/TNet/TService.cs
--- a/Server/Base/Network/TNet/TSocket.cs
+++ b/Server/Base/Network/TNet/TSocket.cs
--- a/Server/Base/Network/UNet/Library.cs
+++ b/Server/Base/Network/UNet/Library.cs
--- a/Server/Base/Network/UNet/NativeMethods.cs
+++ b/Server/Base/Network/UNet/NativeMethods.cs
--- a/Server/Base/Network/UNet/NativeStructs.cs
+++ b/Server/Base/Network/UNet/NativeStructs.cs
--- a/Server/Base/Network/UNet/UAddress.cs
+++ b/Server/Base/Network/UNet/UAddress.cs
--- a/Server/Base/Network/UNet/UChannel.cs
+++ b/Server/Base/Network/UNet/UChannel.cs
--- a/Server/Base/Network/UNet/UPacket.cs
+++ b/Server/Base/Network/UNet/UPacket.cs
--- a/Server/Base/Network/UNet/UPoller.cs
+++ b/Server/Base/Network/UNet/UPoller.cs
--- a/Server/Base/Network/UNet/UService.cs
+++ b/Server/Base/Network/UNet/UService.cs
--- a/Server/Base/Network/UNet/USocket.cs
+++ b/Server/Base/Network/UNet/USocket.cs
--- a/Server/Base/Network/UNet/USocketManager.cs
+++ b/Server/Base/Network/UNet/USocketManager.cs
--- a/Server/Base/Object/Component.cs
+++ b/Server/Base/Object/Component.cs
--- a/Server/Base/Object/Entity.cs
+++ b/Server/Base/Object/Entity.cs
--- a/Server/Base/Object/IAwake.cs
+++ b/Server/Base/Object/IAwake.cs
--- a/Server/Base/Object/ILoader.cs
+++ b/Server/Base/Object/ILoader.cs
--- a/Server/Base/Object/IStart.cs
+++ b/Server/Base/Object/IStart.cs
--- a/Server/Base/Object/IUpdate.cs
+++ b/Server/Base/Object/IUpdate.cs
--- a/Server/Base/Object/Object.cs
+++ b/Server/Base/Object/Object.cs
--- a/Server/Base/Object/ObjectEventAttribute.cs
+++ b/Server/Base/Object/ObjectEventAttribute.cs
--- a/Server/Base/Object/ObjectManager.cs
+++ b/Server/Base/Object/ObjectManager.cs
--- a/Server/Base/Properties/AssemblyInfo.cs
+++ b/Server/Base/Properties/AssemblyInfo.cs
--- a/Server/Base/QueueDictionary.cs
+++ b/Server/Base/QueueDictionary.cs
--- a/Server/Base/Server.Base.csproj
+++ b/Server/Base/Server.Base.csproj
--- a/Server/Base/TryLocker.cs
+++ b/Server/Base/TryLocker.cs
--- a/Server/Controller/Properties/AssemblyInfo.cs
+++ b/Server/Controller/Properties/AssemblyInfo.cs
--- a/Server/Controller/Server.Controller.csproj
+++ b/Server/Controller/Server.Controller.csproj
--- a/Server/Model/AEventAttribute.cs
+++ b/Server/Model/AEventAttribute.cs
--- a/Server/Model/AMEvent.cs
+++ b/Server/Model/AMEvent.cs
--- a/Server/Model/Component/EventComponent.cs
+++ b/Server/Model/Component/EventComponent.cs
--- a/Server/Model/Component/MessageComponent.cs
+++ b/Server/Model/Component/MessageComponent.cs
--- a/Server/Model/Component/MessageHandlerComponent.cs
+++ b/Server/Model/Component/MessageHandlerComponent.cs
--- a/Server/Model/Component/NetworkComponent.cs
+++ b/Server/Model/Component/NetworkComponent.cs
--- a/Server/Model/Component/Scene.cs
+++ b/Server/Model/Component/Scene.cs
--- a/Server/Model/Component/TimeComponent.cs
+++ b/Server/Model/Component/TimeComponent.cs
--- a/Server/Model/Component/TimerComponent.cs
+++ b/Server/Model/Component/TimerComponent.cs
--- a/Server/Model/EntityType.cs
+++ b/Server/Model/EntityType.cs
--- a/Server/Model/Env.cs
+++ b/Server/Model/Env.cs
--- a/Server/Model/EnvKey.cs
+++ b/Server/Model/EnvKey.cs
--- a/Server/Model/EventAttribute.cs
+++ b/Server/Model/EventAttribute.cs
--- a/Server/Model/EventIdType.cs
+++ b/Server/Model/EventIdType.cs
--- a/Server/Model/GameException.cs
+++ b/Server/Model/GameException.cs
--- a/Server/Model/IEvent.cs
+++ b/Server/Model/IEvent.cs
--- a/Server/Model/Message/ErrorCode.cs
+++ b/Server/Model/Message/ErrorCode.cs
--- a/Server/Model/Message/IErrorMessage.cs
+++ b/Server/Model/Message/IErrorMessage.cs
--- a/Server/Model/Message/IMRegister.cs
+++ b/Server/Model/Message/IMRegister.cs
--- a/Server/Model/Message/Message.cs
+++ b/Server/Model/Message/Message.cs
--- a/Server/Model/Message/MessageAttribute.cs
+++ b/Server/Model/Message/MessageAttribute.cs
--- a/Server/Model/Message/Opcode.cs
+++ b/Server/Model/Message/Opcode.cs
--- a/Server/Model/Message/OpcodeHelper.cs
+++ b/Server/Model/Message/OpcodeHelper.cs
--- a/Server/Model/Properties/AssemblyInfo.cs
+++ b/Server/Model/Properties/AssemblyInfo.cs
--- a/Server/Model/Scene/Server.cs
+++ b/Server/Model/Scene/Server.cs
--- a/Server/Model/Server.Model.csproj
+++ b/Server/Model/Server.Model.csproj
@@ -73,7 +73,7 @@
    <Compile Include="Scene\Server.cs" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Base\Server.Base.csproj">
+    <ProjectReference Include="..\Server.Base\Server.Base.csproj">
      <Project>{afbad3d5-c827-4ba6-9940-7060b6c39306}</Project>
      <Name>Server.Base</Name>
    </ProjectReference>

--- a/Server/Server.sln
+++ b/Server/Server.sln
@@ -3,17 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Base", "Base\Server.Base.csproj", "{AFBAD3D5-C827-4BA6-9940-7060B6C39306}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.App", "Server.App\Server.App.csproj", "{3F8DC04C-9E05-403F-B6A5-36293EB99937}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Model", "Model\Server.Model.csproj", "{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{D736BBFE-822E-4F67-8376-44CDDBAA09F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Controller", "Controller\Server.Controller.csproj", "{ED2A5401-3829-4A8B-915D-A2A18FB233F8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Base", "Server.Base\Server.Base.csproj", "{AFBAD3D5-C827-4BA6-9940-7060B6C39306}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget", "Nuget\Nuget.csproj", "{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Controller", "Server.Controller\Server.Controller.csproj", "{ED2A5401-3829-4A8B-915D-A2A18FB233F8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.App", "Server.App\Server.App.csproj", "{3F8DC04C-9E05-403F-B6A5-36293EB99937}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Model", "Server.Model\Server.Model.csproj", "{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ENet", "ThirdParty\ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server.ENet", "ENet\ENet.vcxproj", "{C9992B7C-313E-4C9F-A954-640D01EDFB58}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget", "ThirdParty\Nuget\Nuget.csproj", "{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,6 +27,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.Build.0 = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.Build.0 = Release|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -37,18 +51,6 @@ Global
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x64.Build.0 = Release|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x86.ActiveCfg = Release|Any CPU
 		{AFBAD3D5-C827-4BA6-9940-7060B6C39306}.Release|x86.Build.0 = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.Build.0 = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.Build.0 = Debug|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.ActiveCfg = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.Build.0 = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.ActiveCfg = Release|Any CPU
-		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.Build.0 = Release|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -61,26 +63,18 @@ Global
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x64.Build.0 = Release|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x86.ActiveCfg = Release|Any CPU
 		{ED2A5401-3829-4A8B-915D-A2A18FB233F8}.Release|x86.Build.0 = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.ActiveCfg = Release|Any CPU
-		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x64.Build.0 = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Debug|x86.Build.0 = Debug|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x64.Build.0 = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.ActiveCfg = Release|Any CPU
-		{3F8DC04C-9E05-403F-B6A5-36293EB99937}.Release|x86.Build.0 = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Debug|x86.Build.0 = Debug|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x64.Build.0 = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E997A298-C1E1-4DC7-85A3-4B0E2A6E196D}.Release|x86.Build.0 = Release|Any CPU
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.ActiveCfg = Debug|x64
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Debug|x64.Build.0 = Debug|x64
@@ -91,8 +85,24 @@ Global
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x64.Build.0 = Release|x64
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.ActiveCfg = Release|Win32
 		{C9992B7C-313E-4C9F-A954-640D01EDFB58}.Release|x86.Build.0 = Release|Win32
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x64.Build.0 = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C9992B7C-313E-4C9F-A954-640D01EDFB58} = {D736BBFE-822E-4F67-8376-44CDDBAA09F4}
+		{F6F8E6AB-632C-4C6E-BFB1-B39570FF2135} = {D736BBFE-822E-4F67-8376-44CDDBAA09F4}
+	EndGlobalSection
 EndGlobal
--- a/Server/ENet/CMakeLists.txt
+++ b/Server/ENet/CMakeLists.txt
--- a/Server/ENet/ENet.vcxproj
+++ b/Server/ENet/ENet.vcxproj
--- a/Server/ENet/ENet.vcxproj.filters
+++ b/Server/ENet/ENet.vcxproj.filters
--- a/Server/ENet/callbacks.c
+++ b/Server/ENet/callbacks.c
--- a/Server/ENet/compress.c
+++ b/Server/ENet/compress.c
--- a/Server/ENet/enet/callbacks.h
+++ b/Server/ENet/enet/callbacks.h
--- a/Server/ENet/enet/enet.h
+++ b/Server/ENet/enet/enet.h
--- a/Server/ENet/enet/list.h
+++ b/Server/ENet/enet/list.h
--- a/Server/ENet/enet/protocol.h
+++ b/Server/ENet/enet/protocol.h
--- a/Server/ENet/enet/time.h
+++ b/Server/ENet/enet/time.h
--- a/Server/ENet/enet/types.h
+++ b/Server/ENet/enet/types.h
--- a/Server/ENet/enet/unix.h
+++ b/Server/ENet/enet/unix.h
--- a/Server/ENet/enet/utility.h
+++ b/Server/ENet/enet/utility.h
--- a/Server/ENet/enet/win32.h
+++ b/Server/ENet/enet/win32.h
--- a/Server/ENet/host.c
+++ b/Server/ENet/host.c
--- a/Server/ENet/list.c
+++ b/Server/ENet/list.c
--- a/Server/ENet/packet.c
+++ b/Server/ENet/packet.c
--- a/Server/ENet/peer.c
+++ b/Server/ENet/peer.c
--- a/Server/ENet/protocol.c
+++ b/Server/ENet/protocol.c
--- a/Server/ENet/unix.c
+++ b/Server/ENet/unix.c
--- a/Server/ENet/win32.c
+++ b/Server/ENet/win32.c
--- a/Server/Nuget/Nuget.csproj
+++ b/Server/Nuget/Nuget.csproj
--- a/Server/Nuget/Properties/AssemblyInfo.cs
+++ b/Server/Nuget/Properties/AssemblyInfo.cs
--- a/Server/Nuget/packages.config
+++ b/Server/Nuget/packages.config