Merge branch 'release'

SignalR · Sep 15, 2014 · 5dd9f39 · 5dd9f39
2 parents 3f63af8 + 6ce6314
commit 5dd9f39
Show file tree

Hide file tree

Showing 67 changed files with 340 additions and 210 deletions.
diff --git a/build-ci.cmd b/build-ci.cmd
@@ -16,4 +16,4 @@ set perfRun=%4
 if /i not "%perfRun%" == "true" (
    set perfRun=false
 )
-%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Build\Build.proj /t:%target% /p:Configuration="%config%";BUILD_NUMBER=%version%;PRERELEASE=true /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false /p:PerfRun=%perfRun%
+"%ProgramFiles(x86)%"\MSBuild\12.0\Bin\msbuild Build\Build.proj /t:%target% /p:Configuration="%config%";BUILD_NUMBER=%version%;PRERELEASE=true /v:M /fl /flp:LogFile=msbuild.log;Verbosity=Normal /nr:false /p:PerfRun=%perfRun%
diff --git a/build/Microsoft.AspNet.SignalR.versions.targets b/build/Microsoft.AspNet.SignalR.versions.targets
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <MajorVersion>2</MajorVersion>
         <MinorVersion>1</MinorVersion>
-        <PatchVersion>1</PatchVersion>
+        <PatchVersion>2</PatchVersion>
 
         <!-- Change this to set the build quality of the project. Use values like "alpha", "beta", "rc1", "rtm", etc. -->
         <!-- These values are used in SemVer, so make sure to always increase these alphabetically. -->

diff --git a/nuspecs/Microsoft.AspNet.SignalR.Client.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Client.nuspec
@@ -16,17 +16,17 @@
     <releaseNotes>https://github.com/SignalR/SignalR/releases</releaseNotes>
     <dependencies>
       <group targetFramework="net40">
-        <dependency id="Newtonsoft.Json" version="5.0.0" />
+        <dependency id="Newtonsoft.Json" version="6.0.4" />
       </group>
       <group targetFramework="net45">
-        <dependency id="Newtonsoft.Json" version="5.0.0" />
+        <dependency id="Newtonsoft.Json" version="6.0.4" />
       </group>
       <group targetFramework="portable-net45+sl5+netcore45+wp8">
-        <dependency id="Newtonsoft.Json" version="5.0.0" />
+        <dependency id="Newtonsoft.Json" version="6.0.4" />
         <dependency id="Microsoft.Net.Http" version="2.1.10" />
       </group>
       <group targetFramework="portable-wp81+wpa81">
-        <dependency id="Newtonsoft.Json" version="6.0.2" />
+        <dependency id="Newtonsoft.Json" version="6.0.4" />
         <dependency id="Microsoft.Net.Http" version="2.2.19" />
       </group>
     </dependencies>

diff --git a/nuspecs/Microsoft.AspNet.SignalR.Core.nuspec b/nuspecs/Microsoft.AspNet.SignalR.Core.nuspec
@@ -15,7 +15,7 @@
     <tags>Microsoft AspNet SignalR AspNetSignalR Core</tags>
     <releaseNotes>https://github.com/SignalR/SignalR/releases</releaseNotes>
     <dependencies>
-      <dependency id="Newtonsoft.Json" version="5.0.0" />
+      <dependency id="Newtonsoft.Json" version="6.0.4" />
       <dependency id="Owin" version="1.0" />
       <dependency id="Microsoft.Owin" version="__KATANA_PACKAGE_VERSION__" />
       <dependency id="Microsoft.Owin.Security" version="__KATANA_PACKAGE_VERSION__" />

diff --git a/samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj b/samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj
@@ -58,9 +58,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.Owin.Hosting.2.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/samples/Microsoft.AspNet.SelfHost.Samples/packages.config b/samples/Microsoft.AspNet.SelfHost.Samples/packages.config
@@ -7,6 +7,6 @@
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Hosting" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.SelfHost" version="2.0.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>
diff --git a/...alR.Client.Silverlight.Samples/Microsoft.AspNet.SignalR.Client.Silverlight.Samples.csproj b/...alR.Client.Silverlight.Samples/Microsoft.AspNet.SignalR.Client.Silverlight.Samples.csproj
@@ -75,9 +75,8 @@
       <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.16\lib\sl4\Microsoft.Threading.Tasks.Extensions.Silverlight.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http">
       <SpecificVersion>False</SpecificVersion>

