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 a350b02ef..843cc773b 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 fe7cb6bf8..f20eb8a8b 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 d4d6857aa..cc9e61a27 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 0c2d2d5b7..839ce8bf6 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 237f3bbfd..7265e3ab8 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 c6693bd88..90a00bd8e 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 83bd362b5..6e563f6a6 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 077a6a061..dcfbf2616 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 f0181d25a..dd53eb5e1 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 9566343db..c63517866 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 fd821639a..4f26eba16 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 7833f8a8a..b708527c8 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 16514eb60..217176432 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 64349108c..48ffca301 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 992c8f03f..11cdf5431 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 3129d272c..88c5aaabe 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 e1f6dc4c7..3232e66a6 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 b0d29a100..981643d10 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 072ec694e..5162f43b7 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 b8ce7cecb..79a579f5e 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 efa5d6d42..318e9ae49 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 bad86e7eb..b866a2207 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 f0a12cee2..29b3274db 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 2d9d78b03..069f38f28 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 077a6a061..dcfbf2616 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 1ebfe9722..ce0412521 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 8e850db4b..fcc214b14 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 9566343db..c63517866 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 f091b786c..64fab92d9 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 d4d6857aa..cc9e61a27 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 ebc988bb1..a9daaf889 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 a62cc0f65..79efbe967 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 6f7144a13..27bdf40b0 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 c93fb69ba..ae03b3685 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 046124cee..7c260db43 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 65f7b09db..50ffc5255 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 74b351c72..183dc4c34 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 8e850db4b..fcc214b14 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 9566343db..c63517866 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 ced116967..af9b98090 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 16514eb60..217176432 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file