From f824f9798da90afda6daac1bb54496903c84d7e8 Mon Sep 17 00:00:00 2001
From: Erisa A <erisa@erisa.uk>
Date: Tue, 12 Nov 2024 19:31:58 +0000
Subject: [PATCH] Retarget to .NET 9.0.0

---
 Cliptok.csproj | 13 +++++++++----
 Dockerfile     |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Cliptok.csproj b/Cliptok.csproj
index a4c9f6a0..1ecafdd9 100644
--- a/Cliptok.csproj
+++ b/Cliptok.csproj
@@ -2,8 +2,8 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
-		<LangVersion>12.0</LangVersion>
+		<TargetFramework>net9.0</TargetFramework>
+		<LangVersion>13.0</LangVersion>
 		<UserSecretsId>d9345310-5908-4697-8613-28a24d06d183</UserSecretsId>
 
 		<!-- <RestoreAdditionalProjectSources>
@@ -16,14 +16,19 @@
 		<PackageReference Include="DSharpPlus" Version="5.0.0-nightly-02374" />
 		<PackageReference Include="DSharpPlus.CommandsNext" Version="5.0.0-nightly-02374" />
 		<PackageReference Include="DSharpPlus.SlashCommands" Version="5.0.0-nightly-02374" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Serilog" Version="4.0.1" />
+		<PackageReference Include="Serilog" Version="4.1.0" />
 		<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
 		<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
 		<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
 		<PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0" />
-		<PackageReference Include="StackExchange.Redis" Version="2.8.12" />
+		<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
 		<PackageReference Include="System.Linq" Version="4.3.0" />
 		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
 	</ItemGroup>
diff --git a/Dockerfile b/Dockerfile
index d69ec355..ea57efec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM --platform=${BUILDPLATFORM} \
-    mcr.microsoft.com/dotnet/sdk:8.0.403 AS build-env
+    mcr.microsoft.com/dotnet/sdk:9.0.100 AS build-env
 WORKDIR /app
 
 # Copy csproj and restore as distinct layers
@@ -11,7 +11,7 @@ COPY . ./
 RUN dotnet build -c Release -o out
 
 # We already have this image pulled, its actually quicker to reuse it
-FROM mcr.microsoft.com/dotnet/sdk:8.0.403 AS git-collector
+FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS git-collector
 WORKDIR /out
 COPY . .
 RUN touch dummy.txt && \
@@ -22,7 +22,7 @@ RUN touch dummy.txt && \
     fi
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/runtime:8.0.10-alpine3.20
+FROM mcr.microsoft.com/dotnet/runtime:9.0.0-alpine3.20
 LABEL com.centurylinklabs.watchtower.enable=true
 WORKDIR /app
 RUN apk add --no-cache git redis openssh