diff --git a/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Samples/packages.config b/samples/Microsoft.AspNet.SignalR.Client.Silverlight.Samples/packages.config
@@ -4,5 +4,5 @@
   <package id="Microsoft.Bcl.Async" version="1.0.16" targetFramework="sl50" />
   <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="sl50" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="sl50" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="sl50" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="sl50" />
 </packages>
diff --git a/...soft.AspNet.SignalR.Client.WP8.Samples/Microsoft.AspNet.SignalR.Client.WP8.Samples.csproj b/...soft.AspNet.SignalR.Client.WP8.Samples/Microsoft.AspNet.SignalR.Client.WP8.Samples.csproj
@@ -162,9 +162,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\portable-net45+wp80+win8\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http">
       <HintPath>..\..\packages\Microsoft.Net.Http.2.1.10\lib\sl4-windowsphone71\System.Net.Http.dll</HintPath>

diff --git a/samples/Microsoft.AspNet.SignalR.Client.WP8.Samples/app.config b/samples/Microsoft.AspNet.SignalR.Client.WP8.Samples/app.config
@@ -4,11 +4,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.5.19.0" newVersion="2.5.19.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/samples/Microsoft.AspNet.SignalR.Client.WP8.Samples/packages.config b/samples/Microsoft.AspNet.SignalR.Client.WP8.Samples/packages.config
@@ -3,5 +3,5 @@
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="wp80" />
   <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="wp80" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="wp80" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="wp80" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="wp80" />
 </packages>
diff --git a/...dowsStoreCSharp.Samples/Microsoft.AspNet.SignalR.Client.WindowsStoreCSharp.Samples.csproj b/...dowsStoreCSharp.Samples/Microsoft.AspNet.SignalR.Client.WindowsStoreCSharp.Samples.csproj
@@ -150,9 +150,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\netcore45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\netcore45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Extensions">
       <HintPath>..\..\packages\Microsoft.Net.Http.2.1.10\lib\win8\System.Net.Http.Extensions.dll</HintPath>

diff --git a/samples/Microsoft.AspNet.SignalR.Client.WindowsStoreCSharp.Samples/packages.config b/samples/Microsoft.AspNet.SignalR.Client.WindowsStoreCSharp.Samples/packages.config
@@ -3,5 +3,5 @@
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="win" />
   <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="win" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="win" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="win" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="win" />
 </packages>
diff --git a/.../Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj b/.../Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj
@@ -59,9 +59,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.Owin.Host.SystemWeb.2.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/samples/Microsoft.AspNet.SignalR.LoadTestHarness/packages.config b/samples/Microsoft.AspNet.SignalR.LoadTestHarness/packages.config
@@ -6,6 +6,6 @@
   <package id="knockoutjs" version="2.1.0" targetFramework="net40" />
   <package id="Microsoft.Owin" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.SystemWeb" version="2.0.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
 </packages>
diff --git a/samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj b/samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj
@@ -68,9 +68,9 @@
     <Reference Include="Microsoft.Owin.Security.Cookies">
       <HintPath>..\..\packages\Microsoft.Owin.Security.Cookies.2.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>

