From 0ab7c19e547e1785097d83966a1c2a23a0d1282e Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Fri, 2 Mar 2018 20:00:28 +0100 Subject: [PATCH] Revert "Fixed: Updated NLog to 4.5 RC6 to handle mono 5.10" This reverts commit 1b20cbb5e3bf91dbf0eac392ddc6d0bddff71dac. --- src/LogentriesNLog/LogentriesNLog.csproj | 2 -- src/LogentriesNLog/packages.config | 2 +- src/NzbDrone.Api/NzbDrone.Api.csproj | 2 -- src/NzbDrone.Api/packages.config | 6 +++--- src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj | 2 -- src/NzbDrone.App.Test/packages.config | 6 +++--- .../NzbDrone.Automation.Test.csproj | 2 -- src/NzbDrone.Automation.Test/packages.config | 12 ++++++------ .../NzbDrone.Common.Test.csproj | 2 -- src/NzbDrone.Common.Test/packages.config | 10 +++++----- src/NzbDrone.Common/NzbDrone.Common.csproj | 2 -- src/NzbDrone.Common/packages.config | 7 +++---- src/NzbDrone.Console/NzbDrone.Console.csproj | 2 -- src/NzbDrone.Console/packages.config | 6 +++--- src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 2 -- src/NzbDrone.Core.Test/packages.config | 9 +++++---- src/NzbDrone.Core/NzbDrone.Core.csproj | 2 -- src/NzbDrone.Core/packages.config | 6 +++--- src/NzbDrone.Host/NzbDrone.Host.csproj | 2 -- src/NzbDrone.Host/packages.config | 6 +++--- .../NzbDrone.Integration.Test.csproj | 2 -- src/NzbDrone.Integration.Test/packages.config | 8 ++++---- src/NzbDrone.Mono/NzbDrone.Mono.csproj | 2 -- src/NzbDrone.Mono/packages.config | 2 +- .../NzbDrone.Test.Common.csproj | 2 -- src/NzbDrone.Test.Common/packages.config | 15 +++++++-------- .../NzbDrone.Update.Test.csproj | 2 -- src/NzbDrone.Update.Test/packages.config | 6 +++--- src/NzbDrone.Update/NzbDrone.Update.csproj | 2 -- src/NzbDrone.Update/packages.config | 6 +++--- src/NzbDrone.Windows/NzbDrone.Windows.csproj | 2 -- src/NzbDrone.Windows/packages.config | 2 +- src/NzbDrone/NzbDrone.csproj | 2 -- src/NzbDrone/packages.config | 6 +++--- 34 files changed, 57 insertions(+), 92 deletions(-) diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj index 3e8a3d19ad..5996ca2027 100644 --- a/src/LogentriesNLog/LogentriesNLog.csproj +++ b/src/LogentriesNLog/LogentriesNLog.csproj @@ -53,8 +53,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/LogentriesNLog/packages.config b/src/LogentriesNLog/packages.config index f12e916fdf..44135561f5 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 acf06e85ca..b9b0f05065 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -74,8 +74,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\Ical.Net.2.2.25\lib\net40\NodaTime.dll diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config index effe9b78a4..23373871c4 100644 --- a/src/NzbDrone.Api/packages.config +++ b/src/NzbDrone.Api/packages.config @@ -1,10 +1,10 @@ - + - - + + \ 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 d2ada93a4d..eb6c1bebbb 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -51,8 +51,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config index 39c65abfb6..f12ad74d10 100644 --- a/src/NzbDrone.App.Test/packages.config +++ b/src/NzbDrone.App.Test/packages.config @@ -1,8 +1,8 @@ - + - - + + \ 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 3ac8554a18..63f9c8280d 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -48,8 +48,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Automation.Test/packages.config b/src/NzbDrone.Automation.Test/packages.config index 8c9cc4f265..1e183b82d6 100644 --- a/src/NzbDrone.Automation.Test/packages.config +++ b/src/NzbDrone.Automation.Test/packages.config @@ -1,8 +1,8 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index f56cbf2bc1..188dad035f 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -47,8 +47,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config index e12690cdda..805d86b0be 100644 --- a/src/NzbDrone.Common.Test/packages.config +++ b/src/NzbDrone.Common.Test/packages.config @@ -1,7 +1,7 @@ - + - - - - + + + + \ No newline at end of file diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 2ce9b096ba..de89b40594 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -45,8 +45,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index 06209d11e9..6bda9797dd 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -1,8 +1,7 @@ - + - - - + + \ No newline at end of file diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 2957591337..8a5abdbfce 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -77,8 +77,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index 170e9e8a99..5f3ede2591 100644 --- a/src/NzbDrone.Console/packages.config +++ b/src/NzbDrone.Console/packages.config @@ -1,8 +1,8 @@ - + - - + + \ 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 f612890e05..df5b4d3752 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -86,8 +86,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index 2f05a1492f..164b69a3f3 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -1,4 +1,4 @@ - + @@ -8,9 +8,10 @@ - - - + + + + \ No newline at end of file diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index d0f8695afa..f733517e76 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -82,8 +82,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\OAuth.1.0.3\lib\net40\OAuth.dll diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index 5c1939cbb8..a8050c0cad 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -1,11 +1,11 @@ - + - - + + diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index f49080989b..de791d8708 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -86,8 +86,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index 908c603565..35fe8a180c 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -1,11 +1,11 @@ - + - - + + \ 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 51fc6b8a5f..cdb4734d4c 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -78,8 +78,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index 564073238f..2555551c30 100644 --- a/src/NzbDrone.Integration.Test/packages.config +++ b/src/NzbDrone.Integration.Test/packages.config @@ -1,4 +1,4 @@ - + @@ -9,9 +9,9 @@ - - - + + + \ No newline at end of file diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index 75223c98e1..3de5073b78 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -53,8 +53,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone.Mono/packages.config b/src/NzbDrone.Mono/packages.config index f12e916fdf..44135561f5 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 cff708d512..0a2f8bd54e 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -51,8 +51,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config index f9025df530..56671ca77a 100644 --- a/src/NzbDrone.Test.Common/packages.config +++ b/src/NzbDrone.Test.Common/packages.config @@ -1,12 +1,11 @@ - + - - - - - - - + + + + + + \ No newline at end of file diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index 170824f3c6..7f6c744685 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -51,8 +51,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config index 39c65abfb6..f12ad74d10 100644 --- a/src/NzbDrone.Update.Test/packages.config +++ b/src/NzbDrone.Update.Test/packages.config @@ -1,8 +1,8 @@ - + - - + + \ No newline at end of file diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index ae9ffde1c2..b296eabf8f 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -43,8 +43,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config index 29a61f3458..a9cb2e050d 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 94d5d672d7..7a7ab799f6 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -52,8 +52,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone.Windows/packages.config b/src/NzbDrone.Windows/packages.config index f12e916fdf..44135561f5 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 6ce1fe7280..9d76df2ddb 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -77,8 +77,6 @@ ..\packages\NLog.4.4.12\lib\net40\NLog.dll - - ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config index 170e9e8a99..5f3ede2591 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -1,8 +1,8 @@ - + - - + + \ No newline at end of file