From c4abb5ed03936821d1f13236b03171b6c411dbb0 Mon Sep 17 00:00:00 2001
From: Florian Trayon <26360935+FlorianLeChat@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:01:26 +0100
Subject: [PATCH] Added support for .NET versions above 8.0

---
 .github/workflows/dotnet.yml              | 18 +++++++++---------
 src/FacepunchCommitsMonitor.csproj        |  2 +-
 tests/FacepunchCommitsMonitorTests.csproj |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index f3febc8..ccfa9a9 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        dotnet: [ "6.x", "7.x", "8.x" ]
+        framework: [ "net8.0", "net9.0" ]
       fail-fast: false
     steps:
     - name: Checkout code
@@ -21,22 +21,22 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: ${{ matrix.dotnet }}
+        dotnet-version: "9.x"
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --no-restore
+      run: dotnet build --no-restore -f ${{ matrix.framework }}
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet test --no-build --verbosity normal -f ${{ matrix.framework }}
     - name: Publish Windows (arm64/x64)
       run: |
-        dotnet publish src/FacepunchCommitsMonitor.csproj -c Release -r win-x64 --nologo --self-contained
-        dotnet publish src/FacepunchCommitsMonitor.csproj -c Release -r win-arm64 --nologo --self-contained
+        dotnet publish src/FacepunchCommitsMonitor.csproj -c Release -f ${{ matrix.framework }} -r win-x64 --nologo --self-contained
+        dotnet publish src/FacepunchCommitsMonitor.csproj -c Release -f ${{ matrix.framework }} -r win-arm64 --nologo --self-contained
     - name: Upload Windows Builds
       uses: actions/upload-artifact@v4
       if: github.event_name == 'push'
       with:
-        name: windows-builds-dotnet-${{ matrix.dotnet }}
+        name: windows-builds-${{ matrix.framework }}
         path: |
-          ${{ github.workspace }}/src/bin/Release/net8.0-windows10.0.22000.0/win-x64/publish/
-          ${{ github.workspace }}/src/bin/Release/net8.0-windows10.0.22000.0/win-arm64/publish/
+          ${{ github.workspace }}/src/bin/Release/${{ matrix.framework }}-windows10.0.22000.0/win-x64/publish/
+          ${{ github.workspace }}/src/bin/Release/${{ matrix.framework }}-windows10.0.22000.0/win-arm64/publish/
diff --git a/src/FacepunchCommitsMonitor.csproj b/src/FacepunchCommitsMonitor.csproj
index dd0d32b..273e303 100644
--- a/src/FacepunchCommitsMonitor.csproj
+++ b/src/FacepunchCommitsMonitor.csproj
@@ -2,7 +2,7 @@
 	<!-- https://docs.microsoft.com/en-us/windows/apps/desktop/modernize/desktop-to-uwp-enhance -->
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.22000.0</TargetFramework> <!-- Windows 11 -->
+		<TargetFrameworks>net8.0-windows10.0.22000.0;net9.0-windows10.0.22000.0</TargetFrameworks> <!-- Windows 11 -->
 		<TargetPlatformMinVersion>10.0.19044.3693</TargetPlatformMinVersion> <!-- Windows 10 version 21H2 (November 2021 Update) -->
 		<PublishSingleFile>true</PublishSingleFile>
 		<Platforms>win-arm64;x64</Platforms>
diff --git a/tests/FacepunchCommitsMonitorTests.csproj b/tests/FacepunchCommitsMonitorTests.csproj
index 01a4477..d5a8913 100644
--- a/tests/FacepunchCommitsMonitorTests.csproj
+++ b/tests/FacepunchCommitsMonitorTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.22000.0</TargetFramework> <!-- Windows 11 -->
+		<TargetFrameworks>net8.0-windows10.0.22000.0;net9.0-windows10.0.22000.0</TargetFrameworks> <!-- Windows 11 -->
 		<TargetPlatformMinVersion>10.0.19044.3693</TargetPlatformMinVersion> <!-- Windows 10 version 21H2 (November 2021 Update) -->
 		<Platforms>win-arm64;x64</Platforms>
 		<Nullable>enable</Nullable>