From e3498f591f12d072271ee0a3bd412a3c5d0f6dbb Mon Sep 17 00:00:00 2001
From: Debug <49997488+DebugOk@users.noreply.github.com>
Date: Sun, 24 Dec 2023 06:11:08 +0100
Subject: [PATCH] Dotnet 8

---
 .github/workflows/build-test.yml              |  2 +-
 .github/workflows/deploy-dev-image.yml        |  2 +-
 .github/workflows/deploy.yml                  |  2 +-
 Dockerfile                                    |  4 +--
 .../SS14.MapServer.Tests.csproj               | 10 +++---
 .../Services/ImageProcessingService.cs        |  4 ++-
 SS14.MapServer/Program.cs                     |  1 +
 SS14.MapServer/SS14.MapServer.csproj          | 32 +++++++++----------
 8 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 0cc262b..dbfc4a9 100644
--- a/.github/workflows/build-test.yml
+++ b/.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: 8.x.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
diff --git a/.github/workflows/deploy-dev-image.yml b/.github/workflows/deploy-dev-image.yml
index eb1079a..21c528a 100644
--- a/.github/workflows/deploy-dev-image.yml
+++ b/.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: 8.x.x
 
       - name: Restore dependencies
         run: dotnet restore
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d94f791..7b2c479 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x.x
+          dotnet-version: 8.x.x
 
       - name: Restore dependencies
         run: dotnet restore
diff --git a/Dockerfile b/Dockerfile
index f6ef7bf..1532811 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ["SS14.MapServer/SS14.MapServer.csproj", "SS14.MapServer/"]
 RUN dotnet restore "SS14.MapServer/SS14.MapServer.csproj"
diff --git a/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj b/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj
index 93a14a2..f45e8a7 100644
--- a/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj
+++ b/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -11,9 +11,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
-        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit" Version="4.0.1" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
+        <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -22,13 +22,13 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
-    
+
     <ItemGroup>
         <Content Include="resources\**\*">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
     </ItemGroup>
-    
+
     <ItemGroup>
       <ProjectReference Include="..\SS14.MapServer\SS14.MapServer.csproj" />
     </ItemGroup>
diff --git a/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs b/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs
index e5d67b9..b1e6fed 100644
--- a/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs
+++ b/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs
@@ -1,4 +1,6 @@
-using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Advanced;
+using SixLabors.ImageSharp.Processing;
 using SS14.MapServer.Models.Entities;
 
 namespace SS14.MapServer.MapProcessing.Services;
diff --git a/SS14.MapServer/Program.cs b/SS14.MapServer/Program.cs
index 9e83eae..9c31e84 100644
--- a/SS14.MapServer/Program.cs
+++ b/SS14.MapServer/Program.cs
@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.OpenApi.Models;
 using Quartz;
+using Quartz.AspNetCore;
 using Serilog;
 using SS14.GithubApiHelper.Extensions;
 using SS14.GithubApiHelper.Services;
diff --git a/SS14.MapServer/SS14.MapServer.csproj b/SS14.MapServer/SS14.MapServer.csproj
index 6256682..194989c 100644
--- a/SS14.MapServer/SS14.MapServer.csproj
+++ b/SS14.MapServer/SS14.MapServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -10,29 +10,29 @@
 
     <ItemGroup>
         <PackageReference Include="Docker.DotNet" Version="3.125.15" />
-        <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
         <PackageReference Include="JsonModelBinder" Version="2.1.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
-        <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
+        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
         <PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
         <PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
-        <PackageReference Include="Npgsql" Version="7.0.4" />
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
-        <PackageReference Include="Octokit" Version="6.0.0" />
-        <PackageReference Include="Quartz.AspNetCore" Version="3.6.2" />
-        <PackageReference Include="Sentry.AspNetCore" Version="3.35.1" />
-        <PackageReference Include="Sentry.Serilog" Version="3.35.1" />
-        <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+        <PackageReference Include="Npgsql" Version="8.0.1" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
+        <PackageReference Include="Octokit" Version="9.0.0" />
+        <PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
+        <PackageReference Include="Sentry.AspNetCore" Version="4.0.0-beta.6" />
+        <PackageReference Include="Sentry.Serilog" Version="4.0.0-beta.6" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>