diff --git a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj index d22faf472a..962328a7a6 100644 --- a/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj +++ b/src/Lidarr.Api.V1/Lidarr.Api.V1.csproj @@ -67,7 +67,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\Ical.Net.2.2.32\lib\net46\NodaTime.dll diff --git a/src/Lidarr.Api.V1/packages.config b/src/Lidarr.Api.V1/packages.config index 84bf483def..cea6943456 100644 --- a/src/Lidarr.Api.V1/packages.config +++ b/src/Lidarr.Api.V1/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/src/Lidarr.Http/Lidarr.Http.csproj b/src/Lidarr.Http/Lidarr.Http.csproj index a8c3b01ff7..9d3579e33f 100644 --- a/src/Lidarr.Http/Lidarr.Http.csproj +++ b/src/Lidarr.Http/Lidarr.Http.csproj @@ -54,7 +54,7 @@ True - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll diff --git a/src/Lidarr.Http/packages.config b/src/Lidarr.Http/packages.config index 4260a6994a..eebacd2033 100644 --- a/src/Lidarr.Http/packages.config +++ b/src/Lidarr.Http/packages.config @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj index 0b6ea66709..940d4d730d 100644 --- a/src/LogentriesNLog/LogentriesNLog.csproj +++ b/src/LogentriesNLog/LogentriesNLog.csproj @@ -52,7 +52,7 @@ - ..\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 44135561f5..f12e916fdf 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.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index db5c655201..f6a4eff256 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -53,7 +53,7 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config index 045dc1d94f..ff1137faf7 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 34e239a382..aa5c25ee8d 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -48,7 +48,7 @@ ..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Automation.Test/packages.config b/src/NzbDrone.Automation.Test/packages.config index fb60eeeaf2..05b3b13bae 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 952513f984..06be6e0569 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -50,7 +50,7 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config index 54ebba83a0..e2617a6150 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/Instrumentation/Extensions/SentryLoggerExtensions.cs b/src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs index d3d462b9d0..a2af08de7c 100644 --- a/src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs +++ b/src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs @@ -51,7 +51,7 @@ private static LogBuilder CopyLogEvent(this LogBuilder logBuilder, LogEventInfo return logBuilder.LoggerName(logEvent.LoggerName) .TimeStamp(logEvent.TimeStamp) .Message(logEvent.Message, logEvent.Parameters) - .Properties((Dictionary)logEvent.Properties) + .Properties(logEvent.Properties.ToDictionary(v => v.Key, v => v.Value)) .Exception(logEvent.Exception); } } diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 9ba73c8000..71df8a8540 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -48,7 +48,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\Org.Mentalis.dll diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index c376e8f5b6..3782befc0e 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/ConsoleApp.cs b/src/NzbDrone.Console/ConsoleApp.cs index 91fb902aad..357e7e39c5 100644 --- a/src/NzbDrone.Console/ConsoleApp.cs +++ b/src/NzbDrone.Console/ConsoleApp.cs @@ -25,7 +25,15 @@ public static void Main(string[] args) try { var startupArgs = new StartupContext(args); - NzbDroneLogger.Register(startupArgs, false, true); + try + { + NzbDroneLogger.Register(startupArgs, false, true); + } + catch (Exception ex) + { + System.Console.WriteLine("NLog Exception: " + ex.ToString()); + throw; + } Bootstrap.Start(startupArgs, new ConsoleAlerts()); } catch (LidarrStartupException ex) diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 26f46e32d8..8b06d1311a 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -78,7 +78,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\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 8c5ab74a04..cbd23d7f50 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 59daab4387..a0b9d9b8e9 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -79,7 +79,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index a6546fd946..487ede0033 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -10,7 +10,7 @@ - + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index e7460cf46f..ee4ff843b4 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -81,7 +81,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\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 ec02cf1092..df056228dc 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 582329e4e1..183282cab2 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -93,7 +93,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index ef5bb1111e..6f2cecb4fe 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -13,6 +13,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 af30115ada..3ffec65e2f 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -75,7 +75,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index e45b2f78c6..771fd6d3a1 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 34516784d2..6b824ee9ca 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -56,7 +56,7 @@ - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll diff --git a/src/NzbDrone.Mono/packages.config b/src/NzbDrone.Mono/packages.config index 80757f37ad..d433ce2f1a 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 03d7d1d151..71de3f0d21 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -65,7 +65,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Test.Common/packages.config b/src/NzbDrone.Test.Common/packages.config index 4aea1afbd6..db5870e1c0 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 993138c50a..1951e26ab6 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -52,7 +52,7 @@ ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll diff --git a/src/NzbDrone.Update.Test/packages.config b/src/NzbDrone.Update.Test/packages.config index 045dc1d94f..ff1137faf7 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 96a4f72a51..182ae69e29 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -46,7 +46,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll diff --git a/src/NzbDrone.Update/packages.config b/src/NzbDrone.Update/packages.config index 4386ebaa44..befb1218fe 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 20b8e9c284..34c61aa4c5 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -57,7 +57,7 @@ - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll diff --git a/src/NzbDrone.Windows/packages.config b/src/NzbDrone.Windows/packages.config index 80757f37ad..d433ce2f1a 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 40be937b33..9c6c74b1db 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -78,7 +78,7 @@ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net45\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net45\NLog.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/NzbDrone/packages.config b/src/NzbDrone/packages.config index 8c5ab74a04..cbd23d7f50 100644 --- a/src/NzbDrone/packages.config +++ b/src/NzbDrone/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file