From c1b9590df296ea8aa6615c69ba2fb0167fe0abfd Mon Sep 17 00:00:00 2001 From: ta264 Date: Wed, 1 Jul 2020 20:53:05 +0100 Subject: [PATCH] Bump to net core 3.1.5, update packages --- azure-pipelines.yml | 2 +- src/NzbDrone.Api.Test/Readarr.Api.Test.csproj | 15 ++++++---- .../Readarr.Automation.Test.csproj | 11 ++++++-- .../Readarr.Common.Test.csproj | 13 ++++++--- src/NzbDrone.Common/Readarr.Common.csproj | 8 +++--- .../Readarr.Core.Test.csproj | 21 ++++++++------ .../Download/TorrentClientBase.cs | 2 +- .../Indexers/TorrentRssParser.cs | 2 +- src/NzbDrone.Core/MediaCover/ImageResizer.cs | 2 +- src/NzbDrone.Core/Readarr.Core.csproj | 28 +++++++++---------- .../Readarr.Host.Test.csproj | 13 ++++++--- src/NzbDrone.Host/Readarr.Host.csproj | 6 ++-- .../Readarr.Integration.Test.csproj | 15 ++++++---- .../Readarr.Libraries.Test.csproj | 13 ++++++--- .../Readarr.Mono.Test.csproj | 15 ++++++---- src/NzbDrone.Mono/Readarr.Mono.csproj | 6 ++-- .../Readarr.Test.Common.csproj | 14 +++++----- .../Readarr.Update.Test.csproj | 13 ++++++--- src/NzbDrone.Update/Readarr.Update.csproj | 2 +- .../Readarr.Windows.Test.csproj | 13 ++++++--- src/NzbDrone.Windows/Readarr.Windows.csproj | 2 +- src/Readarr.Api.V1/Readarr.Api.V1.csproj | 6 ++-- src/Readarr.Http/Readarr.Http.csproj | 4 +-- 23 files changed, 138 insertions(+), 88 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 96e74d5af..8b2429491 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ variables: buildName: '$(Build.SourceBranchName).$(readarrVersion)' sentryOrg: 'servarr' sentryUrl: 'https://sentry.servarr.com' - dotnetVersion: '3.1.202' + dotnetVersion: '3.1.301' trigger: branches: diff --git a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj index ff9373c3f..174d16bb6 100644 --- a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj @@ -3,14 +3,19 @@ net462;netcoreapp3.1 - + - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + - + diff --git a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj index f68311faf..333200ffb 100644 --- a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj @@ -3,10 +3,15 @@ net462;netcoreapp3.1 - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + diff --git a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj index afc712a38..ea0405ef6 100644 --- a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj @@ -3,13 +3,18 @@ net462;netcoreapp3.1 - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + diff --git a/src/NzbDrone.Common/Readarr.Common.csproj b/src/NzbDrone.Common/Readarr.Common.csproj index 8efb02007..af5cdbe38 100644 --- a/src/NzbDrone.Common/Readarr.Common.csproj +++ b/src/NzbDrone.Common/Readarr.Common.csproj @@ -5,10 +5,10 @@ - - + + - + @@ -16,7 +16,7 @@ - + diff --git a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj index 5182aa011..fd9897623 100644 --- a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj @@ -3,17 +3,22 @@ net462;netcoreapp3.1 - + - - - - - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + - + diff --git a/src/NzbDrone.Core/Download/TorrentClientBase.cs b/src/NzbDrone.Core/Download/TorrentClientBase.cs index 54181bf00..000961047 100644 --- a/src/NzbDrone.Core/Download/TorrentClientBase.cs +++ b/src/NzbDrone.Core/Download/TorrentClientBase.cs @@ -206,7 +206,7 @@ namespace NzbDrone.Core.Download try { - hash = InfoHash.FromMagnetLink(magnetUrl).ToHex(); + hash = MagnetLink.Parse(magnetUrl).InfoHash.ToHex(); } catch (FormatException ex) { diff --git a/src/NzbDrone.Core/Indexers/TorrentRssParser.cs b/src/NzbDrone.Core/Indexers/TorrentRssParser.cs index 35c4466a1..5efe5fd64 100644 --- a/src/NzbDrone.Core/Indexers/TorrentRssParser.cs +++ b/src/NzbDrone.Core/Indexers/TorrentRssParser.cs @@ -52,7 +52,7 @@ namespace NzbDrone.Core.Indexers { try { - return InfoHash.FromMagnetLink(magnetUrl).ToHex(); + return MagnetLink.Parse(magnetUrl).InfoHash.ToHex(); } catch { diff --git a/src/NzbDrone.Core/MediaCover/ImageResizer.cs b/src/NzbDrone.Core/MediaCover/ImageResizer.cs index 4e4301363..60dde4633 100644 --- a/src/NzbDrone.Core/MediaCover/ImageResizer.cs +++ b/src/NzbDrone.Core/MediaCover/ImageResizer.cs @@ -2,8 +2,8 @@ using NzbDrone.Common.EnvironmentInfo; using SixLabors.ImageSharp; using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Processing; -using SixLabors.Memory; namespace NzbDrone.Core.MediaCover { diff --git a/src/NzbDrone.Core/Readarr.Core.csproj b/src/NzbDrone.Core/Readarr.Core.csproj index d8fbccb37..36802952d 100644 --- a/src/NzbDrone.Core/Readarr.Core.csproj +++ b/src/NzbDrone.Core/Readarr.Core.csproj @@ -3,25 +3,25 @@ net462;netcoreapp3.1 - - - - - - + + + + + + - + - - - + + + - + - - + + @@ -31,7 +31,7 @@ - + diff --git a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj index ac25eb4f4..a37f07a17 100644 --- a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj @@ -3,13 +3,18 @@ net462;netcoreapp3.1 - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + diff --git a/src/NzbDrone.Host/Readarr.Host.csproj b/src/NzbDrone.Host/Readarr.Host.csproj index 08e90b773..71a8f0bb6 100644 --- a/src/NzbDrone.Host/Readarr.Host.csproj +++ b/src/NzbDrone.Host/Readarr.Host.csproj @@ -10,11 +10,11 @@ - - + + - + diff --git a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj index 54fcc8acf..812658dfc 100644 --- a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj @@ -4,16 +4,21 @@ Library - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + - + diff --git a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj index 901e1b458..cd14dbbd9 100644 --- a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj @@ -3,13 +3,18 @@ net462;netcoreapp3.1 - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + diff --git a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj index 5db39a863..d96c5adc2 100644 --- a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj @@ -3,13 +3,18 @@ net462;netcoreapp3.1 - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + - + diff --git a/src/NzbDrone.Mono/Readarr.Mono.csproj b/src/NzbDrone.Mono/Readarr.Mono.csproj index 521434cd5..ada027960 100644 --- a/src/NzbDrone.Mono/Readarr.Mono.csproj +++ b/src/NzbDrone.Mono/Readarr.Mono.csproj @@ -3,11 +3,11 @@ net462;netcoreapp3.1 - - + + - +