version 2.9.3

hiram3512 · Aug 27, 2019 · 5ae60b5 · 5ae60b5
1 parent 9e6b922
commit 5ae60b5
Show file tree

Hide file tree

Showing 158 changed files with 91 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.vs
diff --git a/HiSocket/HiFramework.Assert.dll b/HiSocket/HiFramework.Assert.dll
diff --git a/HiSocket/HiFramework.Core.dll b/HiSocket/HiFramework.Core.dll
diff --git a/HiSocket/HiFramework.dll b/HiSocket/HiFramework.dll
diff --git a/HiSocket/HiSocket.Message.dll b/HiSocket/HiSocket.Message.dll
diff --git a/HiSocket/HiSocket.Message.pdb b/HiSocket/HiSocket.Message.pdb
diff --git a/HiSocket/HiSocket.dll b/HiSocket/HiSocket.dll
diff --git a/HiSocket/HiSocket.pdb b/HiSocket/HiSocket.pdb
diff --git a/HiSocket_2.9.2.zip → HiSocket_2.9.3.zip b/HiSocket_2.9.2.zip → HiSocket_2.9.3.zip
diff --git a/src/HiSocket.Example/HiSocket.Example.csproj b/src/HiSocket.Example/HiSocket.Example.csproj
@@ -32,14 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HiFramework, Version=1.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.1.0.7\lib\net35\HiFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="HiFramework.Assert, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Assert.1.0.2\lib\net35\HiFramework.Assert.dll</HintPath>
-    </Reference>
-    <Reference Include="HiFramework.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Core.1.0.0\lib\net35\HiFramework.Core.dll</HintPath>
+    <Reference Include="HiFramework, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HiFramework.1.0.8\lib\net35\HiFramework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/HiSocket.Example/bin/Debug/HiFramework.Assert.dll b/src/HiSocket.Example/bin/Debug/HiFramework.Assert.dll
diff --git a/src/HiSocket.Example/bin/Debug/HiFramework.Core.dll b/src/HiSocket.Example/bin/Debug/HiFramework.Core.dll
diff --git a/src/HiSocket.Example/bin/Debug/HiFramework.dll b/src/HiSocket.Example/bin/Debug/HiFramework.dll
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Example.exe b/src/HiSocket.Example/bin/Debug/HiSocket.Example.exe
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Message.dll b/src/HiSocket.Example/bin/Debug/HiSocket.Message.dll
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.Message.pdb b/src/HiSocket.Example/bin/Debug/HiSocket.Message.pdb
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.dll b/src/HiSocket.Example/bin/Debug/HiSocket.dll
diff --git a/src/HiSocket.Example/bin/Debug/HiSocket.pdb b/src/HiSocket.Example/bin/Debug/HiSocket.pdb
diff --git a/src/HiSocket.Example/bin/Release/HiFramework.dll b/src/HiSocket.Example/bin/Release/HiFramework.dll
diff --git a/src/HiSocket.Example/bin/Release/HiSocket.Example.exe b/src/HiSocket.Example/bin/Release/HiSocket.Example.exe
diff --git a/src/HiSocket.Example/bin/Release/HiSocket.Example.pdb b/src/HiSocket.Example/bin/Release/HiSocket.Example.pdb
diff --git a/src/HiSocket.Example/bin/Release/HiSocket.Message.dll b/src/HiSocket.Example/bin/Release/HiSocket.Message.dll
diff --git a/src/HiSocket.Example/bin/Release/HiSocket.Message.pdb b/src/HiSocket.Example/bin/Release/HiSocket.Message.pdb
diff --git a/src/HiSocket.Example/bin/Release/HiSocket.dll b/src/HiSocket.Example/bin/Release/HiSocket.dll
diff --git a/src/HiSocket.Example/bin/Release/HiSocket.pdb b/src/HiSocket.Example/bin/Release/HiSocket.pdb
diff --git a/src/HiSocket.Example/bin/Release/protobuf-net.dll b/src/HiSocket.Example/bin/Release/protobuf-net.dll
diff --git a/src/HiSocket.Example/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket.Example/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.csproj.CoreCompileInputs.cache b/src/HiSocket.Example/obj/Debug/HiSocket.Example.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-6512814e59f56da6d6679d13f950f790cc536cdd
+5f19412a13e29ce3d2aca7fc8f8aa74845c283a0
diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.csproj.FileListAbsolute.txt b/src/HiSocket.Example/obj/Debug/HiSocket.Example.csproj.FileListAbsolute.txt
@@ -4,8 +4,6 @@ D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Debug\HiSocket.Example.csprojA
 D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Debug\HiSocket.Example.csproj.CoreCompileInputs.cache
 D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Debug\HiSocket.Example.exe
 D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Debug\HiSocket.Example.pdb
