From f026069d01338ef5a7b041fb21d4dbe3765b8282 Mon Sep 17 00:00:00 2001
From: Benjamin Van Renterghem
 <42121860+benjaminvanrenterghem@users.noreply.github.com>
Date: Tue, 20 Aug 2024 02:15:40 +0200
Subject: [PATCH] Add .NET 8 support

---
 .github/workflows/build.yml            | 4 ++++
 .github/workflows/release.yml          | 4 ++++
 src/Core/AspNetCore.Proxy.csproj       | 4 ++--
 src/Test/AspNetCore.Proxy.Tests.csproj | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3a3029..aae2f65 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,10 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '7.0'
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
     - name: Build and run tests.
       run: dotnet test --collect:"XPlat Code Coverage"
     - name: Make artifacts directory.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1088118..101cb94 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,6 +24,10 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '7.0'
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
     - name: Build package for Release.
       run: dotnet pack -c Release
       if: github.event.action == 'published'
diff --git a/src/Core/AspNetCore.Proxy.csproj b/src/Core/AspNetCore.Proxy.csproj
index a285d20..2b3fa42 100644
--- a/src/Core/AspNetCore.Proxy.csproj
+++ b/src/Core/AspNetCore.Proxy.csproj
@@ -3,10 +3,10 @@
   <PropertyGroup>
     <AssemblyName>AspNetCore.Proxy</AssemblyName>
     <PackageId>AspNetCore.Proxy</PackageId>
-    <Version>4.5.0</Version>
+    <Version>4.6.0</Version>
     <PackageProjectUrl>https://github.com/twitchax/aspnetcore.proxy</PackageProjectUrl>
 
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <IsTestProject>false</IsTestProject>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Test/AspNetCore.Proxy.Tests.csproj b/src/Test/AspNetCore.Proxy.Tests.csproj
index 26ba29a..7bca47a 100644
--- a/src/Test/AspNetCore.Proxy.Tests.csproj
+++ b/src/Test/AspNetCore.Proxy.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.25" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.8" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="Moq" Version="4.18.1" />