Skip to content

Commit 4bfbabc

Browse files
darkldarkl
committed
Merge branch 'develop' into wampv2
2 parents b8579c9 + 9a0d499 commit 4bfbabc

File tree

53 files changed

+35
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+35
-311
lines changed

‎NuGet/WampSharp.WebSocket4Net.nuspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
<dependencies>
88
<group targetFramework="net45">
99
<dependency id="WampSharp" version="[$version$]" />
10-
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
10+
<dependency id="WebSocket4Net" version="[0.15.2, )" />
1111
</group>
1212
<group targetFramework="net40">
1313
<dependency id="WampSharp" version="[$version$]" />
14-
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
14+
<dependency id="WebSocket4Net" version="[0.15.2, )" />
1515
</group>
1616
<group targetFramework=".NETStandard1.3">
1717
<dependency id="WampSharp" version="[$version$]" />
18-
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
18+
<dependency id="WebSocket4Net" version="[0.15.2, )" />
1919
</group>
2020
<group targetFramework="Xamarin.iOS10">
2121
<dependency id="WampSharp" version="[$version$]" />
22-
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
22+
<dependency id="WebSocket4Net" version="[0.15.2, )" />
2323
</group>
2424
<group targetFramework=".NETStandard2.0">
2525
<dependency id="WampSharp" version="[$version$]" />
26-
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
26+
<dependency id="WebSocket4Net" version="[0.15.2, )" />
2727
</group>
2828
</dependencies>
2929
<id>WampSharp.WebSocket4Net</id>

‎src/Xamarin.iOS10/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<ItemGroup>
2525
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
26-
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
26+
<PackageReference Include="WebSocket4Net" Version="0.15.2" />
2727
</ItemGroup>
2828

2929

‎src/net40/Default/WampSharp.Fleck/WampSharp.Fleck.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
</ItemGroup>
3737
<ItemGroup>
3838
<PackageReference Include="Fleck" Version="0.14.0.59" />
39-
<PackageReference Include="Rx-Core" Version="2.2.5" />
40-
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
41-
<PackageReference Include="Rx-Linq" Version="2.2.5" />
4239
</ItemGroup>
4340
<ItemGroup>
4441
<Reference Include="System.Data.DataSetExtensions" />

‎src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<ProjectReference Include="..\WampSharp.NewtonsoftJson\WampSharp.NewtonsoftJson.csproj" />
3535
</ItemGroup>
3636
<ItemGroup>
37-
<PackageReference Include="MsgPack.Cli" Version="0.6.2" />
3837
<PackageReference Include="Newtonsoft.Msgpack" Version="0.1.10" />
3938
</ItemGroup>
4039
<ItemGroup>

‎src/net40/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
<ProjectReference Include="..\..\WampSharp\WampSharp.csproj" />
3434
</ItemGroup>
3535
<ItemGroup>
36-
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
37-
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
36+
<PackageReference Include="WebSocket4Net" Version="0.15.2" />
3837
</ItemGroup>
3938
<ItemGroup>
4039
<Reference Include="System.Data.DataSetExtensions" />

‎src/net40/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@
3535
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
3636
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
3737
</ItemGroup>
38-
<ItemGroup>
39-
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
40-
<PackageReference Include="Rx-Core" Version="2.2.5" />
41-
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
42-
<PackageReference Include="Rx-Linq" Version="2.2.5" />
43-
<PackageReference Include="Rx-Main" Version="2.2.5" />
44-
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
45-
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
46-
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
47-
</ItemGroup>
4838
<ItemGroup>
4939
<Reference Include="System.Data.DataSetExtensions" />
5040
</ItemGroup>

‎src/net40/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@
3434
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
3535
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
3636
</ItemGroup>
37-
<ItemGroup>
38-
<PackageReference Include="Fleck" Version="0.14.0.59" />
39-
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
40-
<PackageReference Include="Rx-Core" Version="2.2.5" />
41-
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
42-
<PackageReference Include="Rx-Linq" Version="2.2.5" />
43-
<PackageReference Include="Rx-Main" Version="2.2.5" />
44-
<PackageReference Include="Rx-PlatformServices" Version="2.2.5" />
45-
</ItemGroup>
4637
<ItemGroup>
4738
<Reference Include="System.Data.DataSetExtensions" />
4839
</ItemGroup>

‎src/net40/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
2929
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
3030
</ItemGroup>
31-
<ItemGroup>
32-
<PackageReference Include="Fleck" Version="0.14.0.59" />
33-
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
34-
</ItemGroup>
3531
<ItemGroup>
3632
<Reference Include="System.Data.DataSetExtensions" />
3733
</ItemGroup>

‎src/net40/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
2727
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
2828
</ItemGroup>
29-
<ItemGroup>
30-
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
31-
<PackageReference Include="Rx-Interfaces" Version="2.2.5" />
32-
<PackageReference Include="SuperSocket.ClientEngine.Core" Version="0.8.0.12" />
33-
<PackageReference Include="WebSocket4Net" Version="0.15.0-beta9" />
34-
</ItemGroup>
3529
<ItemGroup>
3630
<Reference Include="System.Data.DataSetExtensions" />
3731
</ItemGroup>

‎src/net40/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<ProjectReference Include="..\..\..\WampSharp.WAMP1\WampSharp.WAMP1.csproj" />
2929
<ProjectReference Include="..\..\..\WampSharp\WampSharp.csproj" />
3030
</ItemGroup>
31-
<ItemGroup>
32-
<PackageReference Include="Fleck" Version="0.14.0.59" />
33-
<PackageReference Include="Newtonsoft.Json" Version="6.0.5" />
34-
</ItemGroup>
3531
<ItemGroup>
3632
<Reference Include="System.Data.DataSetExtensions" />
3733
</ItemGroup>

0 commit comments

Comments
 (0)