modify logic

hiram3512 · Jul 28, 2019 · 253ee56 · 253ee56
1 parent fb4ce6c
commit 253ee56
Show file tree

Hide file tree

Showing 190 changed files with 234 additions and 194,942 deletions.
diff --git a/src/HiSocket.Message/HiSocket.Message.csproj b/src/HiSocket.Message/HiSocket.Message.csproj
@@ -58,14 +58,14 @@
     <Compile Include="ProtobufMsgRegistInfo.cs" />
     <Compile Include="ProtobufSerializer.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HiSocket.Tcp\HiSocket.Tcp.csproj">
       <Project>{0b0fe68d-eb3f-42e0-b151-bbe221cfa10c}</Project>
       <Name>HiSocket.Tcp</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
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.Tcp/HiSocket.Tcp.csproj b/src/HiSocket.Tcp/HiSocket.Tcp.csproj
@@ -34,8 +34,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HiFramework, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.1.0.2\lib\net35\HiFramework.dll</HintPath>
+    <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>
@@ -66,6 +66,5 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/HiSocket.Tcp/PackageBase.cs b/src/HiSocket.Tcp/PackageBase.cs
@@ -19,9 +19,8 @@ public abstract class PackageBase : IPackage
         /// <param name="onUnpacked"></param>
         public void Unpack(byte[] source, Action<byte[]> onUnpacked)
         {
-            using (BlockBuffer<byte> buffer = new BlockBuffer<byte>())
+            using (BlockBuffer<byte> buffer = new BlockBuffer<byte>(source))
             {
-                buffer.Write(source);
                 Unpack(buffer, onUnpacked);
             }
         }
@@ -33,9 +32,8 @@ public void Unpack(byte[] source, Action<byte[]> onUnpacked)
         /// <param name="onPacked"></param>
         public void Pack(byte[] source, Action<byte[]> onPacked)
         {
-            using (BlockBuffer<byte> buffer = new BlockBuffer<byte>())
+            using (BlockBuffer<byte> buffer = new BlockBuffer<byte>(source))
             {
-                buffer.Write(source);
                 Pack(buffer, onPacked);
             }
         }

diff --git a/src/HiSocket.Tcp/TcpConnection.cs b/src/HiSocket.Tcp/TcpConnection.cs
@@ -42,7 +42,7 @@ public TcpConnection(IPackage package)
 
         void OnSocketReceiveHandler(byte[] bytes)
         {
-                _package.Unpack(bytes, x => { ReceiveEvent(x); });
+            _package.Unpack(bytes, x => { ReceiveEvent(x); });
         }
 
         /// <summary>

diff --git a/src/HiSocket.Tcp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/HiSocket.Tcp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/src/HiSocket.Tcp/obj/Debug/HiSocket.Tcp.csproj.CoreCompileInputs.cache b/src/HiSocket.Tcp/obj/Debug/HiSocket.Tcp.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-edbeb0602671ff3a488980efe6bd07b63a7a9444
+fbf046935c9043d1db5779316966eefab0e33db4
diff --git a/src/HiSocket.Tcp/obj/Debug/HiSocket.Tcp.csproj.FileListAbsolute.txt b/src/HiSocket.Tcp/obj/Debug/HiSocket.Tcp.csproj.FileListAbsolute.txt
@@ -10,4 +10,3 @@ D:\MyGit\github\HiSocket\src\HiSocket.Tcp\obj\Debug\HiSocket.Tcp.csproj.CoreComp
 D:\MyGit\github\HiSocket\src\HiSocket.Tcp\obj\Debug\HiSocket.Tcp.csproj.CopyComplete
 D:\MyGit\github\HiSocket\src\HiSocket.Tcp\obj\Debug\HiSocket.dll
 D:\MyGit\github\HiSocket\src\HiSocket.Tcp\obj\Debug\HiSocket.pdb
-D:\MyGit\github\HiSocket\src\HiSocket.Tcp\obj\Debug\HiSocket.Tcp.csprojAssemblyReference.cache
diff --git a/src/HiSocket.Tcp/obj/Debug/HiSocket.dll b/src/HiSocket.Tcp/obj/Debug/HiSocket.dll
diff --git a/src/HiSocket.Tcp/obj/Debug/HiSocket.pdb b/src/HiSocket.Tcp/obj/Debug/HiSocket.pdb
diff --git a/src/HiSocket.Tcp/packages.config b/src/HiSocket.Tcp/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HiFramework" version="1.0.2" targetFramework="net35" />
+  <package id="HiFramework" version="1.0.6" targetFramework="net35" />
   <package id="HiFramework.Assert" version="1.0.3" targetFramework="net35" />
   <package id="HiFramework.Core" version="1.0.0" targetFramework="net35" />
 </packages>
diff --git a/src/HiSocket.Test/HiSocket.Test.csproj b/src/HiSocket.Test/HiSocket.Test.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,20 +39,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HiFramework, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.1.0.2\lib\net35\HiFramework.dll</HintPath>
+    <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.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HiFramework.Assert.1.0.2\lib\net35\HiFramework.Assert.dll</HintPath>
+    <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>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -84,8 +84,8 @@
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
diff --git a/src/HiSocket.Test/Support/Package.cs b/src/HiSocket.Test/Support/Package.cs
@@ -10,10 +10,10 @@ protected override void Pack(BlockBuffer<byte> bytes, Action<byte[]> onPacked)
         {
             int length = bytes.WritePosition;
             var header = BitConverter.GetBytes(length);
-            var newBytes = new byte[length + header.Length];
-            Buffer.BlockCopy(header, 0, newBytes, 0, header.Length);
-            Buffer.BlockCopy(bytes.Buffer, 0, newBytes, header.Length, length);
-            onPacked(newBytes);
+            var newBytes = new BlockBuffer<byte>(length + header.Length);
+            newBytes.Write(header);
+            newBytes.Write(bytes.Buffer);
+            onPacked(newBytes.Buffer);
         }
 
         protected override void Unpack(BlockBuffer<byte> bytes, Action<byte[]> onUnpacked)

diff --git a/src/HiSocket.Test/bin/Debug/HiFramework.Assert.dll b/src/HiSocket.Test/bin/Debug/HiFramework.Assert.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiFramework.dll b/src/HiSocket.Test/bin/Debug/HiFramework.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Message.dll b/src/HiSocket.Test/bin/Debug/HiSocket.Message.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Message.pdb b/src/HiSocket.Test/bin/Debug/HiSocket.Message.pdb
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Test.dll b/src/HiSocket.Test/bin/Debug/HiSocket.Test.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.Test.pdb b/src/HiSocket.Test/bin/Debug/HiSocket.Test.pdb
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.dll b/src/HiSocket.Test/bin/Debug/HiSocket.dll
diff --git a/src/HiSocket.Test/bin/Debug/HiSocket.pdb b/src/HiSocket.Test/bin/Debug/HiSocket.pdb
diff --git a/src/HiSocket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll b/src/HiSocket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
diff --git a/...in/Debug/Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll b/...in/Debug/Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll
diff --git a/...ket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll b/...ket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
diff --git a/src/HiSocket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll b/src/HiSocket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
diff --git a/src/HiSocket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.TestFramework.dll b/src/HiSocket.Test/bin/Debug/Microsoft.VisualStudio.TestPlatform.TestFramework.dll
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		edbeb0602671ff3a488980efe6bd07b63a7a9444
		fbf046935c9043d1db5779316966eefab0e33db4