refactor: Upgrade to .NET 9

3 months ago · b4d4def0d1
parent 855924c812
commit b4d4def0d1
12 changed files with 69 additions and 63 deletions
--- 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:
--- 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:
--- 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:
--- 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"
    }
--- 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)

--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <Nullable>enable</Nullable>
    <WarningLevel>9999</WarningLevel>
    <ImplicitUsings>enable</ImplicitUsings>
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -5,22 +5,22 @@
  </PropertyGroup>
  <!-- Central Package Versions -->
  <ItemGroup>
-    <PackageVersion Include="Autofac" Version="8.1.1" />
+    <PackageVersion Include="Autofac" Version="8.2.0" />
    <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
    <PackageVersion Include="Autofac.Extras.AggregateService" Version="6.1.2" />
    <PackageVersion Include="Autofac.Extras.Ordering" Version="4.0.0" />
    <PackageVersion Include="AutofacSerilogIntegration" Version="5.0.0" />
    <PackageVersion Include="AutoMapper" Version="13.0.1" />
-    <PackageVersion Include="AutoMapper.Contrib.Autofac.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="CliWrap" Version="3.6.7" />
-    <PackageVersion Include="FluentValidation" Version="11.10.0" />
+    <PackageVersion Include="AutoMapper.Contrib.Autofac.DependencyInjection" Version="8.1.0" />
+    <PackageVersion Include="CliWrap" Version="3.7.0" />
+    <PackageVersion Include="FluentValidation" Version="11.11.0" />
    <PackageVersion Include="Flurl" Version="4.0.0" />
    <PackageVersion Include="Flurl.Http" Version="4.0.2" />
-    <PackageVersion Include="GitVersion.MsBuild" Version="6.0.4" PrivateAssets="All" />
+    <PackageVersion Include="GitVersion.MsBuild" Version="6.1.0" PrivateAssets="all" />
    <PackageVersion Include="MudBlazor" Version="7.15.0" />
    <PackageVersion Include="ReactiveUI.Blazor" Version="20.1.63" />
-    <PackageVersion Include="Serilog" Version="4.1.0" />
-    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.3" />
+    <PackageVersion Include="Serilog" Version="4.2.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
    <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
@ -34,10 +34,10 @@
    <PackageVersion Include="System.Reactive" Version="6.0.1" />
    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
    <PackageVersion Include="SystemTextJson.JsonDiffPatch" Version="2.0.0" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="21.1.3" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="21.1.7" />
    <PackageVersion Include="TestableIO.System.IO.Abstractions.Extensions" Version="2.2.5" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.3" />
-    <PackageVersion Include="YamlDotNet" Version="16.2.0" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.7" />
+    <PackageVersion Include="YamlDotNet" Version="16.2.1" />
  </ItemGroup>
  <!-- Unit Test Packages -->
  <!--
@ -47,25 +47,25 @@
    See: https://github.com/NuGet/docs.microsoft.com-nuget/issues/3108
  -->
  <ItemGroup>
-    <PackageVersion Include="AgileObjects.ReadableExpressions" Version="4.1.3" />
-    <PackageVersion Include="AutofacContrib.NSubstitute" Version="7.0.0" />
-    <PackageVersion Include="AutoFixture" Version="5.0.0-preview0011" />
-    <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="5.0.0-preview0011" />
-    <PackageVersion Include="AutoFixture.NUnit4" Version="5.0.0-preview0011" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
-    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
-    <PackageVersion Include="NUnit" Version="4.2.2" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="Serilog.Sinks.Observable" Version="3.0.0" />
-    <PackageVersion Include="Serilog.Sinks.NUnit" Version="1.0.3" />
-    <PackageVersion Include="Spectre.Console.Testing" Version="0.49.1" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
+    <PackageVersion Include="AgileObjects.ReadableExpressions" Version="4.1.3" PrivateAssets="all" />
+    <PackageVersion Include="AutofacContrib.NSubstitute" Version="7.0.0" PrivateAssets="all" />
+    <PackageVersion Include="AutoFixture" Version="5.0.0-preview0011" PrivateAssets="all" />
+    <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="5.0.0-preview0011" PrivateAssets="all" />
+    <PackageVersion Include="AutoFixture.NUnit4" Version="5.0.0-preview0011" PrivateAssets="all" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" />
+    <PackageVersion Include="FluentAssertions" Version="7.0.0" PrivateAssets="all" />
+    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" PrivateAssets="all" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" PrivateAssets="all" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" PrivateAssets="all" />
+    <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" PrivateAssets="all" />
+    <PackageVersion Include="NUnit" Version="4.3.1" PrivateAssets="all" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.5.0" PrivateAssets="all" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="all" />
+    <PackageVersion Include="Serilog.Sinks.Observable" Version="3.0.0" PrivateAssets="all" />
+    <PackageVersion Include="Serilog.Sinks.NUnit" Version="1.0.3" PrivateAssets="all" />
+    <PackageVersion Include="Spectre.Console.Testing" Version="0.49.1" PrivateAssets="all" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.7" PrivateAssets="all" />
  </ItemGroup>
  <!-- Following found during vulerabilities Code Scan  -->
  <ItemGroup>
--- a/8
+++ b/8
@ -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" \
--- 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;
            });
        }
    }
--- 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)
    {
--- 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
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@ -8,26 +8,26 @@

  <ItemGroup>
    <!-- Packages that apply to all tests -->
-    <PackageReference Include="AgileObjects.ReadableExpressions" PrivateAssets="all" />
-    <PackageReference Include="AutofacContrib.NSubstitute" PrivateAssets="all" />
-    <PackageReference Include="AutoFixture" PrivateAssets="all" />
-    <PackageReference Include="AutoFixture.AutoNSubstitute" PrivateAssets="all" />
-    <PackageReference Include="AutoFixture.NUnit4" PrivateAssets="all" />
-    <PackageReference Include="coverlet.collector" PrivateAssets="all" />
-    <PackageReference Include="FluentAssertions" PrivateAssets="all" />
-    <PackageReference Include="FluentAssertions.Analyzers" PrivateAssets="all" />
-    <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
-    <PackageReference Include="NSubstitute" PrivateAssets="all" />
-    <PackageReference Include="NSubstitute.Analyzers.CSharp" PrivateAssets="all" />
-    <PackageReference Include="NUnit" PrivateAssets="all" />
-    <PackageReference Include="NUnit.Analyzers" PrivateAssets="all" />
-    <PackageReference Include="NUnit3TestAdapter" PrivateAssets="all" />
-    <PackageReference Include="Serilog.Sinks.Observable" PrivateAssets="all" />
-    <PackageReference Include="Serilog.Sinks.NUnit" PrivateAssets="all" />
-    <PackageReference Include="Spectre.Console.Testing" PrivateAssets="all" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions.Extensions" PrivateAssets="all" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" PrivateAssets="all" />
+    <PackageReference Include="AgileObjects.ReadableExpressions" />
+    <PackageReference Include="AutofacContrib.NSubstitute" />
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.NUnit4" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="FluentAssertions.Analyzers" />
+    <PackageReference Include="GitHubActionsTestLogger" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Serilog.Sinks.Observable" />
+    <PackageReference Include="Serilog.Sinks.NUnit" />
+    <PackageReference Include="Spectre.Console.Testing" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions.Extensions" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" />
  </ItemGroup>

  <ItemGroup>