diff --git a/.editorconfig b/.editorconfig index 39fecc26b..e324f2b01 100644 --- a/.editorconfig +++ b/.editorconfig @@ -260,7 +260,7 @@ dotnet_diagnostic.CA5392.severity = suggestion dotnet_diagnostic.CA5394.severity = suggestion dotnet_diagnostic.CA5397.severity = suggestion - +dotnet_diagnostic.SYSLIB0014.severity = none [*.{js,html,js,hbs,less,css}] charset = utf-8 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ab016901a..dc92b9dc3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ variables: buildName: '$(Build.SourceBranchName).$(prowlarrVersion)' sentryOrg: 'servarr' sentryUrl: 'https://sentry.servarr.com' - dotnetVersion: '5.0.400' + dotnetVersion: '6.0.100' yarnCacheFolder: $(Pipeline.Workspace)/.yarn trigger: @@ -111,23 +111,23 @@ stages: artifact: '$(osName)Backend' displayName: Publish Backend condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net5.0/win-x64/publish' + - publish: '$(testsFolder)/net6.0/win-x64/publish' artifact: WindowsCoreTests displayName: Publish Windows Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net5.0/linux-x64/publish' + - publish: '$(testsFolder)/net6.0/linux-x64/publish' artifact: LinuxCoreTests displayName: Publish Linux Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net5.0/linux-musl-x64/publish' + - publish: '$(testsFolder)/net6.0/linux-musl-x64/publish' artifact: LinuxMuslCoreTests displayName: Publish Linux Musl Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net5.0/freebsd-x64/publish' + - publish: '$(testsFolder)/net6.0/freebsd-x64/publish' artifact: FreebsdCoreTests displayName: Publish FreeBSD Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) - - publish: '$(testsFolder)/net5.0/osx-x64/publish' + - publish: '$(testsFolder)/net6.0/osx-x64/publish' artifact: MacCoreTests displayName: Publish MacOS Test Package condition: and(succeeded(), eq(variables['osName'], 'Windows')) @@ -203,12 +203,12 @@ stages: - bash: ./build.sh --packages displayName: Create Packages - bash: | - distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net5.0 //DRuntime=win-x86 - cp distribution/windows/setup/output/Prowlarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe + distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net6.0 //DRuntime=win-x86 + cp distribution/windows/setup/output/Prowlarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x86-installer.exe displayName: Create x86 .NET Core Windows installer - bash: | - distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net5.0 //DRuntime=win-x64 - cp distribution/windows/setup/output/Prowlarr.*windows.net5.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe + distribution/windows/setup/inno/ISCC.exe distribution/windows/setup/prowlarr.iss //DFramework=net6.0 //DRuntime=win-x64 + cp distribution/windows/setup/output/Prowlarr.*windows.net6.0.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Prowlarr.${BUILDNAME}.windows-core-x64-installer.exe displayName: Create x64 .NET Core Windows installer - publish: $(Build.ArtifactStagingDirectory) artifact: 'WindowsInstaller' @@ -250,21 +250,21 @@ stages: archiveFile: '$(Build.ArtifactStagingDirectory)/Prowlarr.$(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)/Prowlarr.$(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)/Prowlarr.$(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: @@ -272,7 +272,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: @@ -280,7 +280,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: @@ -288,7 +288,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: @@ -296,7 +296,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 ARM64 Linux Core tar inputs: @@ -304,7 +304,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: @@ -312,7 +312,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: @@ -320,7 +320,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 @@ -838,8 +838,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 win-x64 - TEST_DIR=_tests/net5.0/win-x64/publish/ ./test.sh Windows Unit Coverage + ./build.sh --backend -f net6.0 -r win-x64 + TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage displayName: Coverage Unit Tests - task: SonarCloudAnalyze@1 condition: eq(variables['System.PullRequest.IsFork'], 'False') diff --git a/build.sh b/build.sh index 056f9e30c..d606e558d 100755 --- a/build.sh +++ b/build.sh @@ -130,7 +130,7 @@ PackageLinux() echo "Adding Prowlarr.Mono to UpdatePackage" cp $folder/Prowlarr.Mono.* $folder/Prowlarr.Update - if [ "$framework" = "net5.0" ]; then + if [ "$framework" = "net6.0" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Prowlarr.Update cp $folder/libMonoPosixHelper.* $folder/Prowlarr.Update fi @@ -157,7 +157,7 @@ PackageMacOS() echo "Adding Prowlarr.Mono to UpdatePackage" cp $folder/Prowlarr.Mono.* $folder/Prowlarr.Update - if [ "$framework" = "net5.0" ]; then + if [ "$framework" = "net6.0" ]; then cp $folder/Mono.Posix.NETStandard.* $folder/Prowlarr.Update cp $folder/libMonoPosixHelper.* $folder/Prowlarr.Update fi @@ -327,14 +327,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" @@ -363,17 +363,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 cbfa48c71..366d76dc4 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,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.9", + "@microsoft/signalr": "6.0.0", "@sentry/browser": "6.10.0", "@sentry/integrations": "6.10.0", "chart.js": "3.2.0", diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 78a356827..04b080c03 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ true - + false AnyCPU true win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64 @@ -94,7 +94,7 @@ - + diff --git a/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj b/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj index 82fd1bda6..fcaa91554 100644 --- a/src/NzbDrone.Automation.Test/Prowlarr.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/Prowlarr.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 8a9d96997..f0e84583d 100644 --- a/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs +++ b/src/NzbDrone.Common.Test/Http/HttpClientFixture.cs @@ -728,7 +728,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/Prowlarr.Common.Test.csproj b/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj index b32888b74..0bf15596a 100644 --- a/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/Prowlarr.Common.Test.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs index acf844abd..b5467c2e9 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs @@ -23,7 +23,7 @@ namespace NzbDrone.Common.EnvironmentInfo serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME) && serviceProvider.GetStatus(ServiceProvider.SERVICE_NAME) == ServiceControllerStatus.StartPending; - // net5.0 will return Radarr.dll for entry assembly, we need the actual + // net6.0 will return Radarr.dll for entry assembly, we need the actual // executable name (Radarr on linux). On mono this will return the location of // the mono executable itself, which is not what we want. var entry = Process.GetCurrentProcess().MainModule; diff --git a/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs b/src/NzbDrone.Common/Extensions/IEnumerableExtensions.cs index ef687a922..d18e58e51 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/Prowlarr.Common.csproj b/src/NzbDrone.Common/Prowlarr.Common.csproj index 6156b1fd9..f3cb5557f 100644 --- a/src/NzbDrone.Common/Prowlarr.Common.csproj +++ b/src/NzbDrone.Common/Prowlarr.Common.csproj @@ -1,12 +1,12 @@  - net5.0 + net6.0 ISMUSL - + @@ -14,10 +14,10 @@ - + - + diff --git a/src/NzbDrone.Console/Prowlarr.Console.csproj b/src/NzbDrone.Console/Prowlarr.Console.csproj index 16f42bea3..bbfa0a0fa 100644 --- a/src/NzbDrone.Console/Prowlarr.Console.csproj +++ b/src/NzbDrone.Console/Prowlarr.Console.csproj @@ -1,7 +1,7 @@ Exe - net5.0 + net6.0 ..\NzbDrone.Host\Prowlarr.ico app.manifest diff --git a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj index 49557c26d..9b2fb1692 100644 --- a/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/Prowlarr.Core.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Core/Datastore/Converters/CookieConverter.cs b/src/NzbDrone.Core/Datastore/Converters/CookieConverter.cs index f62038f12..484ca108e 100644 --- a/src/NzbDrone.Core/Datastore/Converters/CookieConverter.cs +++ b/src/NzbDrone.Core/Datastore/Converters/CookieConverter.cs @@ -1,6 +1,7 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Data; using System.Text.Json; +using System.Text.Json.Serialization; using Dapper; using NzbDrone.Common.Serializer; @@ -15,7 +16,7 @@ namespace NzbDrone.Core.Datastore.Converters var serializerSettings = new JsonSerializerOptions { AllowTrailingCommas = true, - IgnoreNullValues = true, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, PropertyNameCaseInsensitive = true, WriteIndented = true }; diff --git a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs index 8acf352e8..e56eb0566 100644 --- a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs +++ b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs @@ -15,7 +15,7 @@ namespace NzbDrone.Core.Datastore.Converters var serializerSettings = new JsonSerializerOptions { AllowTrailingCommas = true, - IgnoreNullValues = true, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, PropertyNameCaseInsensitive = true, DictionaryKeyPolicy = JsonNamingPolicy.CamelCase, PropertyNamingPolicy = JsonNamingPolicy.CamelCase, diff --git a/src/NzbDrone.Core/Hashing.cs b/src/NzbDrone.Core/Hashing.cs index 531de210d..761255a6e 100644 --- a/src/NzbDrone.Core/Hashing.cs +++ b/src/NzbDrone.Core/Hashing.cs @@ -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/Indexers/Definitions/ZonaQ.cs b/src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs index 328ca8aef..6e1233841 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs @@ -139,7 +139,7 @@ namespace NzbDrone.Core.Indexers.Definitions private static string Sha1Hash(string input) { - var hash = new SHA1Managed().ComputeHash(Encoding.UTF8.GetBytes(input)); + var hash = SHA1.Create().ComputeHash(Encoding.UTF8.GetBytes(input)); return string.Concat(hash.Select(b => b.ToString("x2"))); } diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs index c725316dc..05b031a6a 100644 --- a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs +++ b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs @@ -52,7 +52,6 @@ namespace NzbDrone.Core.Messaging.Commands catch (ThreadAbortException ex) { _logger.Error(ex, "Thread aborted"); - Thread.ResetAbort(); } catch (OperationCanceledException) { diff --git a/src/NzbDrone.Core/Parser/StringUtil.cs b/src/NzbDrone.Core/Parser/StringUtil.cs index 634bc4313..d52e7456d 100644 --- a/src/NzbDrone.Core/Parser/StringUtil.cs +++ b/src/NzbDrone.Core/Parser/StringUtil.cs @@ -242,7 +242,8 @@ namespace NzbDrone.Core.Parser { var chars = "abcdefghijklmnopqrstuvwxyz0123456789"; var randBytes = new byte[length]; - using (var rngCsp = new RNGCryptoServiceProvider()) + + using (var rngCsp = RandomNumberGenerator.Create()) { rngCsp.GetBytes(randBytes); var key = ""; diff --git a/src/NzbDrone.Core/Prowlarr.Core.csproj b/src/NzbDrone.Core/Prowlarr.Core.csproj index ee0ffddc3..2e43ae263 100644 --- a/src/NzbDrone.Core/Prowlarr.Core.csproj +++ b/src/NzbDrone.Core/Prowlarr.Core.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs b/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs index 3de882618..50797e8df 100644 --- a/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs +++ b/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Core.ThingiProvider var serializerSettings = new JsonSerializerOptions { AllowTrailingCommas = true, - IgnoreNullValues = true, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, PropertyNameCaseInsensitive = true, DictionaryKeyPolicy = JsonNamingPolicy.CamelCase, PropertyNamingPolicy = JsonNamingPolicy.CamelCase, diff --git a/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj b/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj index 12f52273c..6e9231a1a 100644 --- a/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj +++ b/src/NzbDrone.Host.Test/Prowlarr.Host.Test.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 diff --git a/src/NzbDrone.Host/Prowlarr.Host.csproj b/src/NzbDrone.Host/Prowlarr.Host.csproj index edddca01b..204117551 100644 --- a/src/NzbDrone.Host/Prowlarr.Host.csproj +++ b/src/NzbDrone.Host/Prowlarr.Host.csproj @@ -1,12 +1,12 @@  - net5.0 + net6.0 Library - - + + diff --git a/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj b/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj index 02846b5c8..ea2df08de 100644 --- a/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/Prowlarr.Integration.Test.csproj @@ -1,10 +1,10 @@  - net5.0 + net6.0 Library - + diff --git a/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj index 4d86db6e1..e905dd74d 100644 --- a/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/Prowlarr.Libraries.Test.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 diff --git a/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj b/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj index 476de6309..7f5fa8645 100644 --- a/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/Prowlarr.Mono.Test.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 diff --git a/src/NzbDrone.Mono/Prowlarr.Mono.csproj b/src/NzbDrone.Mono/Prowlarr.Mono.csproj index bb883bc5c..fddefed59 100644 --- a/src/NzbDrone.Mono/Prowlarr.Mono.csproj +++ b/src/NzbDrone.Mono/Prowlarr.Mono.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.SignalR/Prowlarr.SignalR.csproj b/src/NzbDrone.SignalR/Prowlarr.SignalR.csproj index 316e17154..b33b66994 100644 --- a/src/NzbDrone.SignalR/Prowlarr.SignalR.csproj +++ b/src/NzbDrone.SignalR/Prowlarr.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 30135f975..0a7251fc9 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -55,7 +55,7 @@ namespace NzbDrone.Test.Common if (BuildInfo.IsDebug) { - var frameworkFolder = "net5.0"; + var frameworkFolder = "net6.0"; Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..", "..", "_output", frameworkFolder, consoleExe)); } else diff --git a/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj index c09d17dc4..bff730d28 100644 --- a/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Prowlarr.Test.Common.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj index 244fa2aeb..1ead72088 100644 --- a/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/Prowlarr.Test.Dummy.csproj @@ -1,6 +1,6 @@ Exe - net5.0 + net6.0 \ No newline at end of file diff --git a/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj b/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj index 3ba4a7e16..448d0869e 100644 --- a/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/Prowlarr.Update.Test.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 diff --git a/src/NzbDrone.Update/Prowlarr.Update.csproj b/src/NzbDrone.Update/Prowlarr.Update.csproj index a103670ce..aebe9ea33 100644 --- a/src/NzbDrone.Update/Prowlarr.Update.csproj +++ b/src/NzbDrone.Update/Prowlarr.Update.csproj @@ -1,7 +1,7 @@  WinExe - net5.0 + net6.0 diff --git a/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj b/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj index 8be630814..632293b92 100644 --- a/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/Prowlarr.Windows.Test.csproj @@ -1,6 +1,6 @@ - net5.0 + net6.0 diff --git a/src/NzbDrone.Windows/Prowlarr.Windows.csproj b/src/NzbDrone.Windows/Prowlarr.Windows.csproj index 96dc93eec..449211184 100644 --- a/src/NzbDrone.Windows/Prowlarr.Windows.csproj +++ b/src/NzbDrone.Windows/Prowlarr.Windows.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/NzbDrone/Prowlarr.csproj b/src/NzbDrone/Prowlarr.csproj index 67d609f0b..3f990da36 100644 --- a/src/NzbDrone/Prowlarr.csproj +++ b/src/NzbDrone/Prowlarr.csproj @@ -1,7 +1,7 @@  WinExe - net5.0-windows + net6.0-windows win-x64;win-x86 true ..\NzbDrone.Host\Prowlarr.ico @@ -9,7 +9,7 @@ true - + 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 5d72e6996..0c72fa8ca 100644 --- a/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj +++ b/src/Prowlarr.Api.V1.Test/Prowlarr.Api.V1.Test.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/Prowlarr.Api.V1/ProviderControllerBase.cs b/src/Prowlarr.Api.V1/ProviderControllerBase.cs index d57d3f50e..4784421db 100644 --- a/src/Prowlarr.Api.V1/ProviderControllerBase.cs +++ b/src/Prowlarr.Api.V1/ProviderControllerBase.cs @@ -102,10 +102,9 @@ namespace Prowlarr.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/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj b/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj index 40230a47f..df70ed8b9 100644 --- a/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj +++ b/src/Prowlarr.Api.V1/Prowlarr.Api.V1.csproj @@ -1,6 +1,6 @@  - net5.0 + net6.0 diff --git a/src/Prowlarr.Http/Prowlarr.Http.csproj b/src/Prowlarr.Http/Prowlarr.Http.csproj index 0922a89d0..a7d87cb78 100644 --- a/src/Prowlarr.Http/Prowlarr.Http.csproj +++ b/src/Prowlarr.Http/Prowlarr.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 cfe8281cc..21e3125e0 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj +++ b/src/ServiceHelpers/ServiceInstall/ServiceInstall.csproj @@ -1,7 +1,7 @@  WinExe - net5.0 + net6.0 diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj index cfe8281cc..21e3125e0 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj +++ b/src/ServiceHelpers/ServiceUninstall/ServiceUninstall.csproj @@ -1,7 +1,7 @@  WinExe - net5.0 + net6.0 diff --git a/yarn.lock b/yarn.lock index e416d2c54..2d43abb17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1095,16 +1095,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.9": - version "5.0.9" - resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-5.0.9.tgz#cff2b0a091298049fd012e7b6cd015a814f8698d" - integrity sha512-pQufk3+mChfystnmYpglyRYQFp+036QmOxbZUFr2cFf2iiS8ekBX5uVBOG8OexKcsG4TcJNAU/ref90Y9+3ZiA== +"@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" @@ -1826,11 +1826,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" @@ -2885,11 +2880,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" @@ -3309,13 +3299,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" @@ -4877,10 +4866,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" @@ -5619,7 +5610,7 @@ prop-types@15.7.2, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, 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== @@ -6999,13 +6990,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.1" @@ -7150,6 +7147,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" @@ -7283,6 +7285,11 @@ watchpack@^2.0.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.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16" @@ -7380,6 +7387,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" @@ -7439,13 +7454,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"