-D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Debug\HiFramework.Assert.dll
-D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Debug\HiFramework.Core.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Debug\HiFramework.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Debug\HiSocket.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Debug\HiSocket.Message.dll

diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.csprojAssemblyReference.cache b/src/HiSocket.Example/obj/Debug/HiSocket.Example.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Example/obj/Debug/HiSocket.Example.exe b/src/HiSocket.Example/obj/Debug/HiSocket.Example.exe
diff --git a/src/HiSocket.Example/obj/Release/HiSocket.Example.csproj.CopyComplete b/src/HiSocket.Example/obj/Release/HiSocket.Example.csproj.CopyComplete
diff --git a/src/HiSocket.Example/obj/Release/HiSocket.Example.csproj.CoreCompileInputs.cache b/src/HiSocket.Example/obj/Release/HiSocket.Example.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+5f19412a13e29ce3d2aca7fc8f8aa74845c283a0
diff --git a/src/HiSocket.Example/obj/Release/HiSocket.Example.csproj.FileListAbsolute.txt b/src/HiSocket.Example/obj/Release/HiSocket.Example.csproj.FileListAbsolute.txt
@@ -0,0 +1,13 @@
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\HiSocket.Example.exe
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\HiSocket.Example.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\HiFramework.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\HiSocket.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\HiSocket.Message.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\protobuf-net.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\HiSocket.Message.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Example\bin\Release\HiSocket.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Release\HiSocket.Example.csprojAssemblyReference.cache
+D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Release\HiSocket.Example.csproj.CoreCompileInputs.cache
+D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Release\HiSocket.Example.csproj.CopyComplete
+D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Release\HiSocket.Example.exe
+D:\MyGit\github\HiSocket\src\HiSocket.Example\obj\Release\HiSocket.Example.pdb
diff --git a/src/HiSocket.Example/obj/Release/HiSocket.Example.csprojAssemblyReference.cache b/src/HiSocket.Example/obj/Release/HiSocket.Example.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Example/obj/Release/HiSocket.Example.exe b/src/HiSocket.Example/obj/Release/HiSocket.Example.exe
diff --git a/src/HiSocket.Example/obj/Release/HiSocket.Example.pdb b/src/HiSocket.Example/obj/Release/HiSocket.Example.pdb
diff --git a/src/HiSocket.Example/packages.config b/src/HiSocket.Example/packages.config
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HiFramework" version="1.0.7" targetFramework="net35" />
-  <package id="HiFramework.Assert" version="1.0.2" targetFramework="net35" />
-  <package id="HiFramework.Core" version="1.0.0" targetFramework="net35" />
+  <package id="HiFramework" version="1.0.8" targetFramework="net35" />
 </packages>
diff --git a/src/HiSocket.Example_Unity/HiSocket.Example_Unity.csproj b/src/HiSocket.Example_Unity/HiSocket.Example_Unity.csproj
@@ -32,14 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HiFramework, Version=1.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.1.0.7\lib\net35\HiFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="HiFramework.Assert, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Assert.1.0.2\lib\net35\HiFramework.Assert.dll</HintPath>
-    </Reference>
-    <Reference Include="HiFramework.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Core.1.0.0\lib\net35\HiFramework.Core.dll</HintPath>
+    <Reference Include="HiFramework, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HiFramework.1.0.8\lib\net35\HiFramework.dll</HintPath>
     </Reference>
     <Reference Include="HiFramework.Unity">
       <HintPath>lib\HiFramework.Unity.dll</HintPath>

diff --git a/src/HiSocket.Example_Unity/Program.cs b/src/HiSocket.Example_Unity/Program.cs
@@ -4,7 +4,7 @@
  * Documents: https://github.com/hiramtan/HiSocket
  * Author: [email protected]
 ***************************************************************/
