Server代码更新，由于ILRuntime有些功能不支持，所以基础代码要分成两块，一份客户端，一份服务端

863d81dc · tanghai · 3d8d5e56 · 863d81dc · 863d81dc · 863d81dc
5 changed file
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ _ReSharper.CSharp/
 /Logs
 /Unity/CSharp60Support/compilation.log
 /.vs
+/Server/.vs/
--- a/Server/Base/Server.Base.csproj
+++ b/Server/Base/Server.Base.csproj
@@ -47,123 +47,49 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\DoubleMap.cs">
-      <Link>DoubleMap.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\ArrayHelper.cs">
-      <Link>Helper\ArrayHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\ByteHelper.cs">
-      <Link>Helper\ByteHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\EnumHelper.cs">
-      <Link>Helper\EnumHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\FileHelper.cs">
-      <Link>Helper\FileHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\IdGenerater.cs">
-      <Link>Helper\IdGenerater.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\MD5Helper.cs">
-      <Link>Helper\MD5Helper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\MethodInfoHelper.cs">
-      <Link>Helper\MethodInfoHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\MongoHelper.cs">
-      <Link>Helper\MongoHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\NetHelper.cs">
-      <Link>Helper\NetHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\ProtobufHelper.cs">
-      <Link>Helper\ProtobufHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\RandomHelper.cs">
-      <Link>Helper\RandomHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\StringHelper.cs">
-      <Link>Helper\StringHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\TimeHelper.cs">
-      <Link>Helper\TimeHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Helper\ZipHelper.cs">
-      <Link>Helper\ZipHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\LogType.cs">
-      <Link>LogType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\MultiMap.cs">
-      <Link>MultiMap.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\AChannel.cs">
-      <Link>Network\AChannel.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\AService.cs">
-      <Link>Network\AService.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\TNet\PacketParser.cs">
-      <Link>Network\TNet\PacketParser.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\TNet\TBuffer.cs">
-      <Link>Network\TNet\TBuffer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\TNet\TChannel.cs">
-      <Link>Network\TNet\TChannel.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\TNet\TPoller.cs">
-      <Link>Network\TNet\TPoller.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\TNet\TService.cs">
-      <Link>Network\TNet\TService.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\TNet\TSocket.cs">
-      <Link>Network\TNet\TSocket.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\Library.cs">
-      <Link>Network\UNet\Library.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\NativeMethods.cs">
-      <Link>Network\UNet\NativeMethods.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\NativeStructs.cs">
-      <Link>Network\UNet\NativeStructs.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\UAddress.cs">
-      <Link>Network\UNet\UAddress.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\UChannel.cs">
-      <Link>Network\UNet\UChannel.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\UPacket.cs">
-      <Link>Network\UNet\UPacket.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\UPoller.cs">
-      <Link>Network\UNet\UPoller.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\UService.cs">
-      <Link>Network\UNet\UService.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\USocket.cs">
-      <Link>Network\UNet\USocket.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\Network\UNet\USocketManager.cs">
-      <Link>Network\UNet\USocketManager.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\QueueDictionary.cs">
-      <Link>QueueDictionary.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Plugins\Base\TryLocker.cs">
-      <Link>TryLocker.cs</Link>
-    </Compile>
+    <Compile Include="DoubleMap.cs" />
+    <Compile Include="Helper\ArrayHelper.cs" />
+    <Compile Include="Helper\ByteHelper.cs" />
+    <Compile Include="Helper\EnumHelper.cs" />
+    <Compile Include="Helper\FileHelper.cs" />
+    <Compile Include="Helper\IdGenerater.cs" />
+    <Compile Include="Helper\MD5Helper.cs" />
+    <Compile Include="Helper\MethodInfoHelper.cs" />
+    <Compile Include="Helper\MongoHelper.cs" />
+    <Compile Include="Helper\NetHelper.cs" />
+    <Compile Include="Helper\ProtobufHelper.cs" />
+    <Compile Include="Helper\RandomHelper.cs" />
+    <Compile Include="Helper\StringHelper.cs" />
+    <Compile Include="Helper\TimeHelper.cs" />
+    <Compile Include="Helper\ZipHelper.cs" />
    <Compile Include="Log.cs" />
    <Compile Include="Logger\ALogDecorater.cs" />
    <Compile Include="Logger\ILog.cs" />
    <Compile Include="Logger\NLogAdapter.cs" />
    <Compile Include="Logger\StackInfoDecorater.cs" />
