Merge pull request #127 from SeanFarrow/feature/sf/126-use-dotnet-8.0

Add .Net 8 as a target to all projects
KevinDockx · Sep 22, 2023 · 07c0eba · 07c0eba
2 parents 98d11e7 + 3f2ae16
commit 07c0eba
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git 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
   }
 }
diff --git 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/...n.Cache.Headers.DistributedStore.Redis/Marvin.Cache.Headers.DistributedStore.Redis.csproj b/...n.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
@@ -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
@@ -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/...aders.DistributedStore.Redis.Test/Marvin.Cache.Headers.DistributedStore.Redis.Test.csproj b/...aders.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/...vin.Cache.Headers.DistributedStore.Test/Marvin.Cache.Headers.DistributedStore.Test.csproj b/...vin.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
@@ -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" />