From 8f2ae2beff35efa0946efa5acd25e8954fcea0f7 Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 11 Nov 2021 21:27:12 +0000 Subject: [PATCH] New: Upgrade to .NET 6 --- azure-pipelines.yml | 46 +++++----- build.sh | 34 +++---- package.json | 2 +- src/Directory.Build.props | 1 + src/Directory.Packages.props | 22 ++--- src/NzbDrone.Api.Test/Readarr.Api.Test.csproj | 2 +- .../Readarr.Automation.Test.csproj | 2 +- .../Http/HttpClientFixture.cs | 2 +- .../Readarr.Common.Test.csproj | 2 +- .../Extensions/IEnumerableExtensions.cs | 7 -- src/NzbDrone.Common/Readarr.Common.csproj | 2 +- src/NzbDrone.Console/Readarr.Console.csproj | 2 +- .../Readarr.Core.Test.csproj | 2 +- src/NzbDrone.Core/Hashing.cs | 6 +- src/NzbDrone.Core/Readarr.Core.csproj | 2 +- .../Readarr.Host.Test.csproj | 2 +- src/NzbDrone.Host/Readarr.Host.csproj | 2 +- .../Readarr.Integration.Test.csproj | 2 +- .../Readarr.Libraries.Test.csproj | 2 +- .../Readarr.Mono.Test.csproj | 2 +- src/NzbDrone.Mono/Readarr.Mono.csproj | 2 +- src/NzbDrone.SignalR/Readarr.SignalR.csproj | 2 +- src/NzbDrone.Test.Common/NzbDroneRunner.cs | 2 +- .../Readarr.Test.Common.csproj | 2 +- .../Readarr.Test.Dummy.csproj | 2 +- .../Readarr.Update.Test.csproj | 2 +- src/NzbDrone.Update/Readarr.Update.csproj | 2 +- .../Readarr.Windows.Test.csproj | 2 +- src/NzbDrone.Windows/Readarr.Windows.csproj | 2 +- src/NzbDrone/Readarr.csproj | 2 +- src/Readarr.Api.V1/ProviderControllerBase.cs | 3 +- src/Readarr.Api.V1/Readarr.Api.V1.csproj | 2 +- src/Readarr.Http/Readarr.Http.csproj | 2 +- .../ServiceInstall/ServiceInstall.csproj | 4 +- .../ServiceUninstall/ServiceUninstall.csproj | 4 +- src/Targets/CopyRuntimes.targets | 4 +- yarn.lock | 88 ++++++++++--------- 37 files changed, 136 insertions(+), 135 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 89e53c011..948c4af1c 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: '5.0.302' + dotnetVersion: '6.0.100' yarnCacheFolder: $(Pipeline.Workspace)/.yarn nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages @@ -81,7 +81,7 @@ stages: displayName: Build Readarr Backend env: NUGET_PACKAGES: $(nugetCacheFolder) - - powershell: Get-ChildItem _output\net5.0*,_output\*.Update\* -Recurse | Where { $_.Fullname -notlike "*\publish\*" -and $_.attributes -notlike "*directory*" } | Remove-Item + - powershell: Get-ChildItem _output\net6.0*,_output\*.Update\* -Recurse | Where { $_.Fullname -notlike "*\publish\*" -and $_.attributes -notlike "*directory*" } | Remove-Item displayName: Clean up intermediate output - task: PublishPipelineArtifact@1 inputs: @@ -91,19 +91,19 @@ stages: parallel: true parallelCount: 100 displayName: Publish Backend - - publish: '$(testsFolder)/net5.0/win-x64/publish' + - publish: '$(testsFolder)/net6.0/win-x64/publish' artifact: WindowsCoreTests displayName: Publish Windows Test Package - - publish: '$(testsFolder)/net5.0/linux-x64/publish' + - publish: '$(testsFolder)/net6.0/linux-x64/publish' artifact: LinuxCoreTests displayName: Publish Linux Test Package - - publish: '$(testsFolder)/net5.0/linux-musl-x64/publish' + - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish' artifact: LinuxMuslCoreTests displayName: Publish Linux Musl Test Package - - publish: '$(testsFolder)/net5.0/freebsd-x64/publish' + - publish: '$(testsFolder)/net6.0/freebsd-x64/publish' artifact: FreebsdCoreTests displayName: Publish FreeBSD Test Package - - publish: '$(testsFolder)/net5.0/osx-x64/publish' + - publish: '$(testsFolder)/net6.0/osx-x64/publish' artifact: MacCoreTests displayName: Publish MacOS Test Package @@ -228,12 +228,12 @@ stages: - bash: ./build.sh --packages displayName: Create Packages - bash: | - setup/inno/ISCC.exe setup/readarr.iss //DFramework=net5.0 //DRuntime=win-x86 - cp setup/output/Readarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe + setup/inno/ISCC.exe setup/readarr.iss //DFramework=net6.0 //DRuntime=win-x86 + cp setup/output/Readarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x86-installer.exe displayName: Create .NET Core Windows installer - bash: | - setup/inno/ISCC.exe setup/readarr.iss //DFramework=net5.0 //DRuntime=win-x64 - cp setup/output/Readarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe + setup/inno/ISCC.exe setup/readarr.iss //DFramework=net6.0 //DRuntime=win-x64 + cp setup/output/Readarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Readarr.${BUILDNAME}.windows-core-x64-installer.exe displayName: Create .NET Core Windows installer - publish: $(Build.ArtifactStagingDirectory) artifact: 'WindowsInstaller' @@ -276,21 +276,21 @@ stages: archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).windows-core-x64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/win-x64/net5.0 + rootFolderOrFile: $(artifactsFolder)/win-x64/net6.0 - task: ArchiveFiles@2 displayName: Create Windows x86 Core zip inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).windows-core-x86.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/win-x86/net5.0 + rootFolderOrFile: $(artifactsFolder)/win-x86/net6.0 - task: ArchiveFiles@2 displayName: Create MacOS Core app inputs: archiveFile: '$(Build.ArtifactStagingDirectory)/Readarr.$(buildName).osx-app-core-x64.zip' archiveType: 'zip' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos-app/net5.0 + rootFolderOrFile: $(artifactsFolder)/macos-app/net6.0 - task: ArchiveFiles@2 displayName: Create MacOS Core tar inputs: @@ -298,7 +298,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/macos/net5.0 + rootFolderOrFile: $(artifactsFolder)/macos/net6.0 - task: ArchiveFiles@2 displayName: Create Linux Core tar inputs: @@ -306,7 +306,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-x64/net5.0 + rootFolderOrFile: $(artifactsFolder)/linux-x64/net6.0 - task: ArchiveFiles@2 displayName: Create Linux Musl Core tar inputs: @@ -314,7 +314,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net5.0 + rootFolderOrFile: $(artifactsFolder)/linux-musl-x64/net6.0 - task: ArchiveFiles@2 displayName: Create ARM32 Linux Core tar inputs: @@ -322,7 +322,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-arm/net5.0 + rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0 - task: ArchiveFiles@2 displayName: Create Linux Core tar inputs: @@ -330,7 +330,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-arm64/net5.0 + rootFolderOrFile: $(artifactsFolder)/linux-arm64/net6.0 - task: ArchiveFiles@2 displayName: Create ARM64 Linux Musl Core tar inputs: @@ -338,7 +338,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net5.0 + rootFolderOrFile: $(artifactsFolder)/linux-musl-arm64/net6.0 - task: ArchiveFiles@2 displayName: Create FreeBSD Core Core tar inputs: @@ -346,7 +346,7 @@ stages: archiveType: 'tar' tarCompression: 'gz' includeRootFolder: false - rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net5.0 + rootFolderOrFile: $(artifactsFolder)/freebsd-x64/net6.0 - publish: $(Build.ArtifactStagingDirectory) artifact: 'Packages' displayName: Publish Packages @@ -842,8 +842,8 @@ stages: sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/CoverageResults/**/coverage.opencover.xml sonar.cs.nunit.reportsPaths=$(Build.SourcesDirectory)/TestResult.xml - bash: | - ./build.sh --backend -f net5.0 -r linux-x64 - TEST_DIR=_tests/net5.0/linux-x64/publish/ ./test.sh Linux Unit Coverage + ./build.sh --backend -f net6.0 -r linux-x64 + TEST_DIR=_tests/net6.0/linux-x64/publish/ ./test.sh Linux Unit Coverage displayName: Coverage Unit Tests env: NUGET_PACKAGES: $(nugetCacheFolder) diff --git a/build.sh b/build.sh index cbdfb3de3..76ec512db 100755 --- a/build.sh +++ b/build.sh @@ -129,7 +129,7 @@ PackageLinux() echo "Adding Readarr.Mono to UpdatePackage" cp $folder/Readarr.Mono.* $folder/Readarr.Update - if [ "$framework" = "net5.0" ]; then + if [ "$framework" = "net6.0" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Readarr.Update cp $folder/libMonoPosixHelper.* $folder/Readarr.Update fi @@ -156,7 +156,7 @@ PackageMacOS() echo "Adding Readarr.Mono to UpdatePackage" cp $folder/Readarr.Mono.* $folder/Readarr.Update - if [ "$framework" = "net5.0" ]; then + if [ "$framework" = "net6.0" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Readarr.Update cp $folder/libMonoPosixHelper.* $folder/Readarr.Update fi @@ -326,14 +326,14 @@ then Build if [[ -z "$RID" || -z "$FRAMEWORK" ]]; then - PackageTests "net5.0" "win-x64" - PackageTests "net5.0" "win-x86" - PackageTests "net5.0" "linux-x64" - PackageTests "net5.0" "linux-musl-x64" - PackageTests "net5.0" "osx-x64" + PackageTests "net6.0" "win-x64" + PackageTests "net6.0" "win-x86" + PackageTests "net6.0" "linux-x64" + PackageTests "net6.0" "linux-musl-x64" + PackageTests "net6.0" "osx-x64" if [ "$ENABLE_BSD" = "YES" ]; then - PackageTests "net5.0" "freebsd-x64" + PackageTests "net6.0" "freebsd-x64" fi else PackageTests "$FRAMEWORK" "$RID" @@ -362,17 +362,17 @@ then if [[ -z "$RID" || -z "$FRAMEWORK" ]]; then - Package "net5.0" "win-x64" - Package "net5.0" "win-x86" - Package "net5.0" "linux-x64" - Package "net5.0" "linux-musl-x64" - Package "net5.0" "linux-arm64" - Package "net5.0" "linux-musl-arm64" - Package "net5.0" "linux-arm" - Package "net5.0" "osx-x64" + Package "net6.0" "win-x64" + Package "net6.0" "win-x86" + Package "net6.0" "linux-x64" + Package "net6.0" "linux-musl-x64" + Package "net6.0" "linux-arm64" + Package "net6.0" "linux-musl-arm64" + Package "net6.0" "linux-arm" + Package "net6.0" "osx-x64" if [ "$ENABLE_BSD" = "YES" ]; then - Package "net5.0" "freebsd-x64" + Package "net6.0" "freebsd-x64" fi else Package "$FRAMEWORK" "$RID" diff --git a/package.json b/package.json index 87695d1a9..3551837e9 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@fortawesome/free-regular-svg-icons": "5.15.3", "@fortawesome/free-solid-svg-icons": "5.15.3", "@fortawesome/react-fontawesome": "0.1.14", - "@microsoft/signalr": "5.0.8", + "@microsoft/signalr": "6.0.0", "@sentry/browser": "6.10.0", "@sentry/integrations": "6.10.0", "ansi-colors": "4.1.1", diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 331b12038..f4eb74bef 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,7 @@ true + false true AnyCPU diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index c9828abda..c13f25a59 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -15,12 +15,12 @@ - - - - - - + + + + + + @@ -42,19 +42,19 @@ - + - + - - - + + + diff --git a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj index 383748859..69baa0c1f 100644 --- a/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/Readarr.Api.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj index fdfebb896..2a5833eeb 100644 --- a/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Readarr.Automation.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs index a3a177347..2702e8d1d 100644 --- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs +++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs @@ -801,7 +801,7 @@ namespace NzbDrone.Common.Test.Http { try { - string url = $"https://{_httpBinHost}/response-headers?Set-Cookie={Uri.EscapeUriString(malformedCookie)}"; + string url = $"https://{_httpBinHost}/response-headers?Set-Cookie={Uri.EscapeDataString(malformedCookie)}"; var requestSet = new HttpRequest(url); requestSet.AllowAutoRedirect = false; diff --git a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj index 760e7e10d..1d1b2f007 100644 --- a/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Readarr.Common.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs b/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs index 946669ff2..f93d14987 100644 --- a/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs +++ b/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs @@ -6,13 +6,6 @@ namespace NzbDrone.Common.Extensions { public static class EnumerableExtensions { - public static IEnumerable DistinctBy(this IEnumerable source, Func keySelector) - { - var knownKeys = new HashSet(); - - return source.Where(element => knownKeys.Add(keySelector(element))); - } - public static IEnumerable IntersectBy(this IEnumerable first, Func firstKeySelector, IEnumerable second, diff --git a/src/NzbDrone.Common/Readarr.Common.csproj b/src/NzbDrone.Common/Readarr.Common.csproj index e9c1e961d..7f02acb7d 100644 --- a/src/NzbDrone.Common/Readarr.Common.csproj +++ b/src/NzbDrone.Common/Readarr.Common.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 en ISMUSL diff --git a/src/NzbDrone.Console/Readarr.Console.csproj b/src/NzbDrone.Console/Readarr.Console.csproj index 2b0a8292e..f738a8ef6 100644 --- a/src/NzbDrone.Console/Readarr.Console.csproj +++ b/src/NzbDrone.Console/Readarr.Console.csproj @@ -1,7 +1,7 @@  Exe - net5.0 + net6.0 ..\NzbDrone.Host\Readarr.ico app.manifest diff --git a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj index a6ea23f94..a1dc39470 100644 --- a/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Readarr.Core.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Core/Hashing.cs b/src/NzbDrone.Core/Hashing.cs index bf7b9a52b..761255a6e 100644 --- a/src/NzbDrone.Core/Hashing.cs +++ b/src/NzbDrone.Core/Hashing.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using System.Security.Cryptography; using System.Text; @@ -8,7 +8,7 @@ namespace NzbDrone.Core { public static string SHA256Hash(this string input) { - using (var hash = SHA256Managed.Create()) + using (var hash = SHA256.Create()) { var enc = Encoding.UTF8; return GetHash(hash.ComputeHash(enc.GetBytes(input))); @@ -17,7 +17,7 @@ namespace NzbDrone.Core public static string SHA256Hash(this Stream input) { - using (var hash = SHA256Managed.Create()) + using (var hash = SHA256.Create()) { return GetHash(hash.ComputeHash(input)); } diff --git a/src/NzbDrone.Core/Readarr.Core.csproj b/src/NzbDrone.Core/Readarr.Core.csproj index e9a2bb1c8..6afe0a6ce 100644 --- a/src/NzbDrone.Core/Readarr.Core.csproj +++ b/src/NzbDrone.Core/Readarr.Core.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj index 7938d6254..c8d5abf90 100644 --- a/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Readarr.Host.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Host/Readarr.Host.csproj b/src/NzbDrone.Host/Readarr.Host.csproj index bf9fdc924..0a34ef2ea 100644 --- a/src/NzbDrone.Host/Readarr.Host.csproj +++ b/src/NzbDrone.Host/Readarr.Host.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 Library diff --git a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj index 64dfa513a..ea28e05d5 100644 --- a/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Readarr.Integration.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 Library diff --git a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj index cd8f7fd55..bfa3129d1 100644 --- a/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Readarr.Libraries.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj index f5dcb7da2..c1ca9553d 100644 --- a/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Readarr.Mono.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Mono/Readarr.Mono.csproj b/src/NzbDrone.Mono/Readarr.Mono.csproj index 70792eea6..6811f7467 100644 --- a/src/NzbDrone.Mono/Readarr.Mono.csproj +++ b/src/NzbDrone.Mono/Readarr.Mono.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.SignalR/Readarr.SignalR.csproj b/src/NzbDrone.SignalR/Readarr.SignalR.csproj index b748236da..d6d49f8e8 100644 --- a/src/NzbDrone.SignalR/Readarr.SignalR.csproj +++ b/src/NzbDrone.SignalR/Readarr.SignalR.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 Library diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index 6a69a2190..6b8ef300c 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -57,7 +57,7 @@ namespace NzbDrone.Test.Common _startupLog = new List(); if (BuildInfo.IsDebug) { - Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", "net5.0", readarrConsoleExe)); + Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", "net6.0", readarrConsoleExe)); } else { diff --git a/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj index beaa04ee0..77485fc3f 100644 --- a/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Readarr.Test.Common.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj index 6be4dabce..8069c5a84 100644 --- a/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/Readarr.Test.Dummy.csproj @@ -1,6 +1,6 @@  Exe - net5.0 + net6.0 diff --git a/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj index b56a7e829..e7960a0a1 100644 --- a/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/Readarr.Update.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Update/Readarr.Update.csproj b/src/NzbDrone.Update/Readarr.Update.csproj index b72811e43..7a751b46e 100644 --- a/src/NzbDrone.Update/Readarr.Update.csproj +++ b/src/NzbDrone.Update/Readarr.Update.csproj @@ -1,7 +1,7 @@  WinExe - net5.0 + net6.0 diff --git a/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj index aab1ace92..c4517dc5c 100644 --- a/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/Readarr.Windows.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Windows/Readarr.Windows.csproj b/src/NzbDrone.Windows/Readarr.Windows.csproj index 668d39198..9e4aa2380 100644 --- a/src/NzbDrone.Windows/Readarr.Windows.csproj +++ b/src/NzbDrone.Windows/Readarr.Windows.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone/Readarr.csproj b/src/NzbDrone/Readarr.csproj index 141ee92bc..f01debd56 100644 --- a/src/NzbDrone/Readarr.csproj +++ b/src/NzbDrone/Readarr.csproj @@ -1,7 +1,7 @@  WinExe - net5.0-windows + net6.0-windows win-x64;win-x86 true ..\NzbDrone.Host\Readarr.ico diff --git a/src/Readarr.Api.V1/ProviderControllerBase.cs b/src/Readarr.Api.V1/ProviderControllerBase.cs index d2af243e2..812a290c8 100644 --- a/src/Readarr.Api.V1/ProviderControllerBase.cs +++ b/src/Readarr.Api.V1/ProviderControllerBase.cs @@ -102,10 +102,9 @@ namespace Readarr.Api.V1 } [RestDeleteById] - public object DeleteProvider(int id) + public void DeleteProvider(int id) { _providerFactory.Delete(id); - return new object(); } [HttpGet("schema")] diff --git a/src/Readarr.Api.V1/Readarr.Api.V1.csproj b/src/Readarr.Api.V1/Readarr.Api.V1.csproj index 3135b72ab..bbd8a4090 100644 --- a/src/Readarr.Api.V1/Readarr.Api.V1.csproj +++ b/src/Readarr.Api.V1/Readarr.Api.V1.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/Readarr.Http/Readarr.Http.csproj b/src/Readarr.Http/Readarr.Http.csproj index 07f12c7bc..8e5e25c7c 100644 --- a/src/Readarr.Http/Readarr.Http.csproj +++ b/src/Readarr.Http/Readarr.Http.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj index b614418b0..a14bba7f9 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj +++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj @@ -1,9 +1,9 @@  WinExe - net5.0 + net6.0 - + diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj index 96ac3a011..d81ed452b 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj +++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj @@ -1,9 +1,9 @@  WinExe - net5.0 + net6.0 - + diff --git a/src/Targets/CopyRuntimes.targets b/src/Targets/CopyRuntimes.targets index 2d0edaed3..2479a6fbc 100644 --- a/src/Targets/CopyRuntimes.targets +++ b/src/Targets/CopyRuntimes.targets @@ -2,10 +2,10 @@ - + - + diff --git a/yarn.lock b/yarn.lock index 9419129ce..17efd1c2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1368,16 +1368,16 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== -"@microsoft/signalr@5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-5.0.8.tgz#0504884a4675956f8a09bbf025b54712171639d6" - integrity sha512-g5U7zGa1CeoPztA1VGLiB418sZ6gt8ZEOsX8krpegyMquzH2Qinny1zQjNsg3mgjGlJI+FXD5bO4gVsHGUp2hA== +"@microsoft/signalr@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-6.0.0.tgz#cb9cb166d8ee0522547e13c100a0992a1f027ce1" + integrity sha512-Y38bG/i9V1fOfOLcfTl2+OqPH7+0A7DgojJ7YILgfQ0vGGmnZwdCtrzCvSsRIzKTIrB/ZSQ3n4BA5VOO+MFkrA== dependencies: abort-controller "^3.0.0" eventsource "^1.0.7" - fetch-cookie "^0.7.3" - node-fetch "^2.6.0" - ws "^6.0.0" + fetch-cookie "^0.11.0" + node-fetch "^2.6.1" + ws "^7.4.5" "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -2109,11 +2109,6 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - async@^2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" @@ -3208,11 +3203,6 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es6-denodeify@^0.1.1: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-denodeify/-/es6-denodeify-0.1.5.tgz#31d4d5fe9c5503e125460439310e16a2a3f39c1f" - integrity sha1-MdTV/pxVA+ElRgQ5MQ4WoqPznB8= - es6-promise@^4.0.3, es6-promise@^4.2.8: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" @@ -3632,13 +3622,12 @@ fb-watchman@^2.0.0, fb-watchman@^2.0.1: dependencies: bser "2.1.1" -fetch-cookie@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.7.3.tgz#b8d023f421dd2b2f4a0eca9cd7318a967ed4eed8" - integrity sha512-rZPkLnI8x5V+zYAiz8QonAHsTb4BY+iFowFBI1RFn0zrO343AVp9X7/yUj/9wL6Ef/8fLls8b/vGtzUvmyAUGA== +fetch-cookie@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407" + integrity sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA== dependencies: - es6-denodeify "^0.1.1" - tough-cookie "^2.3.3" + tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0" file-entry-cache@^6.0.1: version "6.0.1" @@ -5199,10 +5188,12 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-fetch@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== +node-fetch@^2.6.1: + version "2.6.6" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" + integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== + dependencies: + whatwg-url "^5.0.0" node-int64@^0.4.0: version "0.4.0" @@ -5965,7 +5956,7 @@ prop-types@15.7.2, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.6, object-assign "^4.1.1" react-is "^16.8.1" -psl@^1.1.28: +psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -7384,13 +7375,19 @@ to-space-case@^1.0.0: dependencies: to-no-case "^1.0.0" -tough-cookie@^2.3.3: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== +"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== dependencies: - psl "^1.1.28" + psl "^1.1.33" punycode "^2.1.1" + universalify "^0.1.2" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= trim-newlines@^3.0.0: version "3.0.0" @@ -7535,6 +7532,11 @@ unist-util-stringify-position@^2.0.0: dependencies: "@types/unist" "^2.0.2" +universalify@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -7668,6 +7670,11 @@ watchpack@^2.2.0: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webpack-cli@4.7.2: version "4.7.2" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5" @@ -7756,6 +7763,14 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -7823,13 +7838,6 @@ write-file-atomic@^3.0.3: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== - dependencies: - async-limiter "~1.0.0" - ws@^7.4.5: version "7.5.3" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"