From a7aff3bd9a73b79d78833d79795ff12240e7d32d Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 1 May 2018 23:20:26 -0700 Subject: [PATCH] Upgrade NLog to 4.5.3 Closes #2535 --- src/LogentriesNLog/LogentriesNLog.csproj | 6 +++++- src/LogentriesNLog/packages.config | 2 +- src/NzbDrone.Api/NzbDrone.Api.csproj | 7 ++++++- src/NzbDrone.Api/packages.config | 2 +- src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj | 8 +++++++- src/NzbDrone.App.Test/packages.config | 2 +- .../NzbDrone.Automation.Test.csproj | 6 +++++- src/NzbDrone.Automation.Test/packages.config | 2 +- src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj | 6 +++++- src/NzbDrone.Common.Test/packages.config | 2 +- src/NzbDrone.Common/NzbDrone.Common.csproj | 5 ++++- src/NzbDrone.Common/packages.config | 2 +- src/NzbDrone.Console/NzbDrone.Console.csproj | 9 ++++++++- src/NzbDrone.Console/packages.config | 2 +- src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 6 +++++- src/NzbDrone.Core.Test/packages.config | 2 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 6 +++++- src/NzbDrone.Core/packages.config | 2 +- src/NzbDrone.Host/NzbDrone.Host.csproj | 9 ++++++++- src/NzbDrone.Host/packages.config | 2 +- .../NzbDrone.Integration.Test.csproj | 6 +++++- src/NzbDrone.Integration.Test/packages.config | 2 +- src/NzbDrone.Mono/NzbDrone.Mono.csproj | 6 +++++- src/NzbDrone.Mono/packages.config | 2 +- src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj | 6 +++++- src/NzbDrone.Test.Common/packages.config | 2 +- src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj | 6 +++++- src/NzbDrone.Update.Test/packages.config | 2 +- src/NzbDrone.Update/NzbDrone.Update.csproj | 9 ++++++++- src/NzbDrone.Update/packages.config | 2 +- src/NzbDrone.Windows/NzbDrone.Windows.csproj | 6 +++++- src/NzbDrone.Windows/packages.config | 2 +- src/NzbDrone/NzbDrone.csproj | 9 ++++++++- src/NzbDrone/packages.config | 2 +- 34 files changed, 116 insertions(+), 34 deletions(-) diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj index 940d4d730d..fba6880c22 100644 --- a/src/LogentriesNLog/LogentriesNLog.csproj +++ b/src/LogentriesNLog/LogentriesNLog.csproj @@ -52,10 +52,14 @@ - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + + + + diff --git a/src/LogentriesNLog/packages.config b/src/LogentriesNLog/packages.config index f12e916fdf..6f6ef792ac 100644 --- a/src/LogentriesNLog/packages.config +++ b/src/LogentriesNLog/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index 0881a2da3f..16e830d4f0 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -70,12 +70,13 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\Ical.Net.2.2.32\lib\net40\NodaTime.dll + @@ -83,6 +84,10 @@ False ..\Libraries\Sqlite\System.Data.SQLite.dll + + + + diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config index baf3fd8b20..ba6f1b3ed1 100644 --- a/src/NzbDrone.Api/packages.config +++ b/src/NzbDrone.Api/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index 08dcb0ba0f..5c28f26e20 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -47,19 +47,25 @@ ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + + + + + diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config index cc36af42e0..81a4765e88 100644 --- a/src/NzbDrone.App.Test/packages.config +++ b/src/NzbDrone.App.Test/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj index 54cf00791e..72a909bbf7 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -45,16 +45,20 @@ ..\packages\FluentAssertions.4.19.0\lib\net40\FluentAssertions.Core.dll - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + + + + diff --git a/src/NzbDrone.Automation.Test/packages.config b/src/NzbDrone.Automation.Test/packages.config index 9dc05b2aa0..f92f63790c 100644 --- a/src/NzbDrone.Automation.Test/packages.config +++ b/src/NzbDrone.Automation.Test/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index a35bc251f1..c6ed9935ef 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -48,16 +48,20 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + + + + diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config index 09817c0ff4..69062660f0 100644 --- a/src/NzbDrone.Common.Test/packages.config +++ b/src/NzbDrone.Common.Test/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 5f03b302e3..34f7bec435 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -44,7 +44,7 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\Org.Mentalis.dll @@ -60,11 +60,14 @@ + + ..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll + diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index ca8a6b6212..c1e8d1e7b0 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 8d524ba851..0b78bfdf8a 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -66,6 +66,7 @@ app.manifest + False ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll @@ -79,13 +80,19 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + ..\packages\Owin.1.0\lib\net40\Owin.dll + + + + + diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index 537aa75d1b..f3188f1a4d 100644 --- a/src/NzbDrone.Console/packages.config +++ b/src/NzbDrone.Console/packages.config @@ -3,6 +3,6 @@ - + \ 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 c7085eb484..9eabf49b2b 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -90,15 +90,19 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + + + + diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index 6a930fcb50..732b2e721a 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/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index e278fa3764..6f5f1fcf07 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -81,7 +81,7 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\OAuth.1.0.3\lib\net40\OAuth.dll @@ -95,10 +95,14 @@ True + + + + diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index 1fd2939ffb..fffed8fac1 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index 4db99fe403..dfab01e41d 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -57,6 +57,7 @@ OnOutputUpdated + False ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll @@ -82,10 +83,14 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + + + + ..\Libraries\Interop.NetFwTypeLib.dll @@ -94,6 +99,8 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll + + diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index 8603cacf93..9bc2cc7899 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -6,6 +6,6 @@ - + \ 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 4589726442..39e5a981ab 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -79,7 +79,7 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll @@ -89,9 +89,13 @@ True + + + + diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index 5321f66496..4441353047 100644 --- a/src/NzbDrone.Integration.Test/packages.config +++ b/src/NzbDrone.Integration.Test/packages.config @@ -10,7 +10,7 @@ - + diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index 45c8ccf642..50ef3a1889 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -52,12 +52,16 @@ - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + + + + diff --git a/src/NzbDrone.Mono/packages.config b/src/NzbDrone.Mono/packages.config index f12e916fdf..6f6ef792ac 100644 --- a/src/NzbDrone.Mono/packages.config +++ b/src/NzbDrone.Mono/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj index aebe785449..989ba87397 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -55,7 +55,7 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll @@ -65,9 +65,13 @@ True + + + + diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config index e9c0dacf32..043baa4cde 100644 --- a/src/NzbDrone.Test.Common/packages.config +++ b/src/NzbDrone.Test.Common/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index 4aee4b9157..fc059ebb31 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -52,15 +52,19 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + + + + diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config index cc36af42e0..81a4765e88 100644 --- a/src/NzbDrone.Update.Test/packages.config +++ b/src/NzbDrone.Update.Test/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index 61c55fe596..2e82da4c5c 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -40,15 +40,22 @@ app.manifest + ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + + + + + + diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config index f033567c84..bd5160055a 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/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj index 6f3b2a0d79..9011e93a48 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -51,12 +51,16 @@ - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + + + + diff --git a/src/NzbDrone.Windows/packages.config b/src/NzbDrone.Windows/packages.config index f12e916fdf..6f6ef792ac 100644 --- a/src/NzbDrone.Windows/packages.config +++ b/src/NzbDrone.Windows/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj index aae305ec49..0e2e040a85 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -66,6 +66,7 @@ app.manifest + False ..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll @@ -79,15 +80,21 @@ True - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll + ..\packages\NLog.4.5.3\lib\net40-client\NLog.dll + + + + + ..\packages\Owin.1.0\lib\net40\Owin.dll + diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config index 537aa75d1b..f3188f1a4d 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file