From 14fcef8ec0a7075d1360559e76ff3393c794ac13 Mon Sep 17 00:00:00 2001 From: Qstick Date: Fri, 1 Jun 2018 22:56:15 -0400 Subject: [PATCH] New: Updated NewtonsoftJson to 11.0.2 (#387) --- build.sh | 4 ++-- src/Lidarr.Api.V1/Lidarr.Api.V1.csproj | 4 ++-- src/Lidarr.Api.V1/app.config | 2 +- src/Lidarr.Api.V1/packages.config | 2 +- src/Lidarr.Http/Lidarr.Http.csproj | 5 ++--- src/Lidarr.Http/app.config | 2 +- src/Lidarr.Http/packages.config | 2 +- src/NzbDrone.Automation.Test/app.config | 2 +- src/NzbDrone.Common/NzbDrone.Common.csproj | 4 ++-- src/NzbDrone.Common/app.config | 2 +- src/NzbDrone.Common/packages.config | 2 +- src/NzbDrone.Console/NzbDrone.Console.csproj | 4 ++-- src/NzbDrone.Console/packages.config | 2 +- src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 4 ++-- src/NzbDrone.Core.Test/packages.config | 2 +- src/NzbDrone.Core/App.config | 2 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 4 ++-- src/NzbDrone.Core/packages.config | 2 +- src/NzbDrone.Host/NzbDrone.Host.csproj | 4 ++-- src/NzbDrone.Host/app.config | 2 +- src/NzbDrone.Host/packages.config | 2 +- .../NzbDrone.Integration.Test.csproj | 4 ++-- src/NzbDrone.Integration.Test/packages.config | 2 +- src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj | 4 ++-- src/NzbDrone.Libraries.Test/app.config | 2 +- src/NzbDrone.Libraries.Test/packages.config | 2 +- src/NzbDrone.Mono.Test/app.config | 2 +- src/NzbDrone.Mono/app.config | 2 +- src/NzbDrone.SignalR/NzbDrone.SignalR.csproj | 4 ++-- src/NzbDrone.SignalR/app.config | 2 +- src/NzbDrone.SignalR/packages.config | 2 +- src/NzbDrone.Test.Common/App.config | 2 +- src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj | 4 ++-- src/NzbDrone.Test.Common/packages.config | 2 +- src/NzbDrone.Update/NzbDrone.Update.csproj | 4 ++-- src/NzbDrone.Update/app.config | 2 +- src/NzbDrone.Update/packages.config | 2 +- src/NzbDrone.Windows.Test/app.config | 2 +- src/NzbDrone.Windows/app.config | 2 +- src/NzbDrone/NzbDrone.csproj | 4 ++-- src/NzbDrone/packages.config | 2 +- 41 files changed, 55 insertions(+), 56 deletions(-) diff --git a/build.sh b/build.sh index a350b02ef3..843cc773bc 100755 --- a/build.sh +++ b/build.sh @@ -68,8 +68,8 @@ CleanFolder() AddJsonNet() { rm $outputFolder/Newtonsoft.Json.* - cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder - cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $updateFolder + cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net45/*.dll $outputFolder + cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net45/*.dll $updateFolder } BuildWithMSBuild() diff --git a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj index fe7cb6bf8c..f20eb8a8b2 100644 --- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj +++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj @@ -63,8 +63,8 @@ ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/Lidarr.Api.V1/app.config b/src/Lidarr.Api.V1/app.config index d4d6857aa1..cc9e61a275 100644 --- a/src/Lidarr.Api.V1/app.config +++ b/src/Lidarr.Api.V1/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/Lidarr.Api.V1/packages.config b/src/Lidarr.Api.V1/packages.config index 0c2d2d5b70..839ce8bf6c 100644 --- a/src/Lidarr.Api.V1/packages.config +++ b/src/Lidarr.Api.V1/packages.config @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/src/Lidarr.Http/Lidarr.Http.csproj b/src/Lidarr.Http/Lidarr.Http.csproj index 237f3bbfdb..7265e3ab8a 100644 --- a/src/Lidarr.Http/Lidarr.Http.csproj +++ b/src/Lidarr.Http/Lidarr.Http.csproj @@ -49,9 +49,8 @@ ..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll True - - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/Lidarr.Http/app.config b/src/Lidarr.Http/app.config index c6693bd889..90a00bd8ed 100644 --- a/src/Lidarr.Http/app.config +++ b/src/Lidarr.Http/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/Lidarr.Http/packages.config b/src/Lidarr.Http/packages.config index 83bd362b5b..6e563f6a64 100644 --- a/src/Lidarr.Http/packages.config +++ b/src/Lidarr.Http/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Automation.Test/app.config b/src/NzbDrone.Automation.Test/app.config index 077a6a0616..dcfbf2616b 100644 --- a/src/NzbDrone.Automation.Test/app.config +++ b/src/NzbDrone.Automation.Test/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index f0181d25ae..dd53eb5e1b 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -44,8 +44,8 @@ ..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Common/app.config b/src/NzbDrone.Common/app.config index 9566343db5..c63517866b 100644 --- a/src/NzbDrone.Common/app.config +++ b/src/NzbDrone.Common/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index fd821639a5..4f26eba169 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 7833f8a8ad..b708527c87 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -74,8 +74,8 @@ ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index 16514eb60f..2171764321 100644 --- a/src/NzbDrone.Console/packages.config +++ b/src/NzbDrone.Console/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 64349108cf..48ffca301b 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -75,8 +75,8 @@ ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index 992c8f03f5..11cdf5431d 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -9,7 +9,7 @@ - + diff --git a/src/NzbDrone.Core/App.config b/src/NzbDrone.Core/App.config index 3129d272c1..88c5aaabe5 100644 --- a/src/NzbDrone.Core/App.config +++ b/src/NzbDrone.Core/App.config @@ -5,7 +5,7 @@ - + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index e1f6dc4c7f..3232e66a6b 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -77,8 +77,8 @@ ..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index b0d29a1004..981643d108 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index 072ec694e5..5162f43b7e 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -90,8 +90,8 @@ ..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Host/app.config b/src/NzbDrone.Host/app.config index b8ce7cecb2..79a579f5e6 100644 --- a/src/NzbDrone.Host/app.config +++ b/src/NzbDrone.Host/app.config @@ -15,7 +15,7 @@ - + diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index efa5d6d422..318e9ae49c 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index bad86e7ebe..b866a22078 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -71,8 +71,8 @@ ..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index f0a12cee28..29b3274db6 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 2d9d78b037..069f38f280 100644 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj @@ -47,8 +47,8 @@ ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Libraries.Test/app.config b/src/NzbDrone.Libraries.Test/app.config index 077a6a0616..dcfbf2616b 100644 --- a/src/NzbDrone.Libraries.Test/app.config +++ b/src/NzbDrone.Libraries.Test/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone.Libraries.Test/packages.config b/src/NzbDrone.Libraries.Test/packages.config index 1ebfe9722e..ce04125210 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 8e850db4b1..fcc214b14f 100644 --- a/src/NzbDrone.Mono.Test/app.config +++ b/src/NzbDrone.Mono.Test/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/NzbDrone.Mono/app.config b/src/NzbDrone.Mono/app.config index 9566343db5..c63517866b 100644 --- a/src/NzbDrone.Mono/app.config +++ b/src/NzbDrone.Mono/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj index f091b786cb..64fab92d94 100644 --- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj +++ b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj @@ -65,8 +65,8 @@ ..\packages\Microsoft.Owin.Security.3.1.0\lib\net45\Microsoft.Owin.Security.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/NzbDrone.SignalR/app.config b/src/NzbDrone.SignalR/app.config index d4d6857aa1..cc9e61a275 100644 --- a/src/NzbDrone.SignalR/app.config +++ b/src/NzbDrone.SignalR/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone.SignalR/packages.config b/src/NzbDrone.SignalR/packages.config index ebc988bb11..a9daaf8894 100644 --- a/src/NzbDrone.SignalR/packages.config +++ b/src/NzbDrone.SignalR/packages.config @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/App.config b/src/NzbDrone.Test.Common/App.config index a62cc0f656..79efbe9675 100644 --- a/src/NzbDrone.Test.Common/App.config +++ b/src/NzbDrone.Test.Common/App.config @@ -7,7 +7,7 @@ - + diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj index 6f7144a131..27bdf40b08 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -61,8 +61,8 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config index c93fb69ba1..ae03b36853 100644 --- a/src/NzbDrone.Test.Common/packages.config +++ b/src/NzbDrone.Test.Common/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index 046124ceee..7c260db432 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -42,8 +42,8 @@ app.manifest - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone.Update/app.config b/src/NzbDrone.Update/app.config index 65f7b09dbe..50ffc5255b 100644 --- a/src/NzbDrone.Update/app.config +++ b/src/NzbDrone.Update/app.config @@ -11,7 +11,7 @@ - + diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config index 74b351c724..183dc4c342 100644 --- a/src/NzbDrone.Update/packages.config +++ b/src/NzbDrone.Update/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.Windows.Test/app.config b/src/NzbDrone.Windows.Test/app.config index 8e850db4b1..fcc214b14f 100644 --- a/src/NzbDrone.Windows.Test/app.config +++ b/src/NzbDrone.Windows.Test/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/NzbDrone.Windows/app.config b/src/NzbDrone.Windows/app.config index 9566343db5..c63517866b 100644 --- a/src/NzbDrone.Windows/app.config +++ b/src/NzbDrone.Windows/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj index ced1169679..af9b980908 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -74,8 +74,8 @@ ..\packages\Microsoft.Owin.Hosting.3.1.0\lib\net45\Microsoft.Owin.Hosting.dll - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NLog.4.5.4\lib\net45\NLog.dll diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config index 16514eb60f..2171764321 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file