1.0.1-beta1

cloverhap · Aug 25, 2017 · 7aec9b0 · 7aec9b0
1 parent cc41f84
commit 7aec9b0
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/Src/EngineIoClientDotNet.Tests.net35/EngineIoClientDotNet.Tests.net35.csproj b/Src/EngineIoClientDotNet.Tests.net35/EngineIoClientDotNet.Tests.net35.csproj
@@ -72,14 +72,14 @@
     <Compile Include="ComponentEmitterTests\EmitterTests.cs" />
     <Compile Include="ModulesTests\ParseQSTests.cs" />
     <Compile Include="ModulesTests\UTF8Tests.cs" />
+    <Compile Include="ParserTests\DecodeTests.cs" />
+    <Compile Include="ParserTests\TestsParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="ParserTests\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\EngineIoClientDotNet.net35\EngineIoClientDotNet.net35.csproj">
       <Project>{568d67d0-3253-4601-9b04-7730a9ec5cc0}</Project>

diff --git a/Src/EngineIoClientDotNet.mono/Client/Socket.cs b/Src/EngineIoClientDotNet.mono/Client/Socket.cs
@@ -672,11 +672,6 @@ private Task WaitForUpgrade()
                         log.Info("Wait for upgrade timeout");
                         break;
                     }
-                    else
-                    {
-                        // yield to another thread
-                        System.Threading.Thread.Yield();
-                    }
                 }
                 tcs.SetResult(null);
             }

diff --git a/Src/EngineIoClientDotNet.mono/Parser/Packet.cs b/Src/EngineIoClientDotNet.mono/Parser/Packet.cs
@@ -247,7 +247,7 @@ public static void DecodePayload(string data, IDecodePayloadCallback callback)
 
                     if (msg.Length != 0)
                     {
-                        Packet packet = DecodePacket(msg, false);
+                        Packet packet = DecodePacket(msg, true);
                         if (_err.Type == packet.Type && _err.Data == packet.Data)
                         {
                             callback.Call(_err, 0, 1);

diff --git a/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
diff --git a/Src/EngineIoClientDotNet.net40/EngineIoClientDotNet.net40.csproj b/Src/EngineIoClientDotNet.net40/EngineIoClientDotNet.net40.csproj
@@ -114,6 +114,12 @@
     <Compile Include="..\EngineIoClientDotNet.mono\Thread\EasyTimer_net40.cs">
       <Link>Thread\EasyTimer_net40.cs</Link>
     </Compile>
+    <Compile Include="..\EngineIoClientDotNet.mono\Thread\Heartbeat_net35.cs">
+      <Link>Thread\Heartbeat_net35.cs</Link>
+    </Compile>
+    <Compile Include="..\EngineIoClientDotNet.mono\Thread\TriggeredLoopTimer_net35.cs">
+      <Link>Thread\TriggeredLoopTimer_net35.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Src/EngineIoClientDotNet.net40/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net40/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/Src/EngineIoClientDotNet.netstandard1.3/EngineIoClientDotNet.netstandard1.3.csproj b/Src/EngineIoClientDotNet.netstandard1.3/EngineIoClientDotNet.netstandard1.3.csproj
@@ -5,11 +5,11 @@
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Description>This is the Engine.IO Client Library for C#.</Description>
     <PackageProjectUrl>https://github.com/Quobject/EngineIoClientDotNet/</PackageProjectUrl>
-    <Version>1.0.0.1-beta1</Version>
+    <Version>1.0.1-beta1</Version>
     <Copyright>Copyright ©  2017</Copyright>
     <RepositoryUrl>https://github.com/Quobject/EngineIoClientDotNet/</RepositoryUrl>
-    <AssemblyVersion>1.0.0.1</AssemblyVersion>
-    <FileVersion>1.0.0.1</FileVersion>
+    <AssemblyVersion>1.0.1.0</AssemblyVersion>
+    <FileVersion>1.0.1.0</FileVersion>
     <RootNamespace>Quobject.EngineIoClientDotNet</RootNamespace>
     <AssemblyName>EngineIoClientDotNet</AssemblyName>
   </PropertyGroup>

diff --git a/TestServer/package.json b/TestServer/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "engine.io": "^3.1.0",
+    "engine.io": "^1.8.4",
     "express": "^4.15.3",
     "strip-json-comments": "^2.0.1"
   }

diff --git a/grunt/config.json b/grunt/config.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0.1",
+  "version": "1.0.1-beta1",
   "server": {
     "port": 80,
     "ssl_port": 443,