1.0.8

mattqs · mattqs · commit 450672e2f518 · 2019-01-01T10:45:14.000+11:00
diff --git a/Src/EngineIoClientDotNet.Tests.net35/ClientTests/ConnectionConstants.cs b/Src/EngineIoClientDotNet.Tests.net35/ClientTests/ConnectionConstants.cs
@@ -3,7 +3,7 @@
     public static class ConnectionConstants
     {
         public static int PORT = 80;
-        public static string HOSTNAME = "testme.quobject.com";
+        public static string HOSTNAME = "testme.quobject.io";
         public static int SSL_PORT = 443;
         public static readonly int TIMEOUT = 300000;
     }
diff --git a/Src/EngineIoClientDotNet.Tests.net40/ClientTests/ConnectionConstants.cs b/Src/EngineIoClientDotNet.Tests.net40/ClientTests/ConnectionConstants.cs
@@ -8,7 +8,7 @@ namespace Quobject.EngineIoClientDotNet_Tests.ClientTests
     public static class ConnectionConstants
     {
         public static int PORT = 80;
-        public static string HOSTNAME = "testme.quobject.com";
+        public static string HOSTNAME = "testme.quobject.io";
         public static int SSL_PORT = 443;
         public static readonly int TIMEOUT = 300000;
     }
diff --git a/Src/EngineIoClientDotNet.Tests.net45/ClientTests/ConnectionConstants.cs b/Src/EngineIoClientDotNet.Tests.net45/ClientTests/ConnectionConstants.cs
@@ -8,7 +8,7 @@ namespace Quobject.EngineIoClientDotNet_Tests.ClientTests
     public static class ConnectionConstants
     {
         public static int PORT = 80;
-        public static string HOSTNAME = "testme.quobject.com";
+        public static string HOSTNAME = "testme.quobject.io";
         public static int SSL_PORT = 443;
         public static readonly int TIMEOUT = 300000;
     }
diff --git a/Src/EngineIoClientDotNet.Tests.net45/EngineIoClientDotNet.Tests.net45.csproj b/Src/EngineIoClientDotNet.Tests.net45/EngineIoClientDotNet.Tests.net45.csproj
@@ -38,8 +38,8 @@
       <HintPath>..\EngineIoClientDotNet.net45\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\EngineIoClientDotNet.net45\packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\EngineIoClientDotNet.net45\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
diff --git a/Src/EngineIoClientDotNet.Tests.net45/packages.config b/Src/EngineIoClientDotNet.Tests.net45/packages.config
@@ -5,7 +5,7 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net45" />
+  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
diff --git a/Src/EngineIoClientDotNet.mono/Client/Transports/WebSocket_net35.cs b/Src/EngineIoClientDotNet.mono/Client/Transports/WebSocket_net35.cs
@@ -31,7 +31,8 @@ protected override void DoOpen()
             var log = LogManager.GetLogger(Global.CallerName());
             log.Info("DoOpen uri =" + this.Uri());
 
