From e897a15bc66eb3cf0d3a344611653d88cf2fd962 Mon Sep 17 00:00:00 2001
From: Steffen Kolmer <steffen@kolmer.net>
Date: Tue, 12 Nov 2024 21:19:39 +0100
Subject: [PATCH] feat: .NET 9 support

---
 .github/workflows/codeql.yml                       |  2 +-
 .github/workflows/publush.yml                      |  2 +-
 .github/workflows/pullRequest.yml                  |  2 +-
 .../Gridify.Elasticsearch.csproj                   |  2 +-
 .../Gridify.EntityFramework.csproj                 |  5 ++++-
 src/Gridify/Gridify.csproj                         |  6 +++++-
 .../EntityFrameworkIntegrationTests.cs.csproj      | 12 ++++++------
 ...ntityFrameworkPostgreSqlIntegrationTests.csproj | 14 +++++++-------
 ...tityFrameworkSqlProviderIntegrationTests.csproj | 14 +++++++-------
 .../Gridify.Elasticsearch.Tests.csproj             |  8 ++++----
 test/Gridify.Tests/Gridify.Tests.csproj            | 14 +++++++-------
 11 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index bb839717..d55044b5 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -66,7 +66,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Build
       env:
         HUSKY: 0
diff --git a/.github/workflows/publush.yml b/.github/workflows/publush.yml
index ca36e84c..3ff40f8f 100644
--- a/.github/workflows/publush.yml
+++ b/.github/workflows/publush.yml
@@ -17,7 +17,7 @@ jobs:
          - name: Setup .NET
            uses: actions/setup-dotnet@v3
            with:
-              dotnet-version: 8.0.x
+              dotnet-version: 9.0.x
          - name: Restore dependencies
            run: dotnet restore
          - name: Build
diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
index 66177a2e..8c40637f 100644
--- a/.github/workflows/pullRequest.yml
+++ b/.github/workflows/pullRequest.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj b/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj
index 683b4ee9..737b6c8f 100644
--- a/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj
+++ b/src/Gridify.Elasticsearch/Gridify.Elasticsearch.csproj
@@ -13,7 +13,7 @@
       <IncludeSymbols>true</IncludeSymbols>
       <SymbolPackageFormat>snupkg</SymbolPackageFormat>
       <PackageReadmeFile>README.md</PackageReadmeFile>
-      <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
+      <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0;net9.0</TargetFrameworks>
       <LangVersion>default</LangVersion>
       <Nullable>enable</Nullable>
    </PropertyGroup>
diff --git a/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj b/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj
index 30eaf9e0..6d3076f4 100644
--- a/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj
+++ b/src/Gridify.EntityFramework/Gridify.EntityFramework.csproj
@@ -14,7 +14,7 @@
       <IncludeSymbols>true</IncludeSymbols>
       <SymbolPackageFormat>snupkg</SymbolPackageFormat>
       <PackageReadmeFile>README.md</PackageReadmeFile>
-      <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
+      <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0;net9.0</TargetFrameworks>
       <LangVersion>default</LangVersion>
       <Nullable>enable</Nullable>
    </PropertyGroup>
@@ -43,4 +43,7 @@
    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
       <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.0.0,9.0.0)" />
    </ItemGroup>
+   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="[9.0.0,10.0.0)" />
+   </ItemGroup>
 </Project>
diff --git a/src/Gridify/Gridify.csproj b/src/Gridify/Gridify.csproj
index 155ff3d1..d9a69cc3 100644
--- a/src/Gridify/Gridify.csproj
+++ b/src/Gridify/Gridify.csproj
@@ -18,7 +18,7 @@
       <SymbolPackageFormat>snupkg</SymbolPackageFormat>
       <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
       <PackageReadmeFile>README.md</PackageReadmeFile>
-      <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
+      <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1;net7.0;net8.0;net9.0</TargetFrameworks>
 
    </PropertyGroup>
 
@@ -26,6 +26,10 @@
       <None Include="..\..\README.md" Pack="true" PackagePath="\" />
    </ItemGroup>
 
+   <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.0,10.0.0)" />
+   </ItemGroup>
+
    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[8.0.0,9.0.0)" />
    </ItemGroup>
diff --git a/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj b/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj
index 4029905c..d4ad9236 100644
--- a/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj
+++ b/test/EntityFrameworkIntegrationTests/EntityFrameworkIntegrationTests.cs.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-      <PackageReference Include="xunit" Version="2.6.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+      <PackageReference Include="xunit" Version="2.9.2" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
diff --git a/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj b/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj
index 43f6b922..e89d400a 100644
--- a/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj
+++ b/test/EntityFrameworkPostgreSqlIntegrationTests/EntityFrameworkPostgreSqlIntegrationTests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
-      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.2" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-       <PackageReference Include="xunit" Version="2.6.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+      <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0-rc.2" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+       <PackageReference Include="xunit" Version="2.9.2" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
diff --git a/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj b/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj
index 5b43b97f..6f8844a2 100644
--- a/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj
+++ b/test/EntityFrameworkSqlProviderIntegrationTests/EntityFrameworkSqlProviderIntegrationTests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
    <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
       <RootNamespace>EntityFrameworkIntegrationTests.cs</RootNamespace>
    </PropertyGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
       <PackageReference Include="xRetry" Version="1.9.0" />
-      <PackageReference Include="xunit" Version="2.6.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+      <PackageReference Include="xunit" Version="2.9.2" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
diff --git a/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj b/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj
index c19e7020..a786781e 100644
--- a/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj
+++ b/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
    <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
       <IsPackable>false</IsPackable>
       <LangVersion>latest</LangVersion>
       <Nullable>enable</Nullable>
@@ -10,9 +10,9 @@
    <ItemGroup>
       <PackageReference Include="AutoBogus" Version="2.13.1" />
       <PackageReference Include="FluentAssertions.Json" Version="6.1.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-      <PackageReference Include="xunit" Version="2.6.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+      <PackageReference Include="xunit" Version="2.9.2" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
          <PrivateAssets>all</PrivateAssets>
          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
diff --git a/test/Gridify.Tests/Gridify.Tests.csproj b/test/Gridify.Tests/Gridify.Tests.csproj
index 725a2a52..9459dccb 100644
--- a/test/Gridify.Tests/Gridify.Tests.csproj
+++ b/test/Gridify.Tests/Gridify.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
    <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
       <IsPackable>false</IsPackable>
       <LangVersion>latest</LangVersion>
       <Nullable>enable</Nullable>
@@ -9,12 +9,12 @@
 
    <ItemGroup>
       <PackageReference Include="AutoBogus" Version="2.13.1" />
-      <PackageReference Include="FluentAssertions" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-      <PackageReference Include="NSubstitute" Version="5.1.0" />
-      <PackageReference Include="xunit" Version="2.6.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+      <PackageReference Include="FluentAssertions" Version="6.12.2" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+      <PackageReference Include="NSubstitute" Version="5.3.0" />
+      <PackageReference Include="xunit" Version="2.9.2" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>