From a921935c748bc99965b58b411baa47dc09474e17 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 20 Feb 2021 01:40:31 -0500 Subject: [PATCH] Update Various Deps --- .../Prowlarr.Automation.Test.csproj | 4 ++-- .../Prowlarr.Common.Test.csproj | 4 ++-- .../Instrumentation/Sentry/SentryCleanser.cs | 2 +- .../Instrumentation/Sentry/SentryTarget.cs | 4 ++-- src/NzbDrone.Common/Prowlarr.Common.csproj | 4 ++-- src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj | 6 +++--- src/NzbDrone.Core/Prowlarr.Core.csproj | 4 ++-- src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj | 4 ++-- src/NzbDrone.Host/Prowlarr.Host.csproj | 2 +- .../Client/ClientBase.cs | 15 +++++---------- .../Prowlarr.Integration.Test.csproj | 4 ++-- .../Prowlarr.Libraries.Test.csproj | 4 ++-- src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj | 4 ++-- .../Prowlarr.Test.Common.csproj | 10 +++++----- .../Prowlarr.Update.Test.csproj | 4 ++-- src/NzbDrone.Update/Prowlarr.Update.csproj | 2 +- .../Prowlarr.Windows.Test.csproj | 4 ++-- src/NzbDrone.Windows/Prowlarr.Windows.csproj | 2 +- .../Prowlarr.Api.V1.Test.csproj | 4 ++-- src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj | 2 +- src/Prowlarr.Http/Prowlarr.Http.csproj | 2 +- 21 files changed, 43 insertions(+), 48 deletions(-) diff --git a/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj index 6f5b6ff06..4e2105bb6 100644 --- a/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj index ee1ae1f0c..2ea21c3bc 100644 --- a/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs b/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs index 76f0bcb54..217ee5d72 100644 --- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs +++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryCleanser.cs @@ -11,7 +11,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry { try { - sentryEvent.Message = CleanseLogMessage.Cleanse(sentryEvent.Message); + sentryEvent.Message = CleanseLogMessage.Cleanse(sentryEvent.Message.Message); if (sentryEvent.Fingerprint != null) { diff --git a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs index 11cd1bdf3..823d051ab 100644 --- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs +++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs @@ -99,12 +99,12 @@ namespace NzbDrone.Common.Instrumentation.Sentry { _sdk = SentrySdk.Init(o => { - o.Dsn = new Dsn(dsn); + o.Dsn = dsn; o.AttachStacktrace = true; o.MaxBreadcrumbs = 200; o.SendDefaultPii = false; o.Debug = false; - o.DiagnosticsLevel = SentryLevel.Debug; + o.DiagnosticLevel = SentryLevel.Debug; o.Release = BuildInfo.Release; if (PlatformInfo.IsMono) { diff --git a/src/NzbDrone.Common/Prowlarr.Common.csproj b/src/NzbDrone.Common/Prowlarr.Common.csproj index 8a8615142..9e4ed9574 100644 --- a/src/NzbDrone.Common/Prowlarr.Common.csproj +++ b/src/NzbDrone.Common/Prowlarr.Common.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj index 2214a73c5..768f5cefc 100644 --- a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj @@ -4,13 +4,13 @@ - - + + - + diff --git a/src/NzbDrone.Core/Prowlarr.Core.csproj b/src/NzbDrone.Core/Prowlarr.Core.csproj index a0449fe2f..9175ed12f 100644 --- a/src/NzbDrone.Core/Prowlarr.Core.csproj +++ b/src/NzbDrone.Core/Prowlarr.Core.csproj @@ -12,13 +12,13 @@ - + - + diff --git a/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj index 281698511..41a52ecd5 100644 --- a/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/NzbDrone.Host/Prowlarr.Host.csproj b/src/NzbDrone.Host/Prowlarr.Host.csproj index edea3d00d..323c8827a 100644 --- a/src/NzbDrone.Host/Prowlarr.Host.csproj +++ b/src/NzbDrone.Host/Prowlarr.Host.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/NzbDrone.Integration.Test/Client/ClientBase.cs b/src/NzbDrone.Integration.Test/Client/ClientBase.cs index 33091290c..ad8048eca 100644 --- a/src/NzbDrone.Integration.Test/Client/ClientBase.cs +++ b/src/NzbDrone.Integration.Test/Client/ClientBase.cs @@ -51,7 +51,11 @@ namespace NzbDrone.Integration.Test.Client throw response.ErrorException; } - AssertDisableCache(response.Headers); + // cache control header gets reordered on net core + ((string)response.Headers.Single(c => c.Name == "Cache-Control").Value).Split(',').Select(x => x.Trim()) + .Should().BeEquivalentTo("no-store, must-revalidate, no-cache, max-age=0".Split(',').Select(x => x.Trim())); + response.Headers.Single(c => c.Name == "Pragma").Value.Should().Be("no-cache"); + response.Headers.Single(c => c.Name == "Expires").Value.Should().Be("0"); response.ErrorMessage.Should().BeNullOrWhiteSpace(); @@ -67,15 +71,6 @@ namespace NzbDrone.Integration.Test.Client return Json.Deserialize(content); } - - private static void AssertDisableCache(IList headers) - { - // cache control header gets reordered on net core - ((string)headers.Single(c => c.Name == "Cache-Control").Value).Split(',').Select(x => x.Trim()) - .Should().BeEquivalentTo("no-store, must-revalidate, no-cache, max-age=0".Split(',').Select(x => x.Trim())); - headers.Single(c => c.Name == "Pragma").Value.Should().Be("no-cache"); - headers.Single(c => c.Name == "Expires").Value.Should().Be("0"); - } } public class ClientBase : ClientBase diff --git a/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj index 085e15c52..bd08699cf 100644 --- a/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj index a4d90b8f2..49588f67b 100644 --- a/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj index 2521fba54..781ffce82 100644 --- a/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj index 31b753d99..91df754e5 100644 --- a/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj index 16ec28383..60954fe1f 100644 --- a/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/NzbDrone.Update/Prowlarr.Update.csproj b/src/NzbDrone.Update/Prowlarr.Update.csproj index 0fee09900..d46a2360a 100644 --- a/src/NzbDrone.Update/Prowlarr.Update.csproj +++ b/src/NzbDrone.Update/Prowlarr.Update.csproj @@ -4,7 +4,7 @@ net5.0 - + diff --git a/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj index 1ad39a63b..4d1c930ea 100644 --- a/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/NzbDrone.Windows/Prowlarr.Windows.csproj b/src/NzbDrone.Windows/Prowlarr.Windows.csproj index 29034e372..5f34f69b6 100644 --- a/src/NzbDrone.Windows/Prowlarr.Windows.csproj +++ b/src/NzbDrone.Windows/Prowlarr.Windows.csproj @@ -3,7 +3,7 @@ net5.0 - + diff --git a/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj b/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj index dadbf858d..8d7167148 100644 --- a/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj +++ b/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj @@ -4,8 +4,8 @@ - - + + diff --git a/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj b/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj index 0259406e6..40cda7ea4 100644 --- a/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj +++ b/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Prowlarr.Http/Prowlarr.Http.csproj b/src/Prowlarr.Http/Prowlarr.Http.csproj index 2fd0ac196..13d3443e9 100644 --- a/src/Prowlarr.Http/Prowlarr.Http.csproj +++ b/src/Prowlarr.Http/Prowlarr.Http.csproj @@ -8,7 +8,7 @@ - +