Add support for EF Core 9 (#54)

axelheer · Nov 13, 2024 · 48d0145 · 48d0145
1 parent 36b6d55
commit 48d0145
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 25 deletions.
diff --git a/.github/workflows/everything.yml b/.github/workflows/everything.yml
@@ -5,7 +5,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        framework: [ 'net8.0', 'net6.0' ]
+        framework: [ 'net9.0', 'net8.0', 'net6.0' ]
         include:
         - os: windows-latest
           framework: net48
@@ -20,6 +20,7 @@ jobs:
         dotnet-version: |
           6.0.x
           8.0.x
+          9.0.x
     - name: Run tests (${{ matrix.framework }})
       run: dotnet test --configuration Release --framework ${{ matrix.framework }} --results-directory test-results --settings test.runsettings
     - name: Publish coverage
@@ -39,6 +40,7 @@ jobs:
         dotnet-version: |
           6.0.x
           8.0.x
+          9.0.x
     - name: Create packages (w/o version suffix)
       run: dotnet pack --configuration Release --include-symbols --property:PackageOutputPath=${{ runner.temp }}\pkg
       if: startsWith(github.ref, 'refs/tags/v') == true

diff --git a/build.props b/build.props
@@ -1,9 +1,10 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>12.0</LangVersion>
+    <AnalysisMode>All</AnalysisMode>
+    <LangVersion>13.0</LangVersion>
     <Nullable>Enable</Nullable>
-    <VersionPrefix>7.1.0</VersionPrefix>
+    <VersionPrefix>7.2.0</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -20,12 +21,6 @@
     <Using Include="System.Threading.Tasks" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <AnalysisLevel>latest</AnalysisLevel>
-    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-  </PropertyGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="CLSCompliantAttribute">
       <_Parameter1>true</_Parameter1>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.400"
+    "version": "9.0.100"
   }
 }
diff --git a/pack.props b/pack.props
@@ -36,7 +36,7 @@ To support different LINQ implementations, the following flavours are available.
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>http://nein.tech/nein-linq</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>Allow static Expression injection for instance methods.</PackageReleaseNotes>
+    <PackageReleaseNotes>Added support for EF Core 9.</PackageReleaseNotes>
     <PackageTags>LINQ;EF;IX</PackageTags>
   </PropertyGroup>
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <DefaultNamespace>NeinLinq</DefaultNamespace>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/NeinLinq.Async/DynamicAsyncQueryable.cs b/src/NeinLinq.Async/DynamicAsyncQueryable.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CA2263
+
 namespace NeinLinq;
 
 /// <summary>

diff --git a/src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapter.cs b/src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapter.cs
@@ -3,7 +3,7 @@
 
 namespace NeinLinq;
 
-#pragma warning disable CA1812, EF1001
+#pragma warning disable CA1812, EF1001, EF9100
 
 internal sealed class EntityQueryCompilerAdapter<TInnerCompiler> : IQueryCompiler
     where TInnerCompiler : IQueryCompiler
@@ -29,11 +29,18 @@ public Func<QueryContext, TResult> CreateCompiledQuery<TResult>(Expression query
     public Func<QueryContext, TResult> CreateCompiledAsyncQuery<TResult>(Expression query)
         => innerCompiler.CreateCompiledQuery<TResult>(RewriteQuery(query));
 
+    public Expression<Func<QueryContext, TResult>> PrecompileQuery<TResult>(Expression query, bool async)
+#if NET9_0_OR_GREATER
+        => innerCompiler.PrecompileQuery<TResult>(RewriteQuery(query), async);
+#else
+        => throw new NotSupportedException(".NET 9.0 or greater only.");
+#endif
+
     private readonly ExpressionVisitor cleaner
         = new RewriteQueryCleaner();
 
     private Expression RewriteQuery(Expression query)
         => options.Rewriters.Prepend(cleaner).Aggregate(query, (q, r) => r.Visit(q));
 }
 
-#pragma warning restore CA1812, EF1001
+#pragma warning restore CA1812, EF1001, EF9100
diff --git a/src/NeinLinq.EntityFrameworkCore/EntityQueryProviderAdapter.cs b/src/NeinLinq.EntityFrameworkCore/EntityQueryProviderAdapter.cs
@@ -45,6 +45,9 @@ public TResult Execute<TResult>(Expression query)
 
         public TResult ExecuteAsync<TResult>(Expression query, CancellationToken cancellationToken)
             => throw new NotSupportedException();
+
+        public Expression<Func<QueryContext, TResult>> PrecompileQuery<TResult>(Expression query, bool async)
+            => throw new NotSupportedException();
     }
 }
 

diff --git a/src/NeinLinq.EntityFrameworkCore/NeinLinq.EntityFrameworkCore.csproj b/src/NeinLinq.EntityFrameworkCore/NeinLinq.EntityFrameworkCore.csproj
@@ -1,11 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.36" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NeinLinq/DynamicExpression.cs b/src/NeinLinq/DynamicExpression.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CA2263
+
 namespace NeinLinq;
 
 /// <summary>

diff --git a/src/NeinLinq/DynamicQuery.cs b/src/NeinLinq/DynamicQuery.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CA2263
+
 namespace NeinLinq;
 
 /// <summary>

diff --git a/src/NeinLinq/DynamicQueryable.cs b/src/NeinLinq/DynamicQueryable.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CA2263
+
 namespace NeinLinq;
 
 /// <summary>

diff --git a/src/NeinLinq/NeinLinq.csproj b/src/NeinLinq/NeinLinq.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net48' ">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -4,12 +4,12 @@
 
   <PropertyGroup>
     <DefaultNamespace>NeinLinq.Tests</DefaultNamespace>
-    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/NeinLinq.EntityFramework.Tests/EntityFrameworkConfiguration.cs b/test/NeinLinq.EntityFramework.Tests/EntityFrameworkConfiguration.cs
@@ -7,7 +7,7 @@
 
 namespace NeinLinq.Tests;
 
-public class TestConfiguration : DbConfiguration, IDbConnectionFactory
+internal class TestConfiguration : DbConfiguration, IDbConnectionFactory
 {
     public TestConfiguration()
     {

diff --git a/test/NeinLinq.EntityFramework.Tests/NeinLinq.EntityFramework.Tests.csproj b/test/NeinLinq.EntityFramework.Tests/NeinLinq.EntityFramework.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
+    <PackageReference Include="System.Data.SQLite" Version="1.0.119" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/NeinLinq.EntityFrameworkCore.Tests/NeinLinq.EntityFrameworkCore.Tests.csproj b/test/NeinLinq.EntityFrameworkCore.Tests/NeinLinq.EntityFrameworkCore.Tests.csproj
@@ -1,11 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.36" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/NeinLinq.Tests/DynamicQueryTest.cs b/test/NeinLinq.Tests/DynamicQueryTest.cs
@@ -156,7 +156,7 @@ private class Model
         public OneTwo? OneTwoMaybe { get; set; }
     }
 
-    public enum OneTwo
+    private enum OneTwo
     {
         Undefined = 0,
         One = 1,

diff --git a/test/NeinLinq.Tests/NullsafeQueryTest.cs b/test/NeinLinq.Tests/NullsafeQueryTest.cs
@@ -1,5 +1,7 @@
 using Xunit;
 
+#pragma warning disable CA1859
+
 namespace NeinLinq.Tests;
 
 public class NullsafeQueryTest