-using HiFramework.Core;
+using HiFramework;
 using HiFramework.Unity;
 using HiSocket.Example;
 using HiSocket.Tcp;
@@ -25,7 +25,7 @@ public class Example : MonoBehaviour
         // Use this for initialization
         void Start()
         {
-            Center.Init();
+            Center.Init(new UnityBinder());
             tick = Center.Get<ITickComponent>();
             Connect();
         }

diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiFramework.Assert.dll b/src/HiSocket.Example_Unity/bin/Debug/HiFramework.Assert.dll
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiFramework.Core.dll b/src/HiSocket.Example_Unity/bin/Debug/HiFramework.Core.dll
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiFramework.Unity.dll b/src/HiSocket.Example_Unity/bin/Debug/HiFramework.Unity.dll
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiFramework.dll b/src/HiSocket.Example_Unity/bin/Debug/HiFramework.dll
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Example.exe b/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Example.exe
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Example_Unity.exe b/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Example_Unity.exe
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Example_Unity.pdb b/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Example_Unity.pdb
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Message.dll b/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Message.dll
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Message.pdb b/src/HiSocket.Example_Unity/bin/Debug/HiSocket.Message.pdb
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiSocket.dll b/src/HiSocket.Example_Unity/bin/Debug/HiSocket.dll
diff --git a/src/HiSocket.Example_Unity/bin/Debug/HiSocket.pdb b/src/HiSocket.Example_Unity/bin/Debug/HiSocket.pdb
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiFramework.Unity.dll b/src/HiSocket.Example_Unity/bin/Release/HiFramework.Unity.dll
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiFramework.dll b/src/HiSocket.Example_Unity/bin/Release/HiFramework.dll
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example.exe b/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example.exe
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example.pdb b/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example.pdb
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example_Unity.exe b/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example_Unity.exe
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example_Unity.pdb b/src/HiSocket.Example_Unity/bin/Release/HiSocket.Example_Unity.pdb
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.Message.dll b/src/HiSocket.Example_Unity/bin/Release/HiSocket.Message.dll
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.Message.pdb b/src/HiSocket.Example_Unity/bin/Release/HiSocket.Message.pdb
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.dll b/src/HiSocket.Example_Unity/bin/Release/HiSocket.dll
diff --git a/src/HiSocket.Example_Unity/bin/Release/HiSocket.pdb b/src/HiSocket.Example_Unity/bin/Release/HiSocket.pdb
diff --git a/src/HiSocket.Example_Unity/bin/Release/UnityEngine.dll b/src/HiSocket.Example_Unity/bin/Release/UnityEngine.dll
diff --git a/src/HiSocket.Example_Unity/bin/Release/protobuf-net.dll b/src/HiSocket.Example_Unity/bin/Release/protobuf-net.dll
diff --git a/src/HiSocket.Example_Unity/lib/HiFramework.Unity.dll b/src/HiSocket.Example_Unity/lib/HiFramework.Unity.dll
diff --git a/src/HiSocket.Example_Unity/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket.Example_Unity/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.csproj.CoreCompileInputs.cache b/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4f0e9bdfc0bbc9c69411d59fe82c6b598fb59975
+7454c1ec6858c7af89ff38ab11a276d72e55cee2
diff --git a/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.csproj.FileListAbsolute.txt b/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.csproj.FileListAbsolute.txt
@@ -8,9 +8,7 @@ D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiSocket.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiSocket.Example.exe
 D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiSocket.Message.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiFramework.dll
-D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiFramework.Assert.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\protobuf-net.dll
-D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiFramework.Core.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiSocket.Example.pdb
 D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiSocket.Message.pdb
 D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Debug\HiSocket.pdb

