Skip to content

Commit

Permalink
Merge branch 'develop' into wampv2
Browse files Browse the repository at this point in the history
  • Loading branch information
darkl committed Apr 1, 2018
2 parents b8579c9 + 9a0d499 commit 4bfbabc
Show file tree
Hide file tree
Showing 53 changed files with 35 additions and 311 deletions.
10 changes: 5 additions & 5 deletions NuGet/WampSharp.WebSocket4Net.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<dependencies>
<group targetFramework="net45">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
<dependency id="WebSocket4Net" version="[0.15.2, )" />
</group>
<group targetFramework="net40">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
<dependency id="WebSocket4Net" version="[0.15.2, )" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
<dependency id="WebSocket4Net" version="[0.15.2, )" />
</group>
<group targetFramework="Xamarin.iOS10">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
<dependency id="WebSocket4Net" version="[0.15.2, )" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
<dependency id="WebSocket4Net" version="[0.15.2, )" />
</group>
</dependencies>
<id>WampSharp.WebSocket4Net</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<ItemGroup>
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
<PackageReference Include="WebSocket4Net" Version="0.15.2" />
</ItemGroup>


Expand Down
3 changes: 0 additions & 3 deletions src/net40/Default/WampSharp.Fleck/WampSharp.Fleck.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<ProjectReference Include="..\WampSharp.NewtonsoftJson\WampSharp.NewtonsoftJson.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MsgPack.Cli" Version="0.6.2" />
<PackageReference Include="Newtonsoft.Msgpack" Version="0.1.10" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
<PackageReference Include="WebSocket4Net" Version="0.15.2" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-Main" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-Main" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,6 @@
<ProjectReference Include="..\..\..\WampSharp.Default.Router\WampSharp.Default.Router.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="MsgPack.Cli" Version="0.6.2" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Newtonsoft.Msgpack" Version="0.1.10" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-Main" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,6 @@
<ProjectReference Include="..\..\..\WampSharp.Default.Router\WampSharp.Default.Router.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="MsgPack.Cli" Version="0.6.2" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Newtonsoft.Msgpack" Version="0.1.10" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-Main" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,6 @@
<ProjectReference Include="..\..\..\WampSharp.Default.Router\WampSharp.Default.Router.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="MsgPack.Cli" Version="0.6.2" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Newtonsoft.Msgpack" Version="0.1.10" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-Main" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@
<ProjectReference Include="..\..\..\WampSharp.Default.Client\WampSharp.Default.Client.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
<ProjectReference Include="..\WampSharp.Samples.WampCra.Client\WampSharp.Samples.WampCra.Client.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-Main" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
2 changes: 1 addition & 1 deletion src/net40/Tests/WampSharp.Tests/WampSharp.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -262,4 +262,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<ProjectReference Include="..\Default\WampSharp.WebSocket4Net\WampSharp.WebSocket4Net.csproj" />
<ProjectReference Include="..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@
<ProjectReference Include="..\Default\WampSharp.NewtonsoftMsgpack\WampSharp.NewtonsoftMsgpack.csproj" />
<ProjectReference Include="..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
<ProjectReference Include="..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
<ProjectReference Include="..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
8 changes: 0 additions & 8 deletions src/net40/WampSharp.WAMP1/WampSharp.WAMP1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@
<ItemGroup>
<ProjectReference Include="..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Rx-Core" Version="2.2.5" />
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
<PackageReference Include="Rx-Linq" Version="2.2.5" />
<PackageReference Include="Rx-Main" Version="2.2.5" />
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
3 changes: 0 additions & 3 deletions src/net45/Default/WampSharp.Fleck/WampSharp.Fleck.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fleck" Version="0.14.0.59" />
<PackageReference Include="System.Reactive.Core" Version="3.0.0" />
<PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
<ProjectReference Include="..\WampSharp.NewtonsoftJson\WampSharp.NewtonsoftJson.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MsgPack.Cli" Version="0.6.2" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Newtonsoft.Msgpack" Version="0.1.10" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
<PackageReference Include="WebSocket4Net" Version="0.15.2" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="System.Buffers" Version="4.3.0" />
<PackageReference Include="System.Reactive.Core" Version="3.0.0" />
<PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
Expand Down
14 changes: 0 additions & 14 deletions src/net45/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,9 @@
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Microsoft.AspNet.Cors" Version="5.0.0" />
<PackageReference Include="Microsoft.AspNet.SignalR.Client" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNet.SignalR.Core" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNet.SignalR.SelfHost" Version="2.2.0" />
<PackageReference Include="Microsoft.Owin" Version="2.1.0" />
<PackageReference Include="Microsoft.Owin.Cors" Version="2.1.0" />
<PackageReference Include="Microsoft.Owin.Diagnostics" Version="2.1.0" />
<PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="2.1.0" />
<PackageReference Include="Microsoft.Owin.Hosting" Version="2.1.0" />
<PackageReference Include="Microsoft.Owin.Security" Version="2.1.0" />
<PackageReference Include="Microsoft.Owin.SelfHost" Version="2.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="Owin" Version="1.0" />
<PackageReference Include="System.Reactive.Core" Version="3.0.0" />
<PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="Microsoft.Tpl.Dataflow" Version="4.5.24" />
<PackageReference Include="System.Reactive.Core" Version="3.0.0" />
<PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
<PackageReference Include="vtortola.WebSocketListener" Version="2.2.2.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,6 @@
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
<PackageReference Include="System.Reactive.Core" Version="3.0.0" />
<PackageReference Include="System.Reactive.Interfaces" Version="3.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="3.0.0" />
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Data.DataSetExtensions" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 4bfbabc

Please sign in to comment.