diff --git a/samples/Microsoft.AspNet.SignalR.Samples/Scripts/hubs.js b/samples/Microsoft.AspNet.SignalR.Samples/Scripts/hubs.js
@@ -1,5 +1,5 @@
 /*!
- * ASP.NET SignalR JavaScript Library v2.1.1-pre
+ * ASP.NET SignalR JavaScript Library v2.1.2-pre
  * http://signalr.net/
  *
  * Copyright Microsoft Open Technologies, Inc. All rights reserved.

diff --git a/samples/Microsoft.AspNet.SignalR.Samples/packages.config b/samples/Microsoft.AspNet.SignalR.Samples/packages.config
@@ -13,7 +13,7 @@
   <package id="Microsoft.Owin.Host.SystemWeb" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security" version="2.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security.Cookies" version="2.0.1" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="Twitter.Bootstrap" version="2.1.1" targetFramework="net40" />
 </packages>
diff --git a/src/Common/CommonVersionInfo.cs b/src/Common/CommonVersionInfo.cs
@@ -2,6 +2,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.1.1")]
+[assembly: AssemblyVersion("2.1.2")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.1.1-pre")]
+[assembly: AssemblyInformationalVersion("2.1.2-pre")]
diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js
@@ -1,6 +1,6 @@
 /*global window:false */
 /*!
- * ASP.NET SignalR JavaScript Library v2.1.1-pre
+ * ASP.NET SignalR JavaScript Library v2.1.2-pre
  * http://signalr.net/
  *
  * Copyright Microsoft Open Technologies, Inc. All rights reserved.
@@ -707,7 +707,9 @@
                     connection.id = res.ConnectionId;
                     connection.token = res.ConnectionToken;
                     connection.webSocketServerUrl = res.WebSocketServerUrl;
-                    connection._.longPollDelay = res.LongPollDelay * 1000; // in ms
+
+                    // The long poll timeout is the ConnectionTimeout plus 10 seconds
+                    connection._.pollTimeout = res.ConnectionTimeout * 1000 + 10000; // in ms
 
                     // Once the server has labeled the PersistentConnection as Disconnected, we should stop attempting to reconnect
                     // after res.DisconnectTimeout seconds.
@@ -962,7 +964,6 @@
             delete connection._.pingIntervalId;
             delete connection._.lastMessageAt;
             delete connection._.lastActiveAt;
-            delete connection._.longPollDelay;
 
             // Clear out our message buffer
             connection._.connectingMessageBuffer.clear();

diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.hubs.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.hubs.js
@@ -84,6 +84,8 @@
             };
         },
 
+        constructor: hubProxy,
+
         hasSubscriptions: function () {
             return hasMembers(this._.callbackMap);
         },

diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.longPolling.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.longPolling.js
@@ -10,27 +10,13 @@
         events = $.signalR.events,
         changeState = $.signalR.changeState,
         isDisconnecting = $.signalR.isDisconnecting,
-        transportLogic = signalR.transports._logic,
-        browserSupportsXHRProgress = (function () {
-                try {
-                    return "onprogress" in new window.XMLHttpRequest();
-                } catch (e) {
-                    // No XHR means no XHR progress event
-                    return false;
-                }
-            })();
+        transportLogic = signalR.transports._logic;
 
     signalR.transports.longPolling = {
         name: "longPolling",
 
-        supportsKeepAlive: function (connection) {
-            return browserSupportsXHRProgress &&
-                   connection.ajaxDataType !== "jsonp" &&
-                   // Don't check for keep alives if there is a delay configured between poll requests.
-                   // Don't check for keep alives if the server didn't send back the "LongPollDelay" as
-                   // part of the response to /negotiate. That indicates the server is running an older
-                   // version of SignalR that doesn't send long polling keep alives.
-                   connection._.longPollDelay === 0;
+        supportsKeepAlive: function () {
+            return false;
         },
 
         reconnectDelay: 3000,
@@ -105,6 +91,7 @@
                             }
                         },
                         url: url,
+                        timeout: connection._.pollTimeout,
                         success: function (result) {
                             var minData,
                                 delay = 0,

diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.version.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.version.js
@@ -3,5 +3,5 @@
 /*global window:false */
 /// <reference path="jquery.signalR.core.js" />
 (function ($, undefined) {
-    $.signalR.version = "2.1.1-pre";
+    $.signalR.version = "2.1.2-pre";
 }(window.jQuery));
diff --git a/src/Microsoft.AspNet.SignalR.Client.Portable/Microsoft.AspNet.SignalR.Client.Portable.csproj b/src/Microsoft.AspNet.SignalR.Client.Portable/Microsoft.AspNet.SignalR.Client.Portable.csproj
@@ -240,7 +240,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http">
       <HintPath>..\..\packages\Microsoft.Net.Http.2.1.10\lib\portable-net40+sl4+win8+wp71\System.Net.Http.dll</HintPath>

