Add .NET 7 and EF Core 7 targets (#180)

scottksmith95 · Nov 9, 2022 · 8ea1c89 · 8ea1c89
1 parent 56c95ba
commit 8ea1c89
Show file tree

Hide file tree

Showing 10 changed files with 379 additions and 227 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,18 +16,23 @@ jobs:
         echo "GITHUB_RUN_NUMBER is ${env:GITHUB_RUN_NUMBER}"
           
     - uses: actions/checkout@v2
+
+    - uses: actions/setup-dotnet@v1
+      with:
+       dotnet-version: '7.0.x'
 
     - name: Build Projects
       run: |
         dotnet build ./src/LinqKit.Core/LinqKit.Core.csproj -c ReleaseForGithubActions
         dotnet build ./src/LinqKit/LinqKit.csproj -c ReleaseForGithubActions
         dotnet build ./src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj -c ReleaseForGithubActions
         dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
-        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore2/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
-        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore3/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
-        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
-        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
-        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
+        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore2/LinqKit.Microsoft.EntityFrameworkCore2.csproj -c ReleaseForGithubActions
+        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore3/LinqKit.Microsoft.EntityFrameworkCore3.csproj -c ReleaseForGithubActions
+        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore31.csproj -c ReleaseForGithubActions
+        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore5.csproj -c ReleaseForGithubActions
+        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore6.csproj -c ReleaseForGithubActions
+        dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore7/LinqKit.Microsoft.EntityFrameworkCored7.csproj -c ReleaseForGithubActions
         dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c ReleaseForGithubActions
     
     - name: Run Tests
@@ -36,4 +41,5 @@ jobs:
         dotnet test ./tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj -c ReleaseForGithubActions
         dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore31.Tests -c ReleaseForGithubActions
         dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore5.Tests -c ReleaseForGithubActions
-        dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c ReleaseForGithubActions  
+        dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c ReleaseForGithubActions
+        dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests -c ReleaseForGithubActions
diff --git a/LinqKit Solution.sln b/LinqKit Solution.sln
@@ -110,6 +110,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppVeyor", "AppVeyor", "{EE
 		appveyor.yml = appveyor.yml
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFrameworkCore7", "src\LinqKit.Microsoft.EntityFrameworkCore7\LinqKit.Microsoft.EntityFrameworkCore7.csproj", "{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFrameworkCore7.Tests", "tests\LinqKit.Microsoft.EntityFrameworkCore7.Tests\LinqKit.Microsoft.EntityFrameworkCore7.Tests.csproj", "{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -637,6 +641,38 @@ Global
 		{2D757B6D-C987-4832-94E2-E3D11A1B6D6D}.Release|x64.Build.0 = Release|Any CPU
 		{2D757B6D-C987-4832-94E2-E3D11A1B6D6D}.Release|x86.ActiveCfg = Release|Any CPU
 		{2D757B6D-C987-4832-94E2-E3D11A1B6D6D}.Release|x86.Build.0 = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x64.Build.0 = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x86.Build.0 = Debug|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|ARM.Build.0 = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x64.ActiveCfg = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x64.Build.0 = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x86.ActiveCfg = Release|Any CPU
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x86.Build.0 = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x64.Build.0 = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x86.Build.0 = Debug|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|ARM.Build.0 = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x64.ActiveCfg = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x64.Build.0 = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x86.ActiveCfg = Release|Any CPU
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -677,6 +713,8 @@ Global
 		{84FE1714-2551-4094-A4C1-1C1ADC16339D} = {2F7F283D-5576-417F-A467-EC210226AC3B}
 		{2D757B6D-C987-4832-94E2-E3D11A1B6D6D} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
 		{EE0B5A0E-533F-47B7-8D42-4D7B0D3D78F3} = {9FC09568-C879-47D8-9D28-E736B8A84C95}
+		{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD} = {2F7F283D-5576-417F-A467-EC210226AC3B}
+		{B85B8655-37CC-4273-BCF6-7F96D5A25BC5} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8F6283C5-9029-434E-BD90-E95FB377DA9B}

diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@
 | LinqKit.Microsoft.EntityFrameworkCore 3 | [![Nuget](https://img.shields.io/badge/nuget-v3.1.0-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/3.1.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 3.0.1 (netstandard2.0)</li><li>≥ 3.0.0 (netstandard2.1) | <ul><li>netstandard2.0</li><li>netstandard2.1</li></ul>|
 | LinqKit.Microsoft.EntityFrameworkCore 5 | [![Nuget](https://img.shields.io/badge/nuget-v5.1.0-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/5.1.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 5.0.0</li></ul> | <ul><li>netstandard2.1</li></ul>|
 | LinqKit.Microsoft.EntityFrameworkCore 6 | [![Nuget](https://img.shields.io/badge/nuget-v6.1.0-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/6.1.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 6.0.0</li></ul> | <ul><li>net6.0</li></ul>|
+| LinqKit.Microsoft.EntityFrameworkCore 7 | [![Nuget](https://img.shields.io/badge/nuget-v7.1.0-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/7.0.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 7.0.0</li></ul> | <ul><li>net6.0</li><li>net7.0</li></ul>|
 | LinqKit.Z.EntityFramework.Classic | [![Nuget](https://img.shields.io/nuget/v/LinqKit.Z.EntityFramework.Classic) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Z.EntityFramework.Classic)](https://www.nuget.org/packages/LinqKit.Z.EntityFramework.Classic) | Z.EntityFramework.Classic<ul><li>≥ 7.0.40</li></ul> | <ul><li>net40</li><li>net45</li><li>netstandard2.0</li></ul>|
 
 

diff --git a/src/LinqKit.Core/ExpressionStarter.cs b/src/LinqKit.Core/ExpressionStarter.cs
@@ -165,7 +165,7 @@ public static implicit operator ExpressionStarter<T>(Expression<Func<T, bool>> r
         public bool TailCall => Predicate.TailCall;
 #endif
 
-#if !(NET35 || WINDOWS_APP || NETSTANDARD || PORTABLE || PORTABLE40 || UAP || EFCORE6)
+#if !(NET35 || WINDOWS_APP || NETSTANDARD || PORTABLE || PORTABLE40 || UAP || EFCORE6 || EFCORE7)
         /// <summary></summary>
         [Pure]
         public void CompileToMethod(MethodBuilder method) { Predicate.CompileToMethod(method); }