From a702363294b34bfe0affa7587665f2b959dd87b0 Mon Sep 17 00:00:00 2001 From: Elad Zelingher Date: Sun, 22 Nov 2015 22:18:15 +0200 Subject: [PATCH 1/5] Avoid boxing for WampMessageType key --- .../Core/Dispatch/Handler/WampRequestMapper.cs | 3 ++- .../MessageType/WampMessageTypeComparer.cs | 17 +++++++++++++++++ src/net45/WampSharp/WampSharp.csproj | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/net45/WampSharp/Core/Message/MessageType/WampMessageTypeComparer.cs diff --git a/src/net45/WampSharp/Core/Dispatch/Handler/WampRequestMapper.cs b/src/net45/WampSharp/Core/Dispatch/Handler/WampRequestMapper.cs index 14e7d162a..32af24cc7 100644 --- a/src/net45/WampSharp/Core/Dispatch/Handler/WampRequestMapper.cs +++ b/src/net45/WampSharp/Core/Dispatch/Handler/WampRequestMapper.cs @@ -75,7 +75,8 @@ private Dictionary> BuildMapping(Ty .Where(x => x.Attribute != null); var result = - new Dictionary>(); + new Dictionary> + (new WampMessageTypeComparer()); foreach (var relevantMethod in relevantMethods) { diff --git a/src/net45/WampSharp/Core/Message/MessageType/WampMessageTypeComparer.cs b/src/net45/WampSharp/Core/Message/MessageType/WampMessageTypeComparer.cs new file mode 100644 index 000000000..ac0fe6508 --- /dev/null +++ b/src/net45/WampSharp/Core/Message/MessageType/WampMessageTypeComparer.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace WampSharp.Core.Message +{ + internal class WampMessageTypeComparer : IEqualityComparer + { + public bool Equals(WampMessageType x, WampMessageType y) + { + return x == y; + } + + public int GetHashCode(WampMessageType obj) + { + return (int) obj; + } + } +} \ No newline at end of file diff --git a/src/net45/WampSharp/WampSharp.csproj b/src/net45/WampSharp/WampSharp.csproj index e50ccd8ce..74108d84c 100644 --- a/src/net45/WampSharp/WampSharp.csproj +++ b/src/net45/WampSharp/WampSharp.csproj @@ -119,6 +119,7 @@ + From c4d6e93ab4d9e455b647474a6d38d61f786df7be Mon Sep 17 00:00:00 2001 From: Elad Zelingher Date: Mon, 23 Nov 2015 11:15:25 +0200 Subject: [PATCH 2/5] Forgot these csprojs --- src/mono/WampSharp/WampSharp.csproj | 3 +++ src/net40/WampSharp/WampSharp.csproj | 3 +++ src/pcl/WampSharp/WampSharp.csproj | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/mono/WampSharp/WampSharp.csproj b/src/mono/WampSharp/WampSharp.csproj index 892d11abb..98f3156fc 100644 --- a/src/mono/WampSharp/WampSharp.csproj +++ b/src/mono/WampSharp/WampSharp.csproj @@ -209,6 +209,9 @@ Core\Message\MessageType\WampMessageType.cs + + Core\Message\MessageType\WampMessageTypeComparer.cs + Core\Message\WampMessage.cs diff --git a/src/net40/WampSharp/WampSharp.csproj b/src/net40/WampSharp/WampSharp.csproj index 0f6108f44..48bc6a266 100644 --- a/src/net40/WampSharp/WampSharp.csproj +++ b/src/net40/WampSharp/WampSharp.csproj @@ -213,6 +213,9 @@ Core\Message\MessageType\WampMessageType.cs + + Core\Message\MessageType\WampMessageTypeComparer.cs + Core\Message\WampMessage.cs diff --git a/src/pcl/WampSharp/WampSharp.csproj b/src/pcl/WampSharp/WampSharp.csproj index 5bceb8f30..7f6997f4a 100644 --- a/src/pcl/WampSharp/WampSharp.csproj +++ b/src/pcl/WampSharp/WampSharp.csproj @@ -212,6 +212,9 @@ Core\Message\MessageType\WampMessageType.cs + + Core\Message\MessageType\WampMessageTypeComparer.cs + Core\Message\WampMessage.cs From f34d7afa3c05fd3e476a6d8f31a4b96cfdba64c8 Mon Sep 17 00:00:00 2001 From: Elad Zelingher Date: Sat, 28 Nov 2015 17:55:11 +0200 Subject: [PATCH 3/5] Fixing bug when stream closed --- .../RawSocket/NetworkStreamExtensions.cs | 8 ++++++++ .../WAMP2/WampSharp.Samples.Authentication/App.config | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/net45/Extensions/WampSharp.RawSocket/RawSocket/NetworkStreamExtensions.cs b/src/net45/Extensions/WampSharp.RawSocket/RawSocket/NetworkStreamExtensions.cs index 59280910e..2cd194748 100644 --- a/src/net45/Extensions/WampSharp.RawSocket/RawSocket/NetworkStreamExtensions.cs +++ b/src/net45/Extensions/WampSharp.RawSocket/RawSocket/NetworkStreamExtensions.cs @@ -1,3 +1,4 @@ +using System.IO; using System.Net.Sockets; using System.Threading.Tasks; @@ -18,6 +19,13 @@ public async static Task ReadExactAsync(this NetworkStream networkStream, byte[] while (readBytes != length) { int currentlyRead = await networkStream.ReadAsync(buffer, currentPosition, length - readBytes); + + // If we read 0 bytes, we have reached the end of the stream. + if (currentlyRead == 0) + { + throw new EndOfStreamException(); + } + readBytes += currentlyRead; currentPosition += currentlyRead; } diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Authentication/App.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Authentication/App.config index fad249e40..8e1564635 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Authentication/App.config +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Authentication/App.config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file From 13a3a139342bb0a41f13b0bf7a418de70420da52 Mon Sep 17 00:00:00 2001 From: Elad Zelingher Date: Mon, 30 Nov 2015 10:06:16 +0200 Subject: [PATCH 4/5] Updating Newtonsoft Msgpack --- NuGet/WampSharp.NewtonsoftMsgpack.nuspec | 2 +- .../WampSharp.NewtonsoftMsgpack/MsgPack/MessagePackParser.cs | 4 ++-- .../WampSharp.NewtonsoftMsgpack.csproj | 2 +- src/net45/Default/WampSharp.NewtonsoftMsgpack/packages.config | 2 +- .../WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Callee/packages.config | 2 +- .../WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Caller/packages.config | 2 +- .../WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config | 2 +- .../WampSharp.Samples.Publisher.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Publisher/packages.config | 2 +- .../WampSharp.Samples.Subscriber.csproj | 2 +- .../WAMP2/WampSharp.Samples.Subscriber/packages.config | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet/WampSharp.NewtonsoftMsgpack.nuspec b/NuGet/WampSharp.NewtonsoftMsgpack.nuspec index 91ccbe4e9..378f544f2 100644 --- a/NuGet/WampSharp.NewtonsoftMsgpack.nuspec +++ b/NuGet/WampSharp.NewtonsoftMsgpack.nuspec @@ -7,7 +7,7 @@ - + WampSharp.NewtonsoftMsgpack WampSharp Newtonsoft.Msgpack binding diff --git a/src/net45/Default/WampSharp.NewtonsoftMsgpack/MsgPack/MessagePackParser.cs b/src/net45/Default/WampSharp.NewtonsoftMsgpack/MsgPack/MessagePackParser.cs index 1d3b46b9b..4885685bb 100644 --- a/src/net45/Default/WampSharp.NewtonsoftMsgpack/MsgPack/MessagePackParser.cs +++ b/src/net45/Default/WampSharp.NewtonsoftMsgpack/MsgPack/MessagePackParser.cs @@ -64,7 +64,7 @@ public byte[] Format(WampMessage message) using (MemoryStream memoryStream = new MemoryStream()) { - using (MessagePackWriter writer = new MessagePackWriter(memoryStream)) + using (MessagePackWriter writer = new MessagePackWriter(memoryStream) {WriteDateTimeAsString = true}) { mSerializer.Serialize(writer, array); memoryStream.Position = 0; @@ -97,7 +97,7 @@ public WampMessage Parse(Stream stream) public void Format(WampMessage message, Stream stream) { - using (MessagePackWriter writer = new MessagePackWriter(stream) {CloseOutput = false}) + using (MessagePackWriter writer = new MessagePackWriter(stream) {CloseOutput = false, WriteDateTimeAsString = true }) { writer.Formatting = Formatting.None; object[] array = mMessageFormatter.Format(message); diff --git a/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj b/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj index ec508211d..34bad6a61 100644 --- a/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj +++ b/src/net45/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj @@ -43,7 +43,7 @@ True - ..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/net45/Default/WampSharp.NewtonsoftMsgpack/packages.config b/src/net45/Default/WampSharp.NewtonsoftMsgpack/packages.config index 593e9df7c..fb976cf9b 100644 --- a/src/net45/Default/WampSharp.NewtonsoftMsgpack/packages.config +++ b/src/net45/Default/WampSharp.NewtonsoftMsgpack/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file 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 36ce9425b..9d3c88225 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 @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/packages.config index 336d85200..a64be9db5 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/packages.config +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/packages.config @@ -4,7 +4,7 @@ - + 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 2aef03fce..4ef91f651 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 @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/packages.config index 336d85200..a64be9db5 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/packages.config +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/packages.config @@ -4,7 +4,7 @@ - + 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 716562185..9c456e518 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 @@ -54,7 +54,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config index 6e4e22bd3..a589b6314 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config @@ -5,7 +5,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 6a016c48b..9547e00d4 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 @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config index 336d85200..a64be9db5 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config @@ -4,7 +4,7 @@ - + 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 96470b116..d4f982ec3 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 @@ -47,7 +47,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config index 79c64ec90..5af694c14 100644 --- a/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config +++ b/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config @@ -3,7 +3,7 @@ - + From a89976dd907a9c9e7dfd723c5c291b6763c5c494 Mon Sep 17 00:00:00 2001 From: Elad Zelingher Date: Mon, 30 Nov 2015 10:53:47 +0200 Subject: [PATCH 5/5] Forgot mono and net40 --- .../WampSharp.NewtonsoftMsgpack.csproj | 2 +- src/mono/Default/WampSharp.NewtonsoftMsgpack/packages.config | 2 +- .../WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj | 2 +- src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config | 2 +- .../WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj | 2 +- src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config | 2 +- .../WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj | 2 +- src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config | 2 +- .../WampSharp.Samples.Publisher.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Publisher/packages.config | 2 +- .../WampSharp.Samples.Subscriber.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config | 2 +- .../WampSharp.NewtonsoftMsgpack.csproj | 2 +- src/net40/Default/WampSharp.NewtonsoftMsgpack/packages.config | 2 +- .../WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Callee/packages.config | 2 +- .../WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Caller/packages.config | 2 +- .../WampSharp.Samples.Publisher.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Publisher/packages.config | 2 +- .../WampSharp.Samples.Subscriber.csproj | 2 +- .../Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/mono/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj b/src/mono/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj index d83b61422..79d1c7041 100644 --- a/src/mono/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj +++ b/src/mono/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj @@ -43,7 +43,7 @@ True - ..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/mono/Default/WampSharp.NewtonsoftMsgpack/packages.config b/src/mono/Default/WampSharp.NewtonsoftMsgpack/packages.config index 3cd63d257..f6790467d 100644 --- a/src/mono/Default/WampSharp.NewtonsoftMsgpack/packages.config +++ b/src/mono/Default/WampSharp.NewtonsoftMsgpack/packages.config @@ -2,5 +2,5 @@ - + diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj b/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj index 4d040a112..e255ec694 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config index 917c20334..ad77bcae2 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config @@ -4,6 +4,6 @@ - + diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj b/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj index d33a789c5..578e46281 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config index 917c20334..ad77bcae2 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config @@ -4,6 +4,6 @@ - + diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj b/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj index 45ed9edaa..6d7fec0c7 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj @@ -54,7 +54,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config index 245367d73..98ef1eaef 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config @@ -5,6 +5,6 @@ - + diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj b/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj index 90970f7b4..524ba5a85 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config index 917c20334..ad77bcae2 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config @@ -4,6 +4,6 @@ - + diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj b/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj index 07624880b..c95f64af0 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj @@ -47,7 +47,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll True diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config index 2555eb52c..bfca08a86 100644 --- a/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config +++ b/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config @@ -3,6 +3,6 @@ - + diff --git a/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj b/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj index d464ff4ad..a67e85d82 100644 --- a/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj +++ b/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj @@ -43,7 +43,7 @@ True - ..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll + ..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll True diff --git a/src/net40/Default/WampSharp.NewtonsoftMsgpack/packages.config b/src/net40/Default/WampSharp.NewtonsoftMsgpack/packages.config index bdde083e8..4fb55ef4a 100644 --- a/src/net40/Default/WampSharp.NewtonsoftMsgpack/packages.config +++ b/src/net40/Default/WampSharp.NewtonsoftMsgpack/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file 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 2de8ca82d..d5d552d54 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 @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll True diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/packages.config index cffae7011..7e5eb08a2 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/packages.config +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/packages.config @@ -4,7 +4,7 @@ - + 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 90b7b5857..c8f775709 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 @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll True diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/packages.config index cffae7011..7e5eb08a2 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/packages.config +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj b/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj index c55122bbd..bde43c914 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj @@ -51,7 +51,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll True diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config index cffae7011..7e5eb08a2 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config @@ -4,7 +4,7 @@ - + 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 d9a95872b..fdad404e6 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 @@ -47,7 +47,7 @@ True - ..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll + ..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll True diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config index 08ed6d0d0..2ea8795fa 100644 --- a/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config +++ b/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config @@ -3,7 +3,7 @@ - +