diff --git a/PureWebsockets.sln b/PureWebsockets.sln index 7a699e8..c89713f 100644 --- a/PureWebsockets.sln +++ b/PureWebsockets.sln @@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PureWebsocketsTest", "src\PureWebsocketsTest\PureWebsocketsTest.csproj", "{DB9C7CFC-C334-4687-A81F-73516258F7B1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PureWebSockets", "src\PureWebSockets\PureWebSockets.csproj", "{2E742D78-651E-41C4-9908-72E48874FF8C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PureWebSockets_WebsocketLite", "src\PureWebSockets\PureWebSockets_WebsocketLite.csproj", "{2E742D78-651E-41C4-9908-72E48874FF8C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/PureWebsockets/Properties/AssemblyInfo.cs b/src/PureWebsockets/Properties/AssemblyInfo.cs index 6699931..0d75875 100644 --- a/src/PureWebsockets/Properties/AssemblyInfo.cs +++ b/src/PureWebsockets/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Coinigy Inc.")] -[assembly: AssemblyProduct("PureWebSockets")] +[assembly: AssemblyProduct("PureWebSockets_WebsocketLite")] [assembly: AssemblyTrademark("2017 Coinigy Inc.")] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/src/PureWebsockets/PureWebSocket.cs b/src/PureWebsockets/PureWebSocket.cs index 82d681c..55a4128 100644 --- a/src/PureWebsockets/PureWebSocket.cs +++ b/src/PureWebsockets/PureWebSocket.cs @@ -37,7 +37,6 @@ public class PureWebSocket : IDisposable public Dictionary RequestHeaders { get; set; } public int DisconnectWait { get; set; } - public event Data OnData; public event Message OnMessage; public event StateChanged OnStateChanged; public event Opened OnOpened; @@ -156,6 +155,8 @@ public async Task ConnectAsync() } }).Wait(15000); Log($"Connect result: {_ws.IsConnected}"); + if (_ws.IsConnected) + OnOpened?.Invoke(); return _ws.IsConnected; } catch (Exception ex) diff --git a/src/PureWebsockets/PureWebSockets.csproj b/src/PureWebsockets/PureWebSockets_WebsocketLite.csproj similarity index 50% rename from src/PureWebsockets/PureWebSockets.csproj rename to src/PureWebsockets/PureWebSockets_WebsocketLite.csproj index c82f0b2..a2bb2c7 100644 --- a/src/PureWebsockets/PureWebSockets.csproj +++ b/src/PureWebsockets/PureWebSockets_WebsocketLite.csproj @@ -3,14 +3,24 @@ 1.4.0 netstandard1.4 - PureWebSockets - PureWebSockets + PureWebSockets_WebsocketLite + PureWebSockets_WebsocketLite 1.6.1 $(PackageTargetFallback);dnxcore50 false false false 1.5.0 + ByronP + A cross platform WebSocket client library for .NET NetStandard core (backed by WebsocketClientLite). + See git for list of changes. + https://github.com/ByronAP/PureWebSockets + https://raw.githubusercontent.com/coinigy/PureWebSockets/master/PWSIcon.ico + https://github.com/ByronAP/PureWebSockets + Copyright 2017 Coinigy Inc. + websocket, netstandard, core, client, websockets + https://raw.githubusercontent.com/ByronAP/PureWebSockets/master/LICENSE + true diff --git a/src/PureWebsocketsTest/PureWebsocketsTest.csproj b/src/PureWebsocketsTest/PureWebsocketsTest.csproj index 4e37b9a..0165409 100644 --- a/src/PureWebsocketsTest/PureWebsocketsTest.csproj +++ b/src/PureWebsocketsTest/PureWebsocketsTest.csproj @@ -14,7 +14,7 @@ - +