diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index 9e1bfab6c..aa3daa5ce 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -63,8 +63,9 @@
False
..\packages\FluentValidation.4.0.0.0\lib\Net40\FluentValidation.dll
-
- ..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll
+
+ False
+ ..\packages\Microsoft.AspNet.SignalR.Core.1.1.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll
False
diff --git a/NzbDrone.Api/SignalR/Serializer.cs b/NzbDrone.Api/SignalR/Serializer.cs
index 983248bcc..b0ffb9847 100644
--- a/NzbDrone.Api/SignalR/Serializer.cs
+++ b/NzbDrone.Api/SignalR/Serializer.cs
@@ -21,17 +21,11 @@ namespace NzbDrone.Api.SignalR
{
_signalRSerializer.Serialize(value, writer);
}
-
}
- public object Parse(string json, Type targetType)
+ public object Parse(TextReader reader, Type targetType)
{
- if (targetType.FullName.StartsWith("NzbDrone"))
- {
- return Json.Deserialize(json, targetType);
- }
-
- return _signalRSerializer.Parse(json, targetType);
+ return Json.Deserialize(reader.ReadToEnd(), targetType);
}
}
}
\ No newline at end of file
diff --git a/NzbDrone.Api/packages.config b/NzbDrone.Api/packages.config
index 33724ffc8..8e94690ad 100644
--- a/NzbDrone.Api/packages.config
+++ b/NzbDrone.Api/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index 353b6c2f0..f80056a65 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -93,13 +93,13 @@
..\Libraries\Interop.NetFwTypeLib.dll
True
-
+
False
- ..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll
+ ..\packages\Microsoft.AspNet.SignalR.Core.1.1.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll
-
+
False
- ..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Owin.dll
+ ..\packages\Microsoft.AspNet.SignalR.Owin.1.1.1\lib\net40\Microsoft.AspNet.SignalR.Owin.dll
diff --git a/NzbDrone/app.config b/NzbDrone/app.config
index ec44b8e8b..0b9f1f971 100644
--- a/NzbDrone/app.config
+++ b/NzbDrone/app.config
@@ -19,6 +19,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/NzbDrone/packages.config b/NzbDrone/packages.config
index 9b4b4b0a7..20af5134b 100644
--- a/NzbDrone/packages.config
+++ b/NzbDrone/packages.config
@@ -1,8 +1,8 @@
-
-
+
+