diff --git a/.github/workflows/inspect-code.yml b/.github/workflows/inspect-code.yml index 789f78fc..1061f9a5 100644 --- a/.github/workflows/inspect-code.yml +++ b/.github/workflows/inspect-code.yml @@ -16,7 +16,7 @@ on: env: baseRef: ${{ github.ref == 'refs/heads/master' && github.event.before || (github.event.base_ref || github.event.pull_request.base.ref || 'master') }} - dotnetVersion: 8.0.x + dotnetVersion: 9.0.x jobs: inspect: diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 6cb37eda..8f114961 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -14,7 +14,7 @@ on: type: boolean env: - dotnetVersion: 8.0.x + dotnetVersion: 9.0.x jobs: build: diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index ced41eec..8fd7432d 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -25,7 +25,7 @@ on: - 'ci/**' env: - dotnetVersion: 8.0.x + dotnetVersion: 9.0.x jobs: sonarcloud: diff --git a/.vscode/launch.json b/.vscode/launch.json index c705316c..29a22d4f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,11 +6,11 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/Recyclarr.Cli/bin/Debug/net8.0/recyclarr", + "program": "${workspaceFolder}/src/Recyclarr.Cli/bin/Debug/net9.0/recyclarr", "args": [ "radarr" ], - "cwd": "${workspaceFolder}/src/Recyclarr.Cli/bin/Debug/net8.0/", + "cwd": "${workspaceFolder}/src/Recyclarr.Cli/bin/Debug/net9.0/", "stopAtEntry": false, "console": "internalConsole" } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64a94606..45d712b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ that everyone should follow. The following tools are required: -- .NET SDK 8.0 and tooling (e.g. dotnet CLI, which comes with the SDK) +- .NET SDK 9.0 and tooling (e.g. dotnet CLI, which comes with the SDK) - Powershell v5.1 or greater - Docker CLI (Docker Desktop on Windows) diff --git a/Directory.Build.props b/Directory.Build.props index 6723401d..55a070d2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net9.0 enable 9999 enable diff --git a/Directory.Packages.props b/Directory.Packages.props index f42cd00e..446686de 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,22 +5,22 @@ - + - - - + + + - + - - + + @@ -34,10 +34,10 @@ - + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/Dockerfile b/Dockerfile index 1bc19757..fc156789 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,10 @@ # Following Microsoft's pattern shown here: # https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine # https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md -# -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build + +ARG DOTNET_VERSION=9.0 + +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-alpine AS build ARG TARGETARCH WORKDIR /source @@ -24,7 +26,7 @@ RUN dotnet publish src/Recyclarr.Cli -a $TARGETARCH --no-restore -o /app # Enable globalization and time zones: # https://github.com/dotnet/dotnet-docker/blob/main/samples/enable-globalization.md # final stage/image -FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine +FROM mcr.microsoft.com/dotnet/runtime:${DOTNET_VERSION}-alpine LABEL name="recyclarr" \ org.opencontainers.image.source="https://github.com/recyclarr/recyclarr" \ diff --git a/src/Recyclarr.Core/ServarrApi/ServarrRequestBuilder.cs b/src/Recyclarr.Core/ServarrApi/ServarrRequestBuilder.cs index 6414b75d..899ac1dd 100644 --- a/src/Recyclarr.Core/ServarrApi/ServarrRequestBuilder.cs +++ b/src/Recyclarr.Core/ServarrApi/ServarrRequestBuilder.cs @@ -56,7 +56,8 @@ public class ServarrRequestBuilder( + "`enable_ssl_certificate_validation` is set to `false`" ); - handler.ServerCertificateCustomValidationCallback = (_, _, _, _) => true; + handler.ServerCertificateCustomValidationCallback = + HttpClientHandler.DangerousAcceptAnyServerCertificateValidator; }); } } diff --git a/src/Recyclarr.Gui/CompositionRoot.cs b/src/Recyclarr.Gui/CompositionRoot.cs index 8ab8dcdc..6a389bfb 100644 --- a/src/Recyclarr.Gui/CompositionRoot.cs +++ b/src/Recyclarr.Gui/CompositionRoot.cs @@ -4,7 +4,7 @@ using Recyclarr.Platform; namespace Recyclarr.Gui; -public static class CompositionRoot +internal static class CompositionRoot { public static void Setup(ContainerBuilder builder) { diff --git a/tests/.editorconfig b/tests/.editorconfig index 10a25d22..d88ebe96 100644 --- a/tests/.editorconfig +++ b/tests/.editorconfig @@ -1,7 +1,10 @@ [*.cs] -# CA1707: Identifiers should not contain underscores +# Identifiers should not contain underscores dotnet_diagnostic.ca1707.severity = none -# CA1861: Avoid constant arrays as arguments +# Avoid constant arrays as arguments dotnet_diagnostic.ca1861.severity = none + +# Consider making public types internal +dotnet_diagnostic.CA1515.severity = none diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index d4853593..c60fd257 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -8,26 +8,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +