Dotnet 10

.github/workflows/build-test.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x.x
+          dotnet-version: 10.x.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

.github/workflows/deploy-dev-image.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x.x
+          dotnet-version: 10.x.x
 
       - name: Restore dependencies
         run: dotnet restore

.github/workflows/deploy.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x.x
+          dotnet-version: 10.x.x
 
       - name: Restore dependencies
         run: dotnet restore

Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS base
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
 COPY ["SS14.MapServer/SS14.MapServer.csproj", "SS14.MapServer/"]
 RUN dotnet restore "SS14.MapServer/SS14.MapServer.csproj"

SS14.MapServer.Tests/SS14.MapServer.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -10,14 +10,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-        <PackageReference Include="NUnit" Version="4.3.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
+        <PackageReference Include="NUnit" Version="4.5.1" />
+        <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
+        <PackageReference Include="NUnit.Analyzers" Version="4.12.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.4">
+        <PackageReference Include="coverlet.collector" Version="10.0.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

SS14.MapServer/Controllers/GitHubWebhookController.cs

@@ -64,7 +64,7 @@ public async Task<IActionResult> Post()
 
         var cloneUrl = pushEvent.Repository?.CloneUrl ?? string.Empty;
         if (cloneUrl != string.Empty &&  !_gitConfiguration.RepositoryUrl.Equals(cloneUrl))
-            return new BadRequestObjectResult($"Instance not configured for repository: {pushEvent.Repository.CloneUrl}");
+            return new BadRequestObjectResult($"Instance not configured for repository: {pushEvent.Repository?.CloneUrl}");
 
         switch (eventName)
         {
@@ -319,7 +319,7 @@ private string GetGridImageUrl(Guid mapGuid, int gridId)
 /// </summary>
 public sealed class PatchedPushEventPayload : PushEventPayload
 {
-    public string Before { get; private set; }
+    public new string Before { get; private set; }
     public string After { get; private set; }
     public new string Ref { get; private set; }
 }

SS14.MapServer/Helpers/MapFromDataParameterFilter.cs

@@ -1,4 +1,4 @@
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace SS14.MapServer.Helpers;
@@ -12,12 +12,18 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
         if (methodName != "PostMap" && methodName != "PutMap")
             return;
 
+        if (operation.RequestBody?.Content is null)
+            return;
         if(!operation.RequestBody.Content.TryGetValue("multipart/form-data", out var type))
             return;
 
+        if(type.Schema?.Properties is null)
+            return;
         if(!type.Schema.Properties.TryGetValue("images", out var imagesParameter))
             return;
 
+        if (type.Encoding is null)
+            return;
         if(!type.Encoding.TryGetValue("images", out var imageEncoding))
             return;
 
@@ -32,13 +38,13 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
 
         var mapParameter = new OpenApiSchema
         {
-            Type = "string"
+            Type = JsonSchemaType.String
         };
 
         type.Schema.Properties.Clear();
         type.Schema.Properties.Add("images", imagesParameter);
         type.Schema.Properties.Add("map", mapParameter);
 
-        type.Schema.Required.Clear();
+        type.Schema?.Required?.Clear();
     }
 }

SS14.MapServer/Jobs/ProcessTiledImage.cs

