Progress

sethwebster · Feb 28, 2012 · 4bef294 · 4bef294
1 parent 9b0869e
commit 4bef294
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
diff --git a/Jabbot.AspNetBotHost/Jabbot.AspNetBotHost.csproj b/Jabbot.AspNetBotHost/Jabbot.AspNetBotHost.csproj
@@ -55,11 +55,15 @@
     <Reference Include="Nancy.ViewEngines.Razor">
       <HintPath>..\packages\Nancy.Viewengines.Razor.0.9.0\lib\net40\Nancy.ViewEngines.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.0.5.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.4.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SignalR">
-      <HintPath>..\packages\SignalR.Server.0.3.5\lib\net40\SignalR.dll</HintPath>
+      <HintPath>..\packages\SignalR.Server.0.4.0.0\lib\net40\SignalR.dll</HintPath>
+    </Reference>
+    <Reference Include="SignalR.Hosting.AspNet">
+      <HintPath>..\packages\SignalR.Hosting.AspNet.0.4.0.0\lib\net40\SignalR.Hosting.AspNet.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />

diff --git a/Jabbot.AspNetBotHost/Web.config b/Jabbot.AspNetBotHost/Web.config
@@ -55,7 +55,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.8.0" newVersion="4.0.8.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Jabbot.AspNetBotHost/packages.config b/Jabbot.AspNetBotHost/packages.config
@@ -8,8 +8,12 @@
   <package id="Nancy" version="0.9.0" />
   <package id="Nancy.Hosting.Aspnet" version="0.9.0" />
   <package id="Nancy.Viewengines.Razor" version="0.9.0" />
-  <package id="Newtonsoft.Json" version="4.0.5" />
+  <package id="Newtonsoft.Json" version="4.0.8" />
   <package id="SignalR" version="0.3.5" />
+  <package id="SignalR" version="0.4.0" />
+  <package id="SignalR.Hosting.AspNet" version="0.4.0.0" />
   <package id="SignalR.Js" version="0.3.5" />
+  <package id="SignalR.Js" version="0.4.0.1" />
   <package id="SignalR.Server" version="0.3.5" />
+  <package id="SignalR.Server" version="0.4.0.0" />
 </packages>
diff --git a/Jabbot.ConsoleBotHost/app.config b/Jabbot.ConsoleBotHost/app.config
@@ -14,7 +14,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.8.0" newVersion="4.0.8.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Jabbot/Bot.cs b/Jabbot/Bot.cs
@@ -10,6 +10,7 @@
 using Jabbot.Models;
 using Jabbot.Sprockets.Core;
 using SignalR.Client.Hubs;
+using SignalR.Client.Transports;
 
 namespace Jabbot
 {
@@ -123,7 +124,8 @@ public void PowerUp()
                 _chat.On<IEnumerable<string>>("logOn", OnLogOn);
 
                 // Start the connection and wait
-                _connection.Start(SignalR.Client.Transports.Transport.LongPolling).Wait();
+
+                _connection.Start(new AutoTransport()).Wait();
 
                 // Join the chat
                 var success = _chat.Invoke<bool>("Join").Result;

diff --git a/Jabbot/Jabbot.csproj b/Jabbot/Jabbot.csproj
@@ -33,13 +33,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.0.5.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=4.0.8.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.4.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.4.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="SignalR.Client, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SignalR.Client, Version=0.4.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\assets\SignalR.Client.dll</HintPath>
+      <HintPath>..\packages\SignalR.Client.0.4.0.1\lib\net40\SignalR.Client.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

diff --git a/Jabbot/packages.config b/Jabbot/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="4.0.5" />
+  <package id="Newtonsoft.Json" version="4.0.8" />
+  <package id="SignalR.Client" version="0.4.0.1" />
 </packages>