Merge pull request #112 from Code-Sharp/develop

darkl · darkl · commit 9966e123e967 · 2015-12-26T21:53:30.000+02:00
diff --git a/NuGet/WampSharp.NewtonsoftMsgpack.nuspec b/NuGet/WampSharp.NewtonsoftMsgpack.nuspec
@@ -7,7 +7,7 @@
     <dependencies>
       <dependency id="WampSharp" version="[$version$]" />
       <dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
-      <dependency id="Newtonsoft.Msgpack" version="[0.1.6]" />
+      <dependency id="Newtonsoft.Msgpack" version="[0.1.8]" />
     </dependencies>
     <id>WampSharp.NewtonsoftMsgpack</id>
     <title>WampSharp Newtonsoft.Msgpack binding</title>
diff --git a/src/mono/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj b/src/mono/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj
@@ -43,7 +43,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/mono/Default/WampSharp.NewtonsoftMsgpack/packages.config b/src/mono/Default/WampSharp.NewtonsoftMsgpack/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
 </packages>
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config
@@ -4,6 +4,6 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.14" targetFramework="net45" />
 </packages>
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config
@@ -4,6 +4,6 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.14" targetFramework="net45" />
 </packages>
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
@@ -54,7 +54,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config
@@ -5,6 +5,6 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.14" targetFramework="net45" />
 </packages>
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config
@@ -4,6 +4,6 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.14" targetFramework="net45" />
 </packages>
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
@@ -47,7 +47,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config b/src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config
@@ -3,6 +3,6 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="WebSocket4Net" version="0.14" targetFramework="net45" />
 </packages>
diff --git a/src/mono/WampSharp/WampSharp.csproj b/src/mono/WampSharp/WampSharp.csproj
@@ -209,6 +209,9 @@
     <Compile Include="..\..\net45\WampSharp\Core\Message\MessageType\WampMessageType.cs">
       <Link>Core\Message\MessageType\WampMessageType.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\Core\Message\MessageType\WampMessageTypeComparer.cs">
+      <Link>Core\Message\MessageType\WampMessageTypeComparer.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\Core\Message\WampMessage.cs">
       <Link>Core\Message\WampMessage.cs</Link>
     </Compile>
diff --git a/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj b/src/net40/Default/WampSharp.NewtonsoftMsgpack/WampSharp.NewtonsoftMsgpack.csproj
@@ -43,7 +43,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net40/Default/WampSharp.NewtonsoftMsgpack/packages.config b/src/net40/Default/WampSharp.NewtonsoftMsgpack/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net40" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net40" />
 </packages>
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Callee/packages.config
@@ -4,7 +4,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net40" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net40" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net40" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net40" />
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Caller/packages.config
@@ -4,7 +4,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net40" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net40" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net40" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net40" />
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config
@@ -4,7 +4,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net40" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net40" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net40" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net40" />
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
@@ -47,7 +47,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net40\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config b/src/net40/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config
@@ -3,7 +3,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net40" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net40" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net40" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net40" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net40" />
diff --git a/src/net40/WampSharp/WampSharp.csproj b/src/net40/WampSharp/WampSharp.csproj
@@ -213,6 +213,9 @@
     <Compile Include="..\..\net45\WampSharp\Core\Message\MessageType\WampMessageType.cs">
       <Link>Core\Message\MessageType\WampMessageType.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\Core\Message\MessageType\WampMessageTypeComparer.cs">
+      <Link>Core\Message\MessageType\WampMessageTypeComparer.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\Core\Message\WampMessage.cs">
       <Link>Core\Message\WampMessage.cs</Link>
     </Compile>
diff --git 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<object> 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<JToken> Parse(Stream stream)
 
         public void Format(WampMessage<object> 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
@@ -43,7 +43,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net45/Default/WampSharp.NewtonsoftMsgpack/packages.config b/src/net45/Default/WampSharp.NewtonsoftMsgpack/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
 </packages>
diff --git 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
@@ -1,6 +1,6 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
+﻿<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
 </configuration>
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Callee/packages.config
@@ -4,7 +4,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Caller/packages.config
@@ -4,7 +4,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
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
@@ -54,7 +54,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config
@@ -5,7 +5,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
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
@@ -51,7 +51,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config
@@ -4,7 +4,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
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
@@ -47,7 +47,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Msgpack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.6\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Msgpack.0.1.8\lib\net45\Newtonsoft.Msgpack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config b/src/net45/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config
@@ -3,7 +3,7 @@
   <package id="Fleck" version="0.13.0.57" targetFramework="net45" />
   <package id="MsgPack.Cli" version="0.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
-  <package id="Newtonsoft.Msgpack" version="0.1.6" targetFramework="net45" />
+  <package id="Newtonsoft.Msgpack" version="0.1.8" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
diff --git a/src/net45/WampSharp/Core/Dispatch/Handler/WampRequestMapper.cs b/src/net45/WampSharp/Core/Dispatch/Handler/WampRequestMapper.cs
diff --git a/src/net45/WampSharp/Core/Message/MessageType/WampMessageTypeComparer.cs b/src/net45/WampSharp/Core/Message/MessageType/WampMessageTypeComparer.cs
diff --git a/src/net45/WampSharp/WampSharp.csproj b/src/net45/WampSharp/WampSharp.csproj
diff --git a/src/pcl/WampSharp/WampSharp.csproj b/src/pcl/WampSharp/WampSharp.csproj
