Skip to content

Commit 8ea1c89

Browse files
StefHStefH
authored
Add .NET 7 and EF Core 7 targets (#180)
1 parent 56c95ba commit 8ea1c89

File tree

10 files changed

+379
-227
lines changed

10 files changed

+379
-227
lines changed

‎.github/workflows/main.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,23 @@ jobs:
1616
echo "GITHUB_RUN_NUMBER is ${env:GITHUB_RUN_NUMBER}"
1717
1818
- uses: actions/checkout@v2
19+
20+
- uses: actions/setup-dotnet@v1
21+
with:
22+
dotnet-version: '7.0.x'
1923

2024
- name: Build Projects
2125
run: |
2226
dotnet build ./src/LinqKit.Core/LinqKit.Core.csproj -c ReleaseForGithubActions
2327
dotnet build ./src/LinqKit/LinqKit.csproj -c ReleaseForGithubActions
2428
dotnet build ./src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj -c ReleaseForGithubActions
2529
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
26-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore2/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
27-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore3/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
28-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
29-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
30-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
30+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore2/LinqKit.Microsoft.EntityFrameworkCore2.csproj -c ReleaseForGithubActions
31+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore3/LinqKit.Microsoft.EntityFrameworkCore3.csproj -c ReleaseForGithubActions
32+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore31.csproj -c ReleaseForGithubActions
33+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore5.csproj -c ReleaseForGithubActions
34+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore6.csproj -c ReleaseForGithubActions
35+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore7/LinqKit.Microsoft.EntityFrameworkCored7.csproj -c ReleaseForGithubActions
3136
dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c ReleaseForGithubActions
3237
3338
- name: Run Tests
@@ -36,4 +41,5 @@ jobs:
3641
dotnet test ./tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj -c ReleaseForGithubActions
3742
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore31.Tests -c ReleaseForGithubActions
3843
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore5.Tests -c ReleaseForGithubActions
39-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c ReleaseForGithubActions
44+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c ReleaseForGithubActions
45+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests -c ReleaseForGithubActions

‎LinqKit Solution.sln

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppVeyor", "AppVeyor", "{EE
110110
appveyor.yml = appveyor.yml
111111
EndProjectSection
112112
EndProject
113+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFrameworkCore7", "src\LinqKit.Microsoft.EntityFrameworkCore7\LinqKit.Microsoft.EntityFrameworkCore7.csproj", "{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}"
114+
EndProject
115+
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}"
116+
EndProject
113117
Global
114118
GlobalSection(SolutionConfigurationPlatforms) = preSolution
115119
Debug|Any CPU = Debug|Any CPU
@@ -637,6 +641,38 @@ Global
637641
{2D757B6D-C987-4832-94E2-E3D11A1B6D6D}.Release|x64.Build.0 = Release|Any CPU
638642
{2D757B6D-C987-4832-94E2-E3D11A1B6D6D}.Release|x86.ActiveCfg = Release|Any CPU
639643
{2D757B6D-C987-4832-94E2-E3D11A1B6D6D}.Release|x86.Build.0 = Release|Any CPU
644+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
645+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
646+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|ARM.ActiveCfg = Debug|Any CPU
647+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|ARM.Build.0 = Debug|Any CPU
648+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x64.ActiveCfg = Debug|Any CPU
649+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x64.Build.0 = Debug|Any CPU
650+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x86.ActiveCfg = Debug|Any CPU
651+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Debug|x86.Build.0 = Debug|Any CPU
652+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
653+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|Any CPU.Build.0 = Release|Any CPU
654+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|ARM.ActiveCfg = Release|Any CPU
655+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|ARM.Build.0 = Release|Any CPU
656+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x64.ActiveCfg = Release|Any CPU
657+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x64.Build.0 = Release|Any CPU
658+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x86.ActiveCfg = Release|Any CPU
659+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD}.Release|x86.Build.0 = Release|Any CPU
660+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
661+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
662+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|ARM.ActiveCfg = Debug|Any CPU
663+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|ARM.Build.0 = Debug|Any CPU
664+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x64.ActiveCfg = Debug|Any CPU
665+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x64.Build.0 = Debug|Any CPU
666+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x86.ActiveCfg = Debug|Any CPU
667+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Debug|x86.Build.0 = Debug|Any CPU
668+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
669+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|Any CPU.Build.0 = Release|Any CPU
670+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|ARM.ActiveCfg = Release|Any CPU
671+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|ARM.Build.0 = Release|Any CPU
672+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x64.ActiveCfg = Release|Any CPU
673+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x64.Build.0 = Release|Any CPU
674+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x86.ActiveCfg = Release|Any CPU
675+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5}.Release|x86.Build.0 = Release|Any CPU
640676
EndGlobalSection
641677
GlobalSection(SolutionProperties) = preSolution
642678
HideSolutionNode = FALSE
@@ -677,6 +713,8 @@ Global
677713
{84FE1714-2551-4094-A4C1-1C1ADC16339D} = {2F7F283D-5576-417F-A467-EC210226AC3B}
678714
{2D757B6D-C987-4832-94E2-E3D11A1B6D6D} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
679715
{EE0B5A0E-533F-47B7-8D42-4D7B0D3D78F3} = {9FC09568-C879-47D8-9D28-E736B8A84C95}
716+
{9FA2B3FF-C1F7-457C-A57E-CD635834AEAD} = {2F7F283D-5576-417F-A467-EC210226AC3B}
717+
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
680718
EndGlobalSection
681719
GlobalSection(ExtensibilityGlobals) = postSolution
682720
SolutionGuid = {8F6283C5-9029-434E-BD90-E95FB377DA9B}

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
| 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>|
1818
| 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>|
1919
| 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>|
20+
| 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>|
2021
| 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>|
2122

2223

‎src/LinqKit.Core/ExpressionStarter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public static implicit operator ExpressionStarter<T>(Expression<Func<T, bool>> r
165165
public bool TailCall => Predicate.TailCall;
166166
#endif
167167

168-
#if !(NET35 || WINDOWS_APP || NETSTANDARD || PORTABLE || PORTABLE40 || UAP || EFCORE6)
168+
#if !(NET35 || WINDOWS_APP || NETSTANDARD || PORTABLE || PORTABLE40 || UAP || EFCORE6 || EFCORE7)
169169
/// <summary></summary>
170170
[Pure]
171171
public void CompileToMethod(MethodBuilder method) { Predicate.CompileToMethod(method); }

0 commit comments

Comments
 (0)