diff --git a/src/Microsoft.AspNet.SignalR.Client.Portable/packages.config b/src/Microsoft.AspNet.SignalR.Client.Portable/packages.config
@@ -3,5 +3,5 @@
   <package id="Microsoft.Bcl" version="1.0.19" targetFramework="portable-win+net45+sl50+wp80" />
   <package id="Microsoft.Bcl.Build" version="1.0.5" targetFramework="portable-win+net45+sl50+wp80" />
   <package id="Microsoft.Net.Http" version="2.1.10" targetFramework="portable-win+net45+sl50+wp80" />
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="portable-win+net45+sl50+wp80" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable-net45+sl50+win+wp80" />
 </packages>
diff --git a/src/Microsoft.AspNet.SignalR.Client.WinRT/Microsoft.AspNet.SignalR.Client.WinRT.csproj b/src/Microsoft.AspNet.SignalR.Client.WinRT/Microsoft.AspNet.SignalR.Client.WinRT.csproj
@@ -308,9 +308,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\netcore45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\netcore45\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Microsoft.AspNet.SignalR.Client.WinRT/packages.config b/src/Microsoft.AspNet.SignalR.Client.WinRT/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="5.0.6" targetFramework="win" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="win" />
 </packages>
diff --git a/src/Microsoft.AspNet.SignalR.Client/Connection.cs b/src/Microsoft.AspNet.SignalR.Client/Connection.cs
@@ -909,7 +909,7 @@ private static string CreateUserAgentString(string client)
             if (_assemblyVersion == null)
             {
 #if NETFX_CORE
-                _assemblyVersion = new Version("2.1.1");
+                _assemblyVersion = new Version("2.1.2");
 #else
                 _assemblyVersion = new AssemblyName(typeof(Connection).Assembly.FullName).Version;
 #endif

diff --git a/src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj b/src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj
@@ -34,9 +34,9 @@
     <DocumentationFile>bin\Release\Microsoft.AspNet.SignalR.Client.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.5.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/Microsoft.AspNet.SignalR.Client/NegotiationResponse.cs b/src/Microsoft.AspNet.SignalR.Client/NegotiationResponse.cs
@@ -15,6 +15,5 @@ public class NegotiationResponse
         public bool TryWebSockets { get; set; }
         public double? KeepAliveTimeout { get; set; }
         public double TransportConnectTimeout { get; set; }
-        public double? LongPollDelay { get; set; }
     }
 }
diff --git a/src/Microsoft.AspNet.SignalR.Client/Transports/HttpBasedTransport.cs b/src/Microsoft.AspNet.SignalR.Client/Transports/HttpBasedTransport.cs
@@ -24,8 +24,6 @@ public abstract class HttpBasedTransport : IClientTransport
         private readonly IHttpClient _httpClient;
         private readonly TransportAbortHandler _abortHandler;
 
-        private NegotiationResponse _negotiationResponse;
-
         protected HttpBasedTransport(IHttpClient httpClient, string transport)
         {
             _httpClient = httpClient;
@@ -56,18 +54,9 @@ protected TransportAbortHandler AbortHandler
             get { return _abortHandler; }
         }
 
-        protected NegotiationResponse NegotiationResponse
-        {
-            get { return _negotiationResponse; }
-        }
-
         public Task<NegotiationResponse> Negotiate(IConnection connection, string connectionData)
         {
-            Task<NegotiationResponse> response = _httpClient.GetNegotiationResponse(connection, connectionData);
-
-            response.Then(negotiationResponse => _negotiationResponse = negotiationResponse);
-
-            return response;
+            return _httpClient.GetNegotiationResponse(connection, connectionData);
         }
 
         public Task Start(IConnection connection, string connectionData, CancellationToken disconnectToken)

diff --git a/src/Microsoft.AspNet.SignalR.Client/Transports/LongPollingTransport.cs b/src/Microsoft.AspNet.SignalR.Client/Transports/LongPollingTransport.cs
@@ -43,11 +43,7 @@ public override bool SupportsKeepAlive
         {
             get
             {
-                // Don't check for keep alives if the server didn't send back the "LongPollDelay" as
-                // part of the response to /negotiate. That indicates the server is running an older
-                // version of SignalR that doesn't send long polling keep alives.
-                return NegotiationResponse != null &&
-                       NegotiationResponse.LongPollDelay.HasValue;
+                return false;
             }
         }