From 33b4fa345ad8db68ab45f31c4b2c3999510a03ac Mon Sep 17 00:00:00 2001
From: Sean Farrow <sean.farrow@seanfarrow.co.uk>
Date: Thu, 21 Sep 2023 14:48:44 +0100
Subject: [PATCH 1/2] Upgrade the .Net SDK to version 8.0 RC1.

---
 global.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/global.json b/global.json
index 68bdb45..119ffd8 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "7.0.400",
-    "rollForward": "latestPatch",
-    "allowPrerelease": false
+    "version": "8.0.100-rc.1.23455.8",
+    "rollForward": "latestMinor",
+    "allowPrerelease": true
   }
 }
\ No newline at end of file

From 3f2ae162b0e10437a56905cf8395d292b507b16c Mon Sep 17 00:00:00 2001
From: Sean Farrow <sean.farrow@seanfarrow.co.uk>
Date: Thu, 21 Sep 2023 15:05:36 +0100
Subject: [PATCH 2/2] Ensure all project can compile agains .Net 8.0 as a
 target.

---
 .../Marvin.Cache.Headers.Sample.csproj                |  2 +-
 ...Marvin.Cache.Headers.DistributedStore.Redis.csproj |  2 +-
 .../Marvin.Cache.Headers.DistributedStore.csproj      |  2 +-
 src/Marvin.Cache.Headers/Marvin.Cache.Headers.csproj  | 11 ++++++++++-
 ...n.Cache.Headers.DistributedStore.Redis.Test.csproj |  2 +-
 .../Marvin.Cache.Headers.DistributedStore.Test.csproj |  2 +-
 .../Marvin.Cache.Headers.Test.csproj                  |  6 +++++-
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/sample/Marvin.Cache.Headers.Sample/Marvin.Cache.Headers.Sample.csproj b/sample/Marvin.Cache.Headers.Sample/Marvin.Cache.Headers.Sample.csproj
index 08630e4..f2e9518 100644
--- a/sample/Marvin.Cache.Headers.Sample/Marvin.Cache.Headers.Sample.csproj
+++ b/sample/Marvin.Cache.Headers.Sample/Marvin.Cache.Headers.Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/src/Marvin.Cache.Headers.DistributedStore.Redis/Marvin.Cache.Headers.DistributedStore.Redis.csproj b/src/Marvin.Cache.Headers.DistributedStore.Redis/Marvin.Cache.Headers.DistributedStore.Redis.csproj
index 20dc031..78217af 100644
--- a/src/Marvin.Cache.Headers.DistributedStore.Redis/Marvin.Cache.Headers.DistributedStore.Redis.csproj
+++ b/src/Marvin.Cache.Headers.DistributedStore.Redis/Marvin.Cache.Headers.DistributedStore.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<AssemblyName>Marvin.Cache.Headers.DistributedStore.Redis</AssemblyName>
 		<PackageId>Marvin.Cache.Headers.DistributedStore.Redis</PackageId>
diff --git a/src/Marvin.Cache.Headers.DistributedStore/Marvin.Cache.Headers.DistributedStore.csproj b/src/Marvin.Cache.Headers.DistributedStore/Marvin.Cache.Headers.DistributedStore.csproj
index 6b0522c..a9485c6 100644
--- a/src/Marvin.Cache.Headers.DistributedStore/Marvin.Cache.Headers.DistributedStore.csproj
+++ b/src/Marvin.Cache.Headers.DistributedStore/Marvin.Cache.Headers.DistributedStore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<AssemblyName>Marvin.Cache.Headers.DistributedStore</AssemblyName>
 		<PackageId>Marvin.Cache.Headers.DistributedStore</PackageId>
diff --git a/src/Marvin.Cache.Headers/Marvin.Cache.Headers.csproj b/src/Marvin.Cache.Headers/Marvin.Cache.Headers.csproj
index 4ff6da3..550f040 100755
--- a/src/Marvin.Cache.Headers/Marvin.Cache.Headers.csproj
+++ b/src/Marvin.Cache.Headers/Marvin.Cache.Headers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<AssemblyName>Marvin.Cache.Headers</AssemblyName>
 		<PackageId>Marvin.Cache.Headers</PackageId>
@@ -24,6 +24,10 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
@@ -34,6 +38,11 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
   </ItemGroup>
   
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0-rc.1.23419.4" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0-rc.1.23419.4" />
+  </ItemGroup>
+
   <PropertyGroup>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 	</PropertyGroup>
diff --git a/test/Marvin.Cache.Headers.DistributedStore.Redis.Test/Marvin.Cache.Headers.DistributedStore.Redis.Test.csproj b/test/Marvin.Cache.Headers.DistributedStore.Redis.Test/Marvin.Cache.Headers.DistributedStore.Redis.Test.csproj
index aaa923e..3a34661 100644
--- a/test/Marvin.Cache.Headers.DistributedStore.Redis.Test/Marvin.Cache.Headers.DistributedStore.Redis.Test.csproj
+++ b/test/Marvin.Cache.Headers.DistributedStore.Redis.Test/Marvin.Cache.Headers.DistributedStore.Redis.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Marvin.Cache.Headers.DistributedStore.Redis.Test</AssemblyName>
     <PackageId>Marvin.Cache.Headers.DistributedStore.Redis.Test</PackageId>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
diff --git a/test/Marvin.Cache.Headers.DistributedStore.Test/Marvin.Cache.Headers.DistributedStore.Test.csproj b/test/Marvin.Cache.Headers.DistributedStore.Test/Marvin.Cache.Headers.DistributedStore.Test.csproj
index f198322..b1fc64c 100644
--- a/test/Marvin.Cache.Headers.DistributedStore.Test/Marvin.Cache.Headers.DistributedStore.Test.csproj
+++ b/test/Marvin.Cache.Headers.DistributedStore.Test/Marvin.Cache.Headers.DistributedStore.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Marvin.Cache.Headers.DistributedStore.Test</AssemblyName>
     <PackageId>Marvin.Cache.Headers.DistributedStore.Test</PackageId>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
diff --git a/test/Marvin.Cache.Headers.Test/Marvin.Cache.Headers.Test.csproj b/test/Marvin.Cache.Headers.Test/Marvin.Cache.Headers.Test.csproj
index 4dabab6..de9c0a1 100644
--- a/test/Marvin.Cache.Headers.Test/Marvin.Cache.Headers.Test.csproj
+++ b/test/Marvin.Cache.Headers.Test/Marvin.Cache.Headers.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <AssemblyName>Marvin.Cache.Headers.Test</AssemblyName>
     <PackageId>Marvin.Cache.Headers.Test</PackageId>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
@@ -14,6 +14,10 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
       </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.1.23421.29" />
+      </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />