From eff55b9f05c5a7f5e82763dd9b96f637837c2b17 Mon Sep 17 00:00:00 2001
From: Axionyx <nyx@axionyx.sh>
Date: Fri, 17 Jan 2025 15:14:14 +0100
Subject: [PATCH] Dotnet 9.0 (#76)

* Update submodule for 9.0

* Update to Dotnet 9.0

* Upgrade Nuget packages

* ubuntu-latest doesn't contain dotnet9.0 because fuck you

* Update Dockerfile
---
 .github/workflows/build-test.yml |  4 ++++
 Directory.Packages.props         | 16 ++++++++--------
 Dockerfile                       |  4 ++--
 SS14                             |  2 +-
 SS14.Admin/SS14.Admin.csproj     |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 12c7670..3cd3a1d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -14,6 +14,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v3.2.0
+        with:
+          dotnet-version: 9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2ebb5db..c74875f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,16 +1,16 @@
 <Project>
-  <Import Project="SS14/Directory.Packages.props"/>
+  <Import Project="SS14/Directory.Packages.props" />
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="CsvHelper" Version="30.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.6" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.0" />
     <PackageVersion Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
-    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.0" />
-    <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 15b1c3f..ea998bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 RUN mkdir /repo && chown $APP_UID /repo
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["SS14.Admin/SS14.Admin.csproj", "SS14.Admin/"]
diff --git a/SS14 b/SS14
index b4ec946..3da3543 160000
--- a/SS14
+++ b/SS14
@@ -1 +1 @@
-Subproject commit b4ec946bd9f5af7bbc27dd676f294c0c5f4c6847
+Subproject commit 3da354304d79ce21e0ea0ff4406fc695f3d92051
diff --git a/SS14.Admin/SS14.Admin.csproj b/SS14.Admin/SS14.Admin.csproj
index 8b06f1a..2e18e77 100644
--- a/SS14.Admin/SS14.Admin.csproj
+++ b/SS14.Admin/SS14.Admin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <!-- https://github.com/dotnet/aspnetcore/issues/20055 -->
     <NoWarn>CS1998</NoWarn>