Update to .NET 10

.github/workflows/ci.yml

@@ -9,21 +9,30 @@ env:
 jobs:
   ci:
     name: ubuntu
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      pull-requests: write  # Required to comment on PRs
     steps:
       - name: Set PR number (Linux)
         run: |
           echo "PRNumber=${{ github.event.pull_request.number }}" >> "$GITHUB_ENV"
         if: github.event_name == 'pull_request'
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.102
-      - uses: actions/checkout@v3
+          dotnet-version: 10.0.x
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
         run: dotnet build --no-restore
-      - name: Test
-        run: dotnet test --no-build --verbosity normal CentCom.Test/CentCom.Test.csproj --logger GitHubActions
+      - name: Run tests
+        run: dotnet test --configuration Release -- --report-trx --results-directory ./TestResults
+      - name: Comment PR with results
+        if: always()
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: ./TestResults/*.trx
+          comment_mode: always

.github/workflows/release.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.102
+          dotnet-version: 10.0.x
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Prepare publish artifacts
         run: |
           dotnet publish CentCom.API -o publish/linux-x64/CentCom.API/ -r "linux-x64" --self-contained false -c Release --nologo

CentCom.API/CentCom.API.csproj

@@ -7,17 +7,17 @@
 
     <ItemGroup>
         <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
-        <PackageReference Include="MinVer" Version="6.0.0">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
+        <PackageReference Include="MinVer" Version="7.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Npgsql" Version="9.0.2" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="7.2.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.2.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="7.2.0" />
+        <PackageReference Include="Npgsql" Version="10.0.1" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="10.1.4" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.4" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="10.1.4" />
     </ItemGroup>
 
     <ItemGroup>

CentCom.API/Startup.cs

@@ -11,7 +11,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace CentCom.API;
 
@@ -60,7 +60,7 @@ public void ConfigureServices(IServiceCollection services)
             {
                 Title = "CentCom",
                 Version = statusService.GetVersion().ToString(),
-                Description = "An API for accesing CentCom, a central ban intelligence service for Space Station 13 servers"
+                Description = "An API for accessing CentCom, a central ban intelligence service for Space Station 13 servers"
             });
 
             // Set the comments path for the Swagger JSON and UI.

CentCom.Common/CentCom.Common.csproj

@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
+        <PackageReference Include="EFCore.NamingConventions" Version="10.0.1" />
         <PackageReference Include="Enums.NET" Version="5.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
-        <PackageReference Include="MinVer" Version="6.0.0">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
+        <PackageReference Include="MinVer" Version="7.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Npgsql" Version="9.0.2" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
-        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.2.efcore.9.0.0" />
-        <PackageReference Include="Remora.Rest" Version="3.4.0" />
+        <PackageReference Include="MySql.EntityFrameworkCore" Version="10.0.1" />
+        <PackageReference Include="Npgsql" Version="10.0.1" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
+        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
+        <PackageReference Include="Remora.Rest" Version="4.0.0" />
     </ItemGroup>
 
 </Project>

CentCom.Exporter/CentCom.Exporter.csproj

@@ -5,10 +5,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Dapper" Version="2.1.35" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
-        <PackageReference Include="MinVer" Version="6.0.0">
+        <PackageReference Include="Dapper" Version="2.1.66" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.3" />
+        <PackageReference Include="MinVer" Version="7.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

CentCom.Server/CentCom.Server.csproj

@@ -10,34 +10,34 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AngleSharp" Version="1.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="9.0.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
+        <PackageReference Include="AngleSharp" Version="1.4.0" />
+        <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
-        <PackageReference Include="MinVer" Version="6.0.0">
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
+        <PackageReference Include="MinVer" Version="7.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Npgsql" Version="9.0.2" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
-        <PackageReference Include="Quartz" Version="3.13.1" />
-        <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.13.1" />
-        <PackageReference Include="Quartz.Extensions.Hosting" Version="3.13.1" />
-        <PackageReference Include="Serilog" Version="4.2.0" />
-        <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+        <PackageReference Include="Npgsql" Version="10.0.1" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
+        <PackageReference Include="Quartz" Version="3.15.1" />
+        <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.15.1" />
+        <PackageReference Include="Quartz.Extensions.Hosting" Version="3.15.1" />
+        <PackageReference Include="Serilog" Version="4.3.1" />
+        <PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
+        <PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
+        <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
     </ItemGroup>
 
     <ItemGroup>

CentCom.Server/External/Raw/TgRawBan.cs

@@ -54,7 +54,7 @@ public class TgRawBan : IRawBan
     public TgUser Target { get; set; }
 
     [JsonPropertyName("unbanner")]
-    public TgUser? Unbanner { get; set; }
+    public TgUser Unbanner { get; set; }
 
     [JsonPropertyName("roles")]
     public List<string> Roles { get; set; }

CentCom.Server/Services/HttpBanService.cs

@@ -42,11 +42,11 @@ protected void ConfigureClient()
 
     protected void SetBaseAddress(string address) => _httpClient.BaseAddress = new Uri(address);
 
-    protected async Task<T> GetAsync<T>(string endpoint, Dictionary<string, string>? queryParams = null,
-        JsonSerializerOptions? options = null) =>
+    protected async Task<T> GetAsync<T>(string endpoint, Dictionary<string, string> queryParams = null,
+        JsonSerializerOptions options = null) =>
         JsonSerializer.Deserialize<T>(await GetAsStringAsync(endpoint, queryParams), options ?? JsonOptions);
 
-    protected async Task<string> GetAsStringAsync(string endpoint, Dictionary<string, string>? queryParams = null)
+    protected async Task<string> GetAsStringAsync(string endpoint, Dictionary<string, string> queryParams = null)
     {
         var url = queryParams is not null ? QueryHelpers.AddQueryString(endpoint, queryParams) : endpoint;
         var response = await _httpClient.GetAsync(url);

CentCom.Test/BanServices/BeeBanServiceTests.cs

@@ -1,26 +1,23 @@
-using System.Net.Http;
-using System.Threading.Tasks;
 using CentCom.Server.Services;
-using Xunit;
 
 namespace CentCom.Test.BanServices;
 
 public class BeeBanServiceTests
 {
-    [Fact]
+    [Test]
     public async Task BeeBans_ShouldGetPages()
     {
         var toTest = new BeeBanService(new HttpClient(), null);
         var result = await toTest.GetNumberOfPagesAsync();
-        Assert.NotEqual(0, result);
+        await Assert.That(result).IsNotEqualTo(0);
     }
 
-    [Fact]
+    [Test]
     public async Task BeeBans_ShouldGetBans()
     {
         var toTest = new BeeBanService(new HttpClient(), null);
         var result = await toTest.GetBansAsync();
-        Assert.NotNull(result);
-        Assert.NotEmpty(result);
+        await Assert.That(result).IsNotNull();
+        await Assert.That(result).IsNotEmpty();
     }
 }