diff --git a/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.csprojAssemblyReference.cache b/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.exe b/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.exe
diff --git a/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.pdb b/src/HiSocket.Example_Unity/obj/Debug/HiSocket.Example_Unity.pdb
diff --git a/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csproj.CopyComplete b/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csproj.CopyComplete
diff --git a/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csproj.CoreCompileInputs.cache b/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+cf45866d8ffcfbad820f0f104d12f4454c5a3295
diff --git a/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csproj.FileListAbsolute.txt b/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csproj.FileListAbsolute.txt
@@ -0,0 +1,17 @@
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.Example_Unity.exe
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.Example_Unity.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiFramework.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiFramework.Unity.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.Example.exe
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.Message.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\UnityEngine.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\protobuf-net.dll
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.Example.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.Message.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\bin\Release\HiSocket.pdb
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\obj\Release\HiSocket.Example_Unity.csprojAssemblyReference.cache
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\obj\Release\HiSocket.Example_Unity.csproj.CoreCompileInputs.cache
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\obj\Release\HiSocket.Example_Unity.csproj.CopyComplete
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\obj\Release\HiSocket.Example_Unity.exe
+D:\MyGit\github\HiSocket\src\HiSocket.Example_Unity\obj\Release\HiSocket.Example_Unity.pdb
diff --git a/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csprojAssemblyReference.cache b/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.exe b/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.exe
diff --git a/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.pdb b/src/HiSocket.Example_Unity/obj/Release/HiSocket.Example_Unity.pdb
diff --git a/src/HiSocket.Example_Unity/packages.config b/src/HiSocket.Example_Unity/packages.config
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HiFramework" version="1.0.7" targetFramework="net35" />
-  <package id="HiFramework.Assert" version="1.0.2" targetFramework="net35" />
-  <package id="HiFramework.Core" version="1.0.0" targetFramework="net35" />
+  <package id="HiFramework" version="1.0.8" targetFramework="net35" />
 </packages>
diff --git a/src/HiSocket.Message/BinaryMsgRegister.cs b/src/HiSocket.Message/BinaryMsgRegister.cs
@@ -3,7 +3,7 @@
 // Author: [email protected]
 //***************************************************************************
 
-using HiFramework.Assert;
+using HiFramework;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -32,7 +32,7 @@ public static void Init()
         /// <param name="onMsg"></param>
         public static void Regist(int key, Action<BinaryReader> onMsg)
         {
-            AssertThat.IsFalse(_msgs.ContainsKey(key), "Already regist this key:" + key);
+            Assert.IsFalse(_msgs.ContainsKey(key), "Already regist this key:" + key);
             _msgs.Add(key, onMsg);
         }
 
@@ -42,7 +42,7 @@ public static void Regist(int key, Action<BinaryReader> onMsg)
         /// <param name="key"></param>
         public static void Unregist(int key)
         {
-            AssertThat.IsTrue(_msgs.ContainsKey(key));
+            Assert.IsTrue(_msgs.ContainsKey(key));
             _msgs.Remove(key);
         }
 