@@ -23,7 +23,7 @@ public async Task Execute(IJobExecutionContext context)
     {
         var dataMap = context.JobDetail.JobDataMap;
 
-        if (dataMap.Get(ProcessOptionsKey) is not ProcessingOptions options)
+        if (dataMap[ProcessOptionsKey] is not ProcessingOptions options)
             throw new JobExecutionException($"Job data value with key ${ProcessOptionsKey} and type ProcessingOptions is missing");
 
         var tiles = await _processingService.TileImage(

SS14.MapServer/Models/DTOs/MapRendererData.cs

@@ -6,12 +6,12 @@ namespace SS14.MapServer.Models.DTOs;
 
 public sealed class MapRendererData
 {
-    public string Id {get; set;}
+    public required string Id {get; set;}
     [Required, JsonProperty("Name")]
-    public string DisplayName {get; set;}
+    public required string DisplayName {get; set;}
     [JsonProperty("Attributions")]
     public string? Attribution {get; set;}
     [Required]
     public List<GridData> Grids {get;} = new();
-    public List<ParallaxLayer> ParallaxLayers {get; set;}
-}
+    public required List<ParallaxLayer> ParallaxLayers {get; set;}
+}

SS14.MapServer/Program.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Npgsql;
 using Quartz;
 using Quartz.AspNetCore;

SS14.MapServer/SS14.MapServer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -10,30 +10,30 @@
 
     <ItemGroup>
         <PackageReference Include="Docker.DotNet" Version="3.125.15" />
-        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2025.2.4" />
         <PackageReference Include="JsonModelBinder" Version="2.1.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.6">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.3" />
-        <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.3" />
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.6" />
+        <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.6" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="10.0.6" />
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
         <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
         <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
-        <PackageReference Include="Npgsql" Version="9.0.3" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+        <PackageReference Include="Npgsql" Version="10.0.2" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
         <PackageReference Include="Octokit" Version="14.0.0" />
-        <PackageReference Include="Quartz.AspNetCore" Version="3.14.0" />
-        <PackageReference Include="Sentry.AspNetCore" Version="5.5.0" />
-        <PackageReference Include="Sentry.Serilog" Version="5.5.0" />
-        <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.0" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
+        <PackageReference Include="Quartz.AspNetCore" Version="3.18.0" />
+        <PackageReference Include="Sentry.AspNetCore" Version="6.4.0" />
+        <PackageReference Include="Sentry.Serilog" Version="6.4.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.7" />
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="10.1.7" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.6" />
     </ItemGroup>
 
     <ItemGroup>

SS14.MapServer/Security/ExcludeAnonymousSecurityFilter.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace SS14.MapServer.Security;
@@ -14,24 +14,18 @@ public void Apply(OpenApiOperation operation, OperationFilterContext context)
 
         if (allowsAnonymousAccess)
             return;
-
-        operation.Responses.Add("401", new OpenApiResponse { Description = "Unauthorized" });
-        operation.Responses.Add("403", new OpenApiResponse { Description = "Forbidden" });
 
-        var apiKeyScheme = new OpenApiSecurityScheme
-        {
-            Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = ApiKeyHandler.Name }
-        };
+        operation.Responses?.Add("401", new OpenApiResponse { Description = "Unauthorized" });
+        operation.Responses?.Add("403", new OpenApiResponse { Description = "Forbidden" });
 
-        operation.Security = new List<OpenApiSecurityRequirement>
-        {
-            new()
+        var apiKeyScheme = new OpenApiSecuritySchemeReference(ApiKeyHandler.Name, context.Document);
+
+        operation.Security =
+        [
+            new OpenApiSecurityRequirement
             {
-                [ apiKeyScheme ] = new List<string>
-                {
-                    "API"
-                }
+                [apiKeyScheme] = ["API"]
             }
-        };
+        ];
     }
-}
+}

SS14.MapServer/Services/FileManagementService.cs

@@ -60,7 +60,7 @@ private Task<int> InternalCleanBuildDirectories()
                     file.Delete();
                     filesCounter++;
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     // Ignore
                 }

SS14.MapServer/Services/MapService.cs

@@ -44,7 +44,7 @@ private void DeleteFile(string path)
         {
             File.Delete(path);
         }
-        catch (Exception _)
+        catch (Exception)
         {
             // Best effort deletion
         }
@@ -56,7 +56,7 @@ private void DeleteDirectory(string path)
         {
             Directory.Delete(path, true);
         }
-        catch (Exception _)
+        catch (Exception)
         {
             // Best effort deletion
         }