-            ws = new WebSocket4Net.WebSocket(this.Uri(),"",Cookies, sslProtocols: SslProtocols);
+            ws = new WebSocket4Net.WebSocket(this.Uri(), "", Cookies);
+
             ws.EnableAutoSendPing = false;
             if (ServerCertificate.Ignore)
             {
diff --git a/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quobject Software")]
 [assembly: AssemblyProduct("EngineIoClientDotNet")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.7")]
-[assembly: AssemblyFileVersion("1.0.7")]
+[assembly: AssemblyVersion("1.0.8")]
+[assembly: AssemblyFileVersion("1.0.8")]
diff --git a/Src/EngineIoClientDotNet.net40/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net40/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quobject Software")]
 [assembly: AssemblyProduct("EngineIoClientDotNet")]
-[assembly: AssemblyCopyright("Copyright © 2018")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.7")]
-[assembly: AssemblyFileVersion("1.0.7")]
+[assembly: AssemblyVersion("1.0.8")]
+[assembly: AssemblyFileVersion("1.0.8")]
diff --git a/Src/EngineIoClientDotNet.net45/EngineIoClientDotNet.net45.csproj b/Src/EngineIoClientDotNet.net45/EngineIoClientDotNet.net45.csproj
@@ -39,8 +39,8 @@
       <HintPath>packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\System.Collections.Immutable.1.4.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="WebSocket4Net, Version=0.15.2.11, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
diff --git a/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs b/Src/EngineIoClientDotNet.net45/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quobject Software")]
 [assembly: AssemblyProduct("EngineIoClientDotNet")]
-[assembly: AssemblyCopyright("Copyright © 2018")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.7")]
-[assembly: AssemblyFileVersion("1.0.7")]
+[assembly: AssemblyVersion("1.0.8")]
+[assembly: AssemblyFileVersion("1.0.8")]
diff --git a/Src/EngineIoClientDotNet.net45/packages.config b/Src/EngineIoClientDotNet.net45/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net45" />
-  <package id="System.Collections.Immutable" version="1.4.0" targetFramework="net45" />
+  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.15.2" targetFramework="net45" />
 </packages>
diff --git a/TestServer/.gitignore b/TestServer/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 test.xml
+*.pem
diff --git a/TestServer/server.js b/TestServer/server.js
@@ -7,11 +7,11 @@ config = JSON.parse(strip_json(String(fs.readFileSync('./../grunt/config.json'))
 util =  require('util'),
 app = express(),
 fs = require('fs'),
-options = {
-  key: fs.readFileSync(__dirname + '/testme.quobject.com.key'),
-  cert: fs.readFileSync(__dirname + '/testme.quobject.com.cert'),
-  requestCert: true
-},
+  options = {
+    key: fs.readFileSync(__dirname + '/privkey.pem'),
+    cert: fs.readFileSync(__dirname + '/fullchain.pem'),
+    requestCert: false
+  },
 server,
 https,
 http,
diff --git a/TestServer/testme.quobject.com.cert b/TestServer/testme.quobject.com.cert
diff --git a/TestServer/testme.quobject.com.key b/TestServer/testme.quobject.com.key
diff --git a/TestServer/testme.quobject.com.p7b b/TestServer/testme.quobject.com.p7b
diff --git a/grunt/config.json b/grunt/config.json
@@ -1,9 +1,9 @@
 {
-  "version": "1.0.7",
+  "version": "1.0.8",
   "server": {
     "port": 80,
     "ssl_port": 443,
-    "hostname": "testme.quobject.com"
+    "hostname": "testme.quobject.io"
   },
   "win": {
     "powershell": "C:/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe",
diff --git a/grunt/templates/AssemblyInfo.cs b/grunt/templates/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Quobject Software")]
 [assembly: AssemblyProduct("EngineIoClientDotNet")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/grunt/templates/EngineIoClientDotNet.nuspec b/grunt/templates/EngineIoClientDotNet.nuspec
@@ -22,7 +22,7 @@
       <group targetFramework="net45">
         <dependency id="WebSocket4Net" version="0.15.2" />
         <dependency id="SuperSocket.ClientEngine.Core" version="0.10.0" />
-        <dependency id="System.Collections.Immutable" version="1.4.0" />
+        <dependency id="System.Collections.Immutable" version="1.5.0" />
         <dependency id="Newtonsoft.Json" version="9.0.1" />
       </group>
       <!--

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`public static class ConnectionConstants`
`4`	`4`	`{`
`5`	`5`	`public static int PORT = 80;`
`6`		`- public static string HOSTNAME = "testme.quobject.com";`
	`6`	`+ public static string HOSTNAME = "testme.quobject.io";`
`7`	`7`	`public static int SSL_PORT = 443;`
`8`	`8`	`public static readonly int TIMEOUT = 300000;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Quobject.EngineIoClientDotNet_Tests.ClientTests`
`8`	`8`	`public static class ConnectionConstants`
`9`	`9`	`{`
`10`	`10`	`public static int PORT = 80;`
`11`		`- public static string HOSTNAME = "testme.quobject.com";`
	`11`	`+ public static string HOSTNAME = "testme.quobject.io";`
`12`	`12`	`public static int SSL_PORT = 443;`
`13`	`13`	`public static readonly int TIMEOUT = 300000;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ protected override void DoOpen()`
`31`	`31`	`var log = LogManager.GetLogger(Global.CallerName());`
`32`	`32`	`log.Info("DoOpen uri =" + this.Uri());`
`33`	`33`
`34`		`- ws = new WebSocket4Net.WebSocket(this.Uri(),"",Cookies, sslProtocols: SslProtocols);`
	`34`	`+ ws = new WebSocket4Net.WebSocket(this.Uri(), "", Cookies);`
	`35`	`+`
`35`	`36`	`ws.EnableAutoSendPing = false;`
`36`	`37`	`if (ServerCertificate.Ignore)`
`37`	`38`	`{`