@@ -53,7 +53,7 @@ public static void Unregist(int key)
         /// <param name="bytes"></param>
         public static void Dispatch(int key, byte[] bytes)
         {
-            AssertThat.IsTrue(_msgs.ContainsKey(key));
+            Assert.IsTrue(_msgs.ContainsKey(key));
             var ms = new MemoryStream(bytes);
             var reader = new BinaryReader(ms);
             _msgs[key](reader);

diff --git a/src/HiSocket.Message/BinaryRegistHelper.cs b/src/HiSocket.Message/BinaryRegistHelper.cs
@@ -7,7 +7,7 @@
 
 using System;
 using System.Reflection;
-using HiFramework.Assert;
+using HiFramework;
 
 namespace HiSocket.Message
 {
@@ -26,7 +26,7 @@ public static void Init()
                 if (types[i].IsSubclassOf(baseType))
                 {
                     var ins = Activator.CreateInstance(types[i]) as BinaryMsgBase;
-                    AssertThat.IsNotNull(ins);
+                    Assert.IsNotNull(ins);
                     ins.Regist();
                 }
             }

diff --git a/src/HiSocket.Message/ChannelManager.cs b/src/HiSocket.Message/ChannelManager.cs
@@ -3,7 +3,7 @@
 // Author: [email protected]
 //***************************************************************************
 
-using HiFramework.Assert;
+using HiFramework;
 using HiSocket.Tcp;
 using System;
 using System.Collections.Generic;
@@ -26,7 +26,7 @@ public static class ChannelManager
         /// <param name="tcpConnection"></param>
         public static void AddConnection(string name, ITcpConnection tcpConnection)
         {
-            AssertThat.IsFalse(_connections.ContainsKey(name));
+            Assert.IsFalse(_connections.ContainsKey(name));
             _connections.Add(name, tcpConnection);
         }
 
@@ -36,7 +36,7 @@ public static void AddConnection(string name, ITcpConnection tcpConnection)
         /// <param name="name"></param>
         public static void RemoveConnection(string name)
         {
-            AssertThat.IsTrue(_connections.ContainsKey(name));
+            Assert.IsTrue(_connections.ContainsKey(name));
             _connections.Remove(name);
         }
 
@@ -46,7 +46,7 @@ public static void RemoveConnection(string name)
         /// <param name="name"></param>
         public static void SwitchChannel(string name)
         {
-            AssertThat.IsTrue(_connections.ContainsKey(name));
+            Assert.IsTrue(_connections.ContainsKey(name));
             _tcpConnection = _connections[name];
         }
 

diff --git a/src/HiSocket.Message/HiSocket.Message.csproj b/src/HiSocket.Message/HiSocket.Message.csproj
@@ -32,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HiFramework.Assert, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Assert.1.0.3\lib\net35\HiFramework.Assert.dll</HintPath>
+    <Reference Include="HiFramework, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HiFramework.1.0.8\lib\net35\HiFramework.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net">
       <HintPath>..\lib\protobuf-net.dll</HintPath>

diff --git a/src/HiSocket.Message/ProtobufMsgRegister.cs b/src/HiSocket.Message/ProtobufMsgRegister.cs
@@ -2,7 +2,7 @@
 // Description:
 // Author: [email protected]
 //***************************************************************************
-using HiFramework.Assert;
+using HiFramework;
 using System;
 using System.Collections.Generic;
 
@@ -32,7 +32,7 @@ public static void Init()
         public static void Regist<T>(Action<T> onMsg) where T : class
         {
             var key = typeof(T).FullName;
-            AssertThat.IsFalse(_msgs.ContainsKey(key), "Already regist this key:" + key);
+            Assert.IsFalse(_msgs.ContainsKey(key), "Already regist this key:" + key);
             var info = new ProtobufMsgRegistInfo<T>(onMsg);
             _msgs.Add(key, info);
         }
@@ -45,7 +45,7 @@ public static void Regist<T>(Action<T> onMsg) where T : class
         public static void Unregist(Type type)
         {
             var key = type.FullName;
-            AssertThat.IsTrue(_msgs.ContainsKey(key));
+            Assert.IsTrue(_msgs.ContainsKey(key));
             _msgs.Remove(key);
         }
 
@@ -56,8 +56,8 @@ public static void Unregist(Type type)
         /// <param name="bytes"></param>
         public static void Dispatch(string key, byte[] bytes)
         {
-            AssertThat.IsNotNullOrEmpty(key);
-            AssertThat.IsTrue(_msgs.ContainsKey(key));
+            Assert.IsNotNullOrEmpty(key);
+            Assert.IsTrue(_msgs.ContainsKey(key));
             _msgs[key].OnBytes(bytes);
         }
     }

diff --git a/src/HiSocket.Message/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket.Message/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.csproj.CoreCompileInputs.cache b/src/HiSocket.Message/obj/Debug/HiSocket.Message.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-ace1f980209edf9e39567a25a37db543c54daa0c
+77e77a93161ec1d350d374584e729077b32f81a6
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.csprojAssemblyReference.cache b/src/HiSocket.Message/obj/Debug/HiSocket.Message.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.dll b/src/HiSocket.Message/obj/Debug/HiSocket.Message.dll
diff --git a/src/HiSocket.Message/obj/Debug/HiSocket.Message.pdb b/src/HiSocket.Message/obj/Debug/HiSocket.Message.pdb
diff --git a/src/HiSocket.Message/obj/Release/HiSocket.Message.csproj.CoreCompileInputs.cache b/src/HiSocket.Message/obj/Release/HiSocket.Message.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-6b4646c60974c2f57a258c06f1ec5d5cee711327
+77e77a93161ec1d350d374584e729077b32f81a6
diff --git a/src/HiSocket.Message/obj/Release/HiSocket.Message.csproj.FileListAbsolute.txt b/src/HiSocket.Message/obj/Release/HiSocket.Message.csproj.FileListAbsolute.txt
@@ -12,3 +12,5 @@ D:\MyGit\github\HiSocket\src\HiSocket.Message\obj\Release\HiSocket.Message.cspro
 D:\MyGit\github\HiSocket\src\HiSocket.Message\obj\Release\HiSocket.Message.csproj.CopyComplete
 D:\MyGit\github\HiSocket\src\HiSocket.Message\obj\Release\HiSocket.Message.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Message\obj\Release\HiSocket.Message.pdb
+D:\MyGit\github\HiSocket\HiSocket\HiSocket.Message.dll
+D:\MyGit\github\HiSocket\HiSocket\HiSocket.Message.pdb
diff --git a/src/HiSocket.Message/obj/Release/HiSocket.Message.csprojAssemblyReference.cache b/src/HiSocket.Message/obj/Release/HiSocket.Message.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Message/obj/Release/HiSocket.Message.dll b/src/HiSocket.Message/obj/Release/HiSocket.Message.dll
diff --git a/src/HiSocket.Message/obj/Release/HiSocket.Message.pdb b/src/HiSocket.Message/obj/Release/HiSocket.Message.pdb
diff --git a/src/HiSocket.Message/packages.config b/src/HiSocket.Message/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HiFramework.Assert" version="1.0.3" targetFramework="net35" />
+  <package id="HiFramework" version="1.0.8" targetFramework="net35" />
 </packages>
diff --git a/src/HiSocket.Tcp/HiSocket.Tcp.csproj b/src/HiSocket.Tcp/HiSocket.Tcp.csproj
@@ -34,14 +34,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HiFramework, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.1.0.6\lib\net35\HiFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="HiFramework.Assert, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Assert.1.0.3\lib\net35\HiFramework.Assert.dll</HintPath>
-    </Reference>
-    <Reference Include="HiFramework.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Core.1.0.0\lib\net35\HiFramework.Core.dll</HintPath>
+    <Reference Include="HiFramework, Version=1.0.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HiFramework.1.0.8\lib\net35\HiFramework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/HiSocket.Tcp/TcpConnection.cs b/src/HiSocket.Tcp/TcpConnection.cs
@@ -7,7 +7,7 @@
 
 using System;
 using System.Collections.Generic;
-using HiFramework.Assert;
+using HiFramework;
 
 namespace HiSocket.Tcp
 {
@@ -51,7 +51,7 @@ void SocketReceiveHandler(byte[] bytes)
         /// <param name="plugin"></param>
         public void AddPlugin(IPlugin plugin)
         {
-            AssertThat.IsNotNull(plugin, "Plugin is null");
+            Assert.IsNotNull(plugin, "Plugin is null");
             plugin.TcpConnection = this;
             _plugins.Add(plugin.Name, plugin);
         }
@@ -63,13 +63,13 @@ public void AddPlugin(IPlugin plugin)
         /// <returns>plugin</returns>
         public IPlugin GetPlugin(string name)
         {
-            AssertThat.IsNotNullOrEmpty(name, "Name is null or empty");
+            Assert.IsNotNullOrEmpty(name, "Name is null or empty");
             return _plugins[name];
         }
 
         public bool IsPluginExist(string name)
         {
-            AssertThat.IsNotNullOrEmpty(name, "Name is null or empty");
+            Assert.IsNotNullOrEmpty(name, "Name is null or empty");
             return _plugins.ContainsKey(name);
         }
 
@@ -79,7 +79,7 @@ public bool IsPluginExist(string name)
         /// <param name="name">plugin's name</param>
         public void RemovePlugin(string name)
         {
-            AssertThat.IsNotNullOrEmpty(name, "Name is null or empty");
+            Assert.IsNotNullOrEmpty(name, "Name is null or empty");
             _plugins.Remove(name);
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6512814e59f56da6d6679d13f950f790cc536cdd
		5f19412a13e29ce3d2aca7fc8f8aa74845c283a0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4f0e9bdfc0bbc9c69411d59fe82c6b598fb59975
		7454c1ec6858c7af89ff38ab11a276d72e55cee2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ace1f980209edf9e39567a25a37db543c54daa0c
		77e77a93161ec1d350d374584e729077b32f81a6
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6b4646c60974c2f57a258c06f1ec5d5cee711327
		77e77a93161ec1d350d374584e729077b32f81a6