diff --git a/NuGet/WampSharp.WebSocket4Net.nuspec b/NuGet/WampSharp.WebSocket4Net.nuspec index b0843faa6..30c94b5cf 100644 --- a/NuGet/WampSharp.WebSocket4Net.nuspec +++ b/NuGet/WampSharp.WebSocket4Net.nuspec @@ -7,23 +7,23 @@ - + - + - + - + - + WampSharp.WebSocket4Net diff --git a/src/Xamarin.iOS10/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj b/src/Xamarin.iOS10/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj index 9b8b10871..0fb5dd8be 100644 --- a/src/Xamarin.iOS10/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj +++ b/src/Xamarin.iOS10/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/net40/Default/WampSharp.Fleck/WampSharp.Fleck.csproj b/src/net40/Default/WampSharp.Fleck/WampSharp.Fleck.csproj index 153a85193..43ac1191f 100644 --- a/src/net40/Default/WampSharp.Fleck/WampSharp.Fleck.csproj +++ b/src/net40/Default/WampSharp.Fleck/WampSharp.Fleck.csproj @@ -36,9 +36,6 @@ - - - diff --git a/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj b/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj index fc8cd378d..1ccf84e51 100644 --- a/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj +++ b/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj @@ -34,7 +34,6 @@ - diff --git a/src/net40/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj b/src/net40/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj index 555f7afa9..cb4f86e51 100644 --- a/src/net40/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj +++ b/src/net40/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj @@ -33,8 +33,7 @@ - - + diff --git a/src/net40/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj b/src/net40/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj index 14f8f8d7e..c1aecbf68 100644 --- a/src/net40/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj +++ b/src/net40/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj @@ -35,16 +35,6 @@ - - - - - - - - - - diff --git a/src/net40/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj b/src/net40/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj index 88c410242..dff0f3755 100644 --- a/src/net40/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj +++ b/src/net40/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj @@ -34,15 +34,6 @@ - - - - - - - - - diff --git a/src/net40/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj b/src/net40/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj index 6f24b64d8..0d06a6178 100644 --- a/src/net40/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj +++ b/src/net40/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj @@ -28,10 +28,6 @@ - - - - diff --git a/src/net40/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj b/src/net40/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj index 767b1a418..1b4501e66 100644 --- a/src/net40/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj +++ b/src/net40/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj @@ -26,12 +26,6 @@ - - - - - - diff --git a/src/net40/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj b/src/net40/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj index 1a84f7450..9676b2031 100644 --- a/src/net40/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj +++ b/src/net40/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj @@ -28,10 +28,6 @@ - - - - diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj b/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj index 4b26fc20e..dffe6f360 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj @@ -31,20 +31,6 @@ - - - - - - - - - - - - - - diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj b/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj index c5d76fd9b..ec75ce60b 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj @@ -35,20 +35,6 @@ - - - - - - - - - - - - - - diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj b/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj index 7a7201101..f316d8208 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj @@ -28,19 +28,6 @@ - - - - - - - - - - - - - diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj b/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj index 486323c10..9cc530001 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj @@ -26,13 +26,6 @@ - - - - - - - diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj b/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj index 214f1e69a..c525cd9f8 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj @@ -28,12 +28,6 @@ - - - - - - diff --git a/src/net40/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj b/src/net40/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj index be1959ed7..6f4be8a6c 100644 --- a/src/net40/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj +++ b/src/net40/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj @@ -31,11 +31,6 @@ - - - - - diff --git a/src/net40/Tests/WampSharp.Tests/WampSharp.Tests.csproj b/src/net40/Tests/WampSharp.Tests/WampSharp.Tests.csproj index f9784c514..21f0f7041 100644 --- a/src/net40/Tests/WampSharp.Tests/WampSharp.Tests.csproj +++ b/src/net40/Tests/WampSharp.Tests/WampSharp.Tests.csproj @@ -262,4 +262,4 @@ --> - + \ No newline at end of file diff --git a/src/net40/WampSharp.Default.Client/WampSharp.Default.Client.csproj b/src/net40/WampSharp.Default.Client/WampSharp.Default.Client.csproj index 36db6aafe..e175aab9f 100644 --- a/src/net40/WampSharp.Default.Client/WampSharp.Default.Client.csproj +++ b/src/net40/WampSharp.Default.Client/WampSharp.Default.Client.csproj @@ -36,11 +36,6 @@ - - - - - diff --git a/src/net40/WampSharp.Default.Router/WampSharp.Default.Router.csproj b/src/net40/WampSharp.Default.Router/WampSharp.Default.Router.csproj index 520de9e27..2b381bb81 100644 --- a/src/net40/WampSharp.Default.Router/WampSharp.Default.Router.csproj +++ b/src/net40/WampSharp.Default.Router/WampSharp.Default.Router.csproj @@ -35,10 +35,6 @@ - - - - diff --git a/src/net40/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj b/src/net40/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj index 8607951c2..141339771 100644 --- a/src/net40/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj +++ b/src/net40/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj @@ -36,12 +36,6 @@ - - - - - - diff --git a/src/net40/WampSharp.WAMP1/WampSharp.WAMP1.csproj b/src/net40/WampSharp.WAMP1/WampSharp.WAMP1.csproj index f1a7318c6..864ea3076 100644 --- a/src/net40/WampSharp.WAMP1/WampSharp.WAMP1.csproj +++ b/src/net40/WampSharp.WAMP1/WampSharp.WAMP1.csproj @@ -32,14 +32,6 @@ - - - - - - - - diff --git a/src/net45/Default/WampSharp.Fleck/WampSharp.Fleck.csproj b/src/net45/Default/WampSharp.Fleck/WampSharp.Fleck.csproj index cdf8624f8..d2c3fe945 100644 --- a/src/net45/Default/WampSharp.Fleck/WampSharp.Fleck.csproj +++ b/src/net45/Default/WampSharp.Fleck/WampSharp.Fleck.csproj @@ -44,9 +44,6 @@ - - - diff --git a/src/net45/Default/WampSharp.NewtonsoftJson/WampSharp.NewtonsoftJson.csproj b/src/net45/Default/WampSharp.NewtonsoftJson/WampSharp.NewtonsoftJson.csproj index 1bc857ecd..0f05f4d73 100644 --- a/src/net45/Default/WampSharp.NewtonsoftJson/WampSharp.NewtonsoftJson.csproj +++ b/src/net45/Default/WampSharp.NewtonsoftJson/WampSharp.NewtonsoftJson.csproj @@ -42,7 +42,6 @@ - diff --git a/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj b/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj index e7c503c22..65229fa5e 100644 --- a/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj +++ b/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj @@ -42,8 +42,6 @@ - - diff --git a/src/net45/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj b/src/net45/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj index 456e58aec..d72fc1116 100644 --- a/src/net45/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj +++ b/src/net45/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj @@ -41,8 +41,7 @@ - - + diff --git a/src/net45/Extensions/WampSharp.RawSocket/WampSharp.RawSocket.csproj b/src/net45/Extensions/WampSharp.RawSocket/WampSharp.RawSocket.csproj index 343eb7046..1d35a5cdd 100644 --- a/src/net45/Extensions/WampSharp.RawSocket/WampSharp.RawSocket.csproj +++ b/src/net45/Extensions/WampSharp.RawSocket/WampSharp.RawSocket.csproj @@ -37,11 +37,7 @@ - - - - diff --git a/src/net45/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj b/src/net45/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj index 35667837f..1d1a106d5 100644 --- a/src/net45/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj +++ b/src/net45/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj @@ -34,23 +34,9 @@ - - - - - - - - - - - - - - diff --git a/src/net45/Extensions/WampSharp.Vtortola/WampSharp.Vtortola.csproj b/src/net45/Extensions/WampSharp.Vtortola/WampSharp.Vtortola.csproj index 20c38153c..457b3e598 100644 --- a/src/net45/Extensions/WampSharp.Vtortola/WampSharp.Vtortola.csproj +++ b/src/net45/Extensions/WampSharp.Vtortola/WampSharp.Vtortola.csproj @@ -40,11 +40,6 @@ - - - - - diff --git a/src/net45/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj b/src/net45/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj index 7c3634621..9b353fd4c 100644 --- a/src/net45/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj +++ b/src/net45/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj @@ -43,14 +43,6 @@ - - - - - - - - diff --git a/src/net45/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj b/src/net45/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj index a0e0222c2..deb6c19f4 100644 --- a/src/net45/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj +++ b/src/net45/Samples/WAMP1/WampSharp.CraServerSample/WampSharp.CraServerSample.csproj @@ -42,13 +42,6 @@ - - - - - - - diff --git a/src/net45/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj b/src/net45/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj index f83974034..375d40e08 100644 --- a/src/net45/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj +++ b/src/net45/Samples/WAMP1/WampSharp.PubSubServerSample/WampSharp.PubSubServerSample.csproj @@ -36,10 +36,6 @@ - - - - diff --git a/src/net45/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj b/src/net45/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj index 7c1da57d1..9dadbc6e0 100644 --- a/src/net45/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj +++ b/src/net45/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj @@ -34,14 +34,6 @@ - - - - - - - - diff --git a/src/net45/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj b/src/net45/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj index ad2f619b8..514ac1d24 100644 --- a/src/net45/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj +++ b/src/net45/Samples/WAMP1/WampSharp.RpcServerSample/WampSharp.RpcServerSample.csproj @@ -36,10 +36,6 @@ - - - - diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj b/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj index 6d0395502..483e06a58 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj @@ -39,18 +39,6 @@ - - - - - - - - - - - - diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj b/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj index cf4c96556..735bc2065 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj @@ -43,18 +43,6 @@ - - - - - - - - - - - - diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj b/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj index cdb48e309..2f81dc15c 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj @@ -42,17 +42,7 @@ - - - - - - - - - - diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj b/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj index 3485c6789..0b4755063 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj @@ -45,18 +45,6 @@ - - - - - - - - - - - - diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj b/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj index 0f55b4a37..98af038dd 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj @@ -36,17 +36,6 @@ - - - - - - - - - - - diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj b/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj index 7ff190a8d..332e892af 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj @@ -36,13 +36,6 @@ - - - - - - - diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj b/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj index a6e2e3026..b59409396 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.WampCra.Router/WampSharp.Samples.WampCra.Router.csproj @@ -36,12 +36,6 @@ - - - - - - diff --git a/src/net45/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj b/src/net45/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj index b43f68dd4..1e31707ab 100644 --- a/src/net45/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj +++ b/src/net45/Tests/WampSharp.Tests.TestHelpers/WampSharp.Tests.TestHelpers.csproj @@ -35,13 +35,10 @@ - + - - - - + diff --git a/src/net45/Tests/WampSharp.Tests.Wampv2/WampSharp.Tests.Wampv2.csproj b/src/net45/Tests/WampSharp.Tests.Wampv2/WampSharp.Tests.Wampv2.csproj index 9c58dc9f6..67b8c6394 100644 --- a/src/net45/Tests/WampSharp.Tests.Wampv2/WampSharp.Tests.Wampv2.csproj +++ b/src/net45/Tests/WampSharp.Tests.Wampv2/WampSharp.Tests.Wampv2.csproj @@ -35,15 +35,9 @@ - - - - - - diff --git a/src/net45/Tests/WampSharp.Tests/WampSharp.Tests.csproj b/src/net45/Tests/WampSharp.Tests/WampSharp.Tests.csproj index d0b274c9c..0b6deed14 100644 --- a/src/net45/Tests/WampSharp.Tests/WampSharp.Tests.csproj +++ b/src/net45/Tests/WampSharp.Tests/WampSharp.Tests.csproj @@ -37,12 +37,8 @@ - - - - diff --git a/src/net45/WampSharp.Default.Client/WampSharp.Default.Client.csproj b/src/net45/WampSharp.Default.Client/WampSharp.Default.Client.csproj index 12744b141..ebc2bd3db 100644 --- a/src/net45/WampSharp.Default.Client/WampSharp.Default.Client.csproj +++ b/src/net45/WampSharp.Default.Client/WampSharp.Default.Client.csproj @@ -44,11 +44,6 @@ - - - - - diff --git a/src/net45/WampSharp.Default.Router/WampSharp.Default.Router.csproj b/src/net45/WampSharp.Default.Router/WampSharp.Default.Router.csproj index 7132bf2df..3be61428a 100644 --- a/src/net45/WampSharp.Default.Router/WampSharp.Default.Router.csproj +++ b/src/net45/WampSharp.Default.Router/WampSharp.Default.Router.csproj @@ -43,10 +43,6 @@ - - - - diff --git a/src/net45/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj b/src/net45/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj index 76d89d57f..e0e14b795 100644 --- a/src/net45/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj +++ b/src/net45/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj @@ -44,12 +44,6 @@ - - - - - - diff --git a/src/net45/WampSharp.WAMP1/WampSharp.WAMP1.csproj b/src/net45/WampSharp.WAMP1/WampSharp.WAMP1.csproj index eef3c39e3..3b8c28ced 100644 --- a/src/net45/WampSharp.WAMP1/WampSharp.WAMP1.csproj +++ b/src/net45/WampSharp.WAMP1/WampSharp.WAMP1.csproj @@ -40,12 +40,6 @@ - - - - - - diff --git a/src/net45/WampSharp/Core/Client/WampServerProxyBuilder.cs b/src/net45/WampSharp/Core/Client/WampServerProxyBuilder.cs index 202729188..36e6eabf3 100644 --- a/src/net45/WampSharp/Core/Client/WampServerProxyBuilder.cs +++ b/src/net45/WampSharp/Core/Client/WampServerProxyBuilder.cs @@ -5,6 +5,8 @@ using WampSharp.Core.Message; using WampSharp.Core.Proxy; using WampSharp.Core.Utilities; +using WampSharp.V2.CalleeProxy; +using WampSharp.V2.Core.Proxy; namespace WampSharp.Core.Client { @@ -45,14 +47,19 @@ public TServer Create(TRawClient client, IWampConnection connection) new WampOutgoingInterceptor(mOutgoingSerializer, handler); - var proxyOptions = new ProxyGenerationOptions(); + ProxyGenerationOptions proxyOptions = + new ProxyGenerationOptions() + { + Selector = new WampInterceptorSelector() + }; proxyOptions.AddMixinInstance(new DisposableForwarder(connection)); TServer result = - mProxyGenerator.CreateInterfaceProxyWithoutTarget - (proxyOptions, - interceptor); + (TServer)mProxyGenerator.CreateInterfaceProxyWithoutTarget + (typeof(TServer), + new Type[] {typeof(IDisposable)}, + proxyOptions, interceptor); return result; } diff --git a/src/net45/WampSharp/WAMP2/V2/Client/Session/WampSessionClient.cs b/src/net45/WampSharp/WAMP2/V2/Client/Session/WampSessionClient.cs index fbec81a29..01161e2fe 100644 --- a/src/net45/WampSharp/WAMP2/V2/Client/Session/WampSessionClient.cs +++ b/src/net45/WampSharp/WAMP2/V2/Client/Session/WampSessionClient.cs @@ -104,19 +104,22 @@ public void Welcome(long session, WelcomeDetails details) public void Abort(AbortDetails details, string reason) { - TrySetCloseEventArgs(SessionCloseType.Abort, details, reason); - mServerProxy.Dispose(); + using (IDisposable proxy = mServerProxy as IDisposable) + { + TrySetCloseEventArgs(SessionCloseType.Abort, details, reason); + } } public void Goodbye(GoodbyeDetails details, string reason) { - if (!mGoodbyeSent) + using (IDisposable proxy = mServerProxy as IDisposable) { - mServerProxy.Goodbye(new GoodbyeDetails(), WampErrors.GoodbyeAndOut); + if (!mGoodbyeSent) + { + mServerProxy.Goodbye(new GoodbyeDetails(), WampErrors.GoodbyeAndOut); + } } - mServerProxy.Dispose(); - TrySetCloseEventArgs(SessionCloseType.Goodbye, details, reason); } diff --git a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Proxy/IWampServerProxy.cs b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Proxy/IWampServerProxy.cs index ee6428497..0f3663982 100644 --- a/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Proxy/IWampServerProxy.cs +++ b/src/net45/WampSharp/WAMP2/V2/Core/Contracts/Proxy/IWampServerProxy.cs @@ -16,8 +16,7 @@ public interface IWampServerProxy : IWampBrokerProxy, IWampDealerProxy, IWampSessionProxy, - IWampError, - IDisposable + IWampError { } } \ No newline at end of file diff --git a/src/net45/WampSharp/WAMP2/V2/PCL/ManualWampServerProxyBuilder.cs b/src/net45/WampSharp/WAMP2/V2/PCL/ManualWampServerProxyBuilder.cs index ab44e3fc1..a1ee6055b 100644 --- a/src/net45/WampSharp/WAMP2/V2/PCL/ManualWampServerProxyBuilder.cs +++ b/src/net45/WampSharp/WAMP2/V2/PCL/ManualWampServerProxyBuilder.cs @@ -34,7 +34,7 @@ public IWampServerProxy Create(IWampClient client, IWampConnection proxy.Publish(default(long), default(PublishOptions), default(string))); private static readonly MethodInfo mPublish4 = Method.Get((IWampServerProxy proxy) => proxy.Publish(default(long), default(PublishOptions), default(string), default(object[]))); diff --git a/src/netstandard1.3/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj b/src/netstandard1.3/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj index 241eedd9e..dcc1907c3 100644 --- a/src/netstandard1.3/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj +++ b/src/netstandard1.3/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/netstandard2.0/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj b/src/netstandard2.0/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj index 38091c750..c77f07b63 100644 --- a/src/netstandard2.0/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj +++ b/src/netstandard2.0/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj @@ -14,7 +14,7 @@ - +