From 3f3cc69da79daa23591688f94cb5b380e9c1ff44 Mon Sep 17 00:00:00 2001 From: kayone Date: Sun, 24 Aug 2014 18:33:06 -0700 Subject: [PATCH] updated json.net --- .../Microsoft.AspNet.SignalR.Core.csproj | 8 +++++--- src/Microsoft.AspNet.SignalR.Core/app.config | 11 +++++++++++ src/Microsoft.AspNet.SignalR.Core/packages.config | 2 +- .../Microsoft.AspNet.SignalR.Owin.csproj | 1 + src/Microsoft.AspNet.SignalR.Owin/app.config | 11 +++++++++++ src/NzbDrone.Api.Test/app.config | 2 ++ src/NzbDrone.Api/NzbDrone.Api.csproj | 8 +++++--- src/NzbDrone.Api/app.config | 11 +++++++++++ src/NzbDrone.Api/packages.config | 2 +- src/NzbDrone.App.Test/app.config | 2 ++ src/NzbDrone.Common.Test/app.config | 2 ++ src/NzbDrone.Common/NzbDrone.Common.csproj | 8 +++++--- src/NzbDrone.Common/app.config | 11 +++++++++++ src/NzbDrone.Common/packages.config | 2 +- src/NzbDrone.Console/NzbDrone.Console.csproj | 7 ++++--- src/NzbDrone.Console/packages.config | 2 +- src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 7 ++++--- src/NzbDrone.Core.Test/packages.config | 2 +- src/NzbDrone.Core/App.config | 13 +++++++++++-- src/NzbDrone.Core/NzbDrone.Core.csproj | 7 ++++--- src/NzbDrone.Core/packages.config | 2 +- src/NzbDrone.Host/NzbDrone.Host.csproj | 7 ++++--- src/NzbDrone.Host/app.config | 2 +- src/NzbDrone.Host/packages.config | 2 +- .../NzbDrone.Integration.Test.csproj | 7 ++++--- src/NzbDrone.Integration.Test/packages.config | 2 +- .../NzbDrone.Libraries.Test.csproj | 8 +++++--- src/NzbDrone.Libraries.Test/app.config | 11 +++++++++++ src/NzbDrone.Libraries.Test/packages.config | 2 +- src/NzbDrone.Mono.Test/app.config | 4 ++++ src/NzbDrone.SignalR/NzbDrone.SignalR.csproj | 14 ++++++++------ src/NzbDrone.SignalR/app.config | 11 +++++++++++ src/NzbDrone.SignalR/packages.config | 2 +- src/NzbDrone.Test.Common/App.config | 2 +- .../NzbDrone.Test.Common.csproj | 7 ++++--- src/NzbDrone.Test.Common/packages.config | 2 +- src/NzbDrone.Update.Test/app.config | 2 ++ src/NzbDrone.Update/NzbDrone.Update.csproj | 7 ++++--- src/NzbDrone.Update/app.config | 4 ++++ src/NzbDrone.Update/packages.config | 2 +- src/NzbDrone.Windows.Test/app.config | 4 ++++ src/NzbDrone/NzbDrone.csproj | 7 ++++--- src/NzbDrone/packages.config | 2 +- 43 files changed, 173 insertions(+), 59 deletions(-) create mode 100644 src/Microsoft.AspNet.SignalR.Core/app.config create mode 100644 src/Microsoft.AspNet.SignalR.Owin/app.config create mode 100644 src/NzbDrone.Api.Test/app.config create mode 100644 src/NzbDrone.Api/app.config create mode 100644 src/NzbDrone.App.Test/app.config create mode 100644 src/NzbDrone.Common.Test/app.config create mode 100644 src/NzbDrone.Common/app.config create mode 100644 src/NzbDrone.Libraries.Test/app.config create mode 100644 src/NzbDrone.SignalR/app.config create mode 100644 src/NzbDrone.Update.Test/app.config diff --git a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj index f9d7a747e..b8b4356f4 100644 --- a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj +++ b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj @@ -46,13 +46,14 @@ ..\packages\Microsoft.AspNet.SignalR.Client.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Client.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - @@ -269,6 +270,7 @@ + diff --git a/src/Microsoft.AspNet.SignalR.Core/app.config b/src/Microsoft.AspNet.SignalR.Core/app.config new file mode 100644 index 000000000..44298137a --- /dev/null +++ b/src/Microsoft.AspNet.SignalR.Core/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNet.SignalR.Core/packages.config b/src/Microsoft.AspNet.SignalR.Core/packages.config index 64c6dfc71..7e33d32b4 100644 --- a/src/Microsoft.AspNet.SignalR.Core/packages.config +++ b/src/Microsoft.AspNet.SignalR.Core/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj b/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj index 0f98f2e7e..1712d4eb5 100644 --- a/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj +++ b/src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj @@ -90,6 +90,7 @@ + diff --git a/src/Microsoft.AspNet.SignalR.Owin/app.config b/src/Microsoft.AspNet.SignalR.Owin/app.config new file mode 100644 index 000000000..44298137a --- /dev/null +++ b/src/Microsoft.AspNet.SignalR.Owin/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Api.Test/app.config b/src/NzbDrone.Api.Test/app.config new file mode 100644 index 000000000..a6a2b7fa9 --- /dev/null +++ b/src/NzbDrone.Api.Test/app.config @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index 4430f20cc..19594a4e9 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -52,6 +52,10 @@ False ..\packages\Nancy.Authentication.Basic.0.23.2\lib\net40\Nancy.Authentication.Basic.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + @@ -63,9 +67,6 @@ False ..\packages\Microsoft.AspNet.SignalR.Core.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Core.dll - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.2.1.0\lib\net40\NLog.dll @@ -215,6 +216,7 @@ + Designer diff --git a/src/NzbDrone.Api/app.config b/src/NzbDrone.Api/app.config new file mode 100644 index 000000000..44298137a --- /dev/null +++ b/src/NzbDrone.Api/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config index 77f8d243e..b09a225e0 100644 --- a/src/NzbDrone.Api/packages.config +++ b/src/NzbDrone.Api/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.App.Test/app.config b/src/NzbDrone.App.Test/app.config new file mode 100644 index 000000000..a6a2b7fa9 --- /dev/null +++ b/src/NzbDrone.App.Test/app.config @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/app.config b/src/NzbDrone.Common.Test/app.config new file mode 100644 index 000000000..a6a2b7fa9 --- /dev/null +++ b/src/NzbDrone.Common.Test/app.config @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index e0b019d32..bd3053661 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -39,6 +39,10 @@ 4 + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + @@ -51,9 +55,6 @@ ..\packages\loggly-csharp.2.3\lib\net35\Loggly.dll - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.2.1.0\lib\net40\NLog.dll @@ -153,6 +154,7 @@ + Designer diff --git a/src/NzbDrone.Common/app.config b/src/NzbDrone.Common/app.config new file mode 100644 index 000000000..44298137a --- /dev/null +++ b/src/NzbDrone.Common/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index 67af54535..c2a05c7b8 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index c31cdef62..69eb5fd85 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -71,11 +71,12 @@ False ..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.2.1.0\lib\net40\NLog.dll diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index 899bdedd0..d7cc300cc 100644 --- a/src/NzbDrone.Console/packages.config +++ b/src/NzbDrone.Console/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index d9ac9c615..f3f4706d0 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -51,6 +51,10 @@ False ..\packages\FluentValidation.5.4.0.0\lib\Net40\FluentValidation.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + @@ -83,9 +87,6 @@ ..\packages\NCrunch.Framework.1.46.0.9\lib\net35\NCrunch.Framework.dll - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.2.1.0\lib\net40\NLog.dll diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index e9bbeff46..5c5094876 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/NzbDrone.Core/App.config b/src/NzbDrone.Core/App.config index e36560333..8c5dac9d5 100644 --- a/src/NzbDrone.Core/App.config +++ b/src/NzbDrone.Core/App.config @@ -1,3 +1,12 @@ - + - + + + + + + + + + + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 9a07f410f..b47cdfa86 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -64,6 +64,10 @@ False ..\Libraries\Growl.CoreLibrary.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + @@ -82,9 +86,6 @@ ..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.2.1.0\lib\net40\NLog.dll diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index 58c6450ff..6b059fdb6 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index 6a1a03752..afda024ac 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -77,6 +77,10 @@ False ..\packages\Nancy.Owin.0.23.2\lib\net40\Nancy.Owin.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + @@ -84,9 +88,6 @@ ..\Libraries\Interop.NetFwTypeLib.dll True - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.2.1.0\lib\net40\NLog.dll diff --git a/src/NzbDrone.Host/app.config b/src/NzbDrone.Host/app.config index 0c8db66a2..ed1c58ef9 100644 --- a/src/NzbDrone.Host/app.config +++ b/src/NzbDrone.Host/app.config @@ -14,7 +14,7 @@ - + diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index 788ad3919..18d2614c9 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index 6df116dd3..5b3fd672b 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -68,6 +68,10 @@ False ..\packages\Nancy.Owin.0.23.2\lib\net40\Nancy.Owin.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + @@ -81,9 +85,6 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.2.1.0\lib\net40\NLog.dll diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index 285b61874..ff637bf8b 100644 --- a/src/NzbDrone.Integration.Test/packages.config +++ b/src/NzbDrone.Integration.Test/packages.config @@ -9,7 +9,7 @@ - + diff --git a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj index ee1b6fc20..f6a3d7907 100644 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj @@ -45,6 +45,10 @@ ..\packages\FluentAssertions.3.1.229\lib\net40\FluentAssertions.Core.dll + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + @@ -52,9 +56,6 @@ - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - ..\packages\NUnit.2.6.2\lib\nunit.framework.dll @@ -64,6 +65,7 @@ + diff --git a/src/NzbDrone.Libraries.Test/app.config b/src/NzbDrone.Libraries.Test/app.config new file mode 100644 index 000000000..44298137a --- /dev/null +++ b/src/NzbDrone.Libraries.Test/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Libraries.Test/packages.config b/src/NzbDrone.Libraries.Test/packages.config index ca695075a..afca7670b 100644 --- a/src/NzbDrone.Libraries.Test/packages.config +++ b/src/NzbDrone.Libraries.Test/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.Mono.Test/app.config b/src/NzbDrone.Mono.Test/app.config index c2022383d..62f94f496 100644 --- a/src/NzbDrone.Mono.Test/app.config +++ b/src/NzbDrone.Mono.Test/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj index 941c41067..ad9160e06 100644 --- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj +++ b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj @@ -38,12 +38,13 @@ 4 + + False + ..\packages\Newtonsoft.Json.6.0.4\lib\net40\Newtonsoft.Json.dll + - - ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll - @@ -57,9 +58,6 @@ - - - {1B9A82C4-BCA1-4834-A33E-226F17BE070B} @@ -74,6 +72,10 @@ NzbDrone.Core + + + +