+    <Compile Include="LogType.cs" />
+    <Compile Include="MultiMap.cs" />
+    <Compile Include="Network\AChannel.cs" />
+    <Compile Include="Network\AService.cs" />
+    <Compile Include="Network\TNet\PacketParser.cs" />
+    <Compile Include="Network\TNet\TBuffer.cs" />
+    <Compile Include="Network\TNet\TChannel.cs" />
+    <Compile Include="Network\TNet\TPoller.cs" />
+    <Compile Include="Network\TNet\TService.cs" />
+    <Compile Include="Network\TNet\TSocket.cs" />
+    <Compile Include="Network\UNet\Library.cs" />
+    <Compile Include="Network\UNet\NativeMethods.cs" />
+    <Compile Include="Network\UNet\NativeStructs.cs" />
+    <Compile Include="Network\UNet\UAddress.cs" />
+    <Compile Include="Network\UNet\UChannel.cs" />
+    <Compile Include="Network\UNet\UPacket.cs" />
+    <Compile Include="Network\UNet\UPoller.cs" />
+    <Compile Include="Network\UNet\UService.cs" />
+    <Compile Include="Network\UNet\USocket.cs" />
+    <Compile Include="Network\UNet\USocketManager.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="QueueDictionary.cs" />
+    <Compile Include="TryLocker.cs" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

--- a/Server/Model/Server.Model.csproj
+++ b/Server/Model/Server.Model.csproj
@@ -41,161 +41,20 @@
    <Reference Include="System.Core" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\BenchmarkComponent.cs">
-      <Link>Component\BenchmarkComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\ConfigComponent.cs">
-      <Link>Component\ConfigComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\ClientConfig.cs">
-      <Link>Component\Config\ClientConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\InnerConfig.cs">
-      <Link>Component\Config\InnerConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\OuterConfig.cs">
-      <Link>Component\Config\OuterConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\KVComponent.cs">
-      <Link>Component\KVComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\NetInnerComponent.cs">
-      <Link>Component\NetInnerComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\NetOuterComponent.cs">
-      <Link>Component\NetOuterComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\NetworkComponent.cs">
-      <Link>Component\NetworkComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\RobotComponent.cs">
-      <Link>Component\RobotComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\TimerComponent.cs">
-      <Link>Component\TimerComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\UnitComponent.cs">
-      <Link>Component\UnitComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Config\ACategory.cs">
-      <Link>Config\ACategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Config\AConfig.cs">
-      <Link>Config\AConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Config\AConfigComponent.cs">
-      <Link>Config\AConfigComponent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Config\ConfigAttribute.cs">
-      <Link>Config\ConfigAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Config\ICategory.cs">
-      <Link>Config\ICategory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Config\BuffConfig.cs">
-      <Link>Entity\Config\BuffConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Config\StartConfig.cs">
-      <Link>Entity\Config\StartConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Game.cs">
-      <Link>Entity\Game.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Message\InnerMessage.cs">
-      <Link>Entity\Message\InnerMessage.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Message\Opcode.cs">
-      <Link>Message\Opcode.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Message\OuterMessage.cs">
-      <Link>Entity\Message\OuterMessage.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Scene.cs">
-      <Link>Entity\Scene.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Session.cs">
-      <Link>Entity\Session.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Unit.cs">
-      <Link>Entity\Unit.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Event\AEventAttribute.cs">
-      <Link>Event\AEventAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Event\Env.cs">
-      <Link>Event\Env.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Event\EnvKey.cs">
-      <Link>Event\EnvKey.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Event\EventAttribute.cs">
-      <Link>Event\EventAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Event\EventIdType.cs">
-      <Link>Event\EventIdType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Event\IEvent.cs">
-      <Link>Event\IEvent.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Message\AMessage.cs">
-      <Link>Message\AMessage.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Message\AppType.cs">
-      <Link>Message\AppType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Message\ErrorCode.cs">
-      <Link>Message\ErrorCode.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Message\MessageAttribute.cs">
-      <Link>Message\MessageAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Message\MessageInfo.cs">
-      <Link>Message\MessageInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Message\OpcodeHelper.cs">
-      <Link>Message\OpcodeHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Message\RpcException.cs">
-      <Link>Message\RpcException.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\Component.cs">
-      <Link>Object\Component.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\Disposer.cs">
-      <Link>Object\Disposer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\Entity.cs">
-      <Link>Object\Entity.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\EntityEventAttribute.cs">
-      <Link>Object\EntityEventAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\EntityEventManager.cs">
-      <Link>Object\EntityEventManager.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\EntityType.cs">
-      <Link>Object\EntityType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\Object.cs">
-      <Link>Object\Object.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Other\EntityEventId.cs">
-      <Link>Other\EntityEventId.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Other\IInstanceMethod.cs">
-      <Link>Other\IInstanceMethod.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Other\ILBindingAttribute.cs">
-      <Link>Other\ILBindingAttribute.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Other\MonoMethod.cs">
-      <Link>Other\MonoMethod.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Other\Options.cs">
-      <Link>Other\Options.cs</Link>
-    </Compile>
+    <Compile Include="Component\BenchmarkComponent.cs" />
+    <Compile Include="Component\ConfigComponent.cs" />
+    <Compile Include="Component\Config\ClientConfig.cs" />
+    <Compile Include="Component\Config\InnerConfig.cs" />
+    <Compile Include="Component\Config\OuterConfig.cs" />
    <Compile Include="Component\EventComponent.cs" />
+    <Compile Include="Component\KVComponent.cs" />
    <Compile Include="Component\MessageDispatherComponent.cs" />
+    <Compile Include="Component\NetInnerComponent.cs" />
+    <Compile Include="Component\NetOuterComponent.cs" />
+    <Compile Include="Component\NetworkComponent.cs" />
+    <Compile Include="Component\RobotComponent.cs" />
+    <Compile Include="Component\TimerComponent.cs" />
+    <Compile Include="Component\UnitComponent.cs" />
    <Compile Include="Component\Unit\MasterComponent.cs" />
    <Compile Include="Component\Unit\LockComponent.cs" />
    <Compile Include="Component\AppManagerComponent.cs" />
@@ -203,12 +62,50 @@
    <Compile Include="Component\RealmGateAddressComponent.cs" />
    <Compile Include="Component\OptionComponent.cs" />
    <Compile Include="Component\StartConfigComponent.cs" />
+    <Compile Include="Config\ACategory.cs" />
+    <Compile Include="Config\AConfig.cs" />
+    <Compile Include="Config\AConfigComponent.cs" />
+    <Compile Include="Config\ConfigAttribute.cs" />
    <Compile Include="Config\ConfigHelper.cs" />
+    <Compile Include="Config\ICategory.cs" />
+    <Compile Include="Entity\Config\BuffConfig.cs" />
+    <Compile Include="Entity\Config\StartConfig.cs" />
+    <Compile Include="Entity\Game.cs" />
+    <Compile Include="Entity\Message\InnerMessage.cs" />
+    <Compile Include="Entity\Message\Opcode.cs" />
+    <Compile Include="Entity\Message\OuterMessage.cs" />
+    <Compile Include="Entity\Scene.cs" />
+    <Compile Include="Entity\Session.cs" />
+    <Compile Include="Entity\Unit.cs" />
+    <Compile Include="Event\AEventAttribute.cs" />
+    <Compile Include="Event\Env.cs" />
+    <Compile Include="Event\EnvKey.cs" />
+    <Compile Include="Event\EventAttribute.cs" />
+    <Compile Include="Event\EventIdType.cs" />
+    <Compile Include="Event\IEvent.cs" />
    <Compile Include="Helper\DllHelper.cs" />
+    <Compile Include="Message\AMessage.cs" />
    <Compile Include="Message\AMHandler.cs" />
+    <Compile Include="Message\AppType.cs" />
+    <Compile Include="Message\ErrorCode.cs" />
    <Compile Include="Message\IMHandler.cs" />
+    <Compile Include="Message\MessageAttribute.cs" />
    <Compile Include="Message\MessageHandlerAttribute.cs" />
+    <Compile Include="Message\MessageInfo.cs" />
+    <Compile Include="Message\OpcodeHelper.cs" />
+    <Compile Include="Message\RpcException.cs" />
+    <Compile Include="Object\Component.cs" />
+    <Compile Include="Object\Disposer.cs" />
+    <Compile Include="Object\Entity.cs" />
+    <Compile Include="Object\EntityEventAttribute.cs" />
+    <Compile Include="Object\EntityEventManager.cs" />
+    <Compile Include="Object\EntityType.cs" />
+    <Compile Include="Object\Object.cs" />
+    <Compile Include="Other\EntityEventId.cs" />
+    <Compile Include="Other\IInstanceMethod.cs" />
+    <Compile Include="Other\MonoMethod.cs" />
    <Compile Include="Other\OneThreadSynchronizationContext.cs" />
+    <Compile Include="Other\Options.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>

--- a/Server/Server.sln.DotSettings
+++ b/Server/Server.sln.DotSettings
@@ -328,6 +328,9 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EXml_002ECodeStyle_002EFormatSettingsUpgrade_002EXmlMoveToCommonFormatterSettingsUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/TextControl/HighlightCurrentLine/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/MsTestProvider/UseTestRunConfigFromMetadataFile/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UpdatesManger/IsDownloadUpdateDataAllowed/@EntryValue">False</s:Boolean>

--- a/Server/ThirdParty/ENet/ENet.vcxproj
+++ b/Server/ThirdParty/ENet/ENet.vcxproj
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -20,7 +20,7 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{C9992B7C-313E-4C9F-A954-640D01EDFB58}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    <Keyword>ManagedCProj</Keyword>
    <RootNamespace>ENet</RootNamespace>
    <ProjectName>ENet</ProjectName>
@@ -30,28 +30,28 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
    <CLRSupport>false</CLRSupport>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
    <CLRSupport>false</CLRSupport>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CLRSupport>false</CLRSupport>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CLRSupport>false</CLRSupport>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>