Skip to content

Fix LeftJoin for .NET 10 #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StefH merged 5 commits into from
Jan 28, 2026
Merged

Fix LeftJoin for .NET 10 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac688cf
Fix LeftJoin for .NET 10
StefH Jan 28, 2026
0af494e
appveyor
StefH Jan 28, 2026
8524ac5
appv 2
StefH Jan 28, 2026
1b9336f
8910
StefH Jan 28, 2026
0a45a55
-c
StefH Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:

env:
Prerelease: ci
CONFIGURATION: ReleaseForGithubActions

steps:
- name: Print GITHUB_RUN_NUMBER
Expand All @@ -28,29 +29,30 @@ jobs:

- 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.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.EntityFrameworkCore7.csproj -c ReleaseForGithubActions
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCore8.csproj -c ReleaseForGithubActions
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore9/LinqKit.Microsoft.EntityFrameworkCore9.csproj -c ReleaseForGithubActions
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore10/LinqKit.Microsoft.EntityFrameworkCore10.csproj -c ReleaseForGithubActions
dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c ReleaseForGithubActions
dotnet build ./src/LinqKit.Core/LinqKit.Core.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit/LinqKit.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore/LinqKit.Microsoft.EntityFrameworkCore.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore2/LinqKit.Microsoft.EntityFrameworkCore2.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore3/LinqKit.Microsoft.EntityFrameworkCore3.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore31.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore5.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore6.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore7/LinqKit.Microsoft.EntityFrameworkCore7.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCore8.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore9/LinqKit.Microsoft.EntityFrameworkCore9.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore10/LinqKit.Microsoft.EntityFrameworkCore10.csproj -c $env:CONFIGURATION
dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c $env:CONFIGURATION

- name: Run Tests
run: |
dotnet test ./tests/LinqKit.Tests/LinqKit.Tests.csproj -c ReleaseForGithubActions
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.EntityFrameworkCore7.Tests -c ReleaseForGithubActions
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c ReleaseForGithubActions
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests -c ReleaseForGithubActions
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore10.Tests -c ReleaseForGithubActions
dotnet test ./tests/LinqKit.Core.Tests/LinqKit.Core.Tests.csproj -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Tests/LinqKit.Tests.csproj -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore31.Tests -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore5.Tests -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests -c $env:CONFIGURATION
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore10.Tests -c $env:CONFIGURATION
30 changes: 29 additions & 1 deletion LinqKit Solution.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 18
VisualStudioVersion = 18.0.11201.2 d18.0
VisualStudioVersion = 18.0.11201.2
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F7F283D-5576-417F-A467-EC210226AC3B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9FC09568-C879-47D8-9D28-E736B8A84C95}"
ProjectSection(SolutionItems) = preProject
.github\workflows\CreateRelease.yml = .github\workflows\CreateRelease.yml
Directory.Build.props = Directory.Build.props
Generate ReleaseNotes.bat = Generate ReleaseNotes.bat
LICENSE = LICENSE
.github\workflows\main.yml = .github\workflows\main.yml
NuGet.txt = NuGet.txt
PackageReleaseNotes.template = PackageReleaseNotes.template
PackageReleaseNotes.txt = PackageReleaseNotes.txt
Expand Down Expand Up @@ -117,6 +119,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Microsoft.EntityFra
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Microsoft.EntityFrameworkCore10.Tests", "tests\LinqKit.Microsoft.EntityFrameworkCore10.Tests\LinqKit.Microsoft.EntityFrameworkCore10.Tests.csproj", "{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Core.Tests", "tests\LinqKit.Core.Tests\LinqKit.Core.Tests.csproj", "{D6F5850C-F40D-2A48-578B-7B3F15C31F71}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{2A7B6550-F4EA-4ACE-B659-F262C2FF860E}"
ProjectSection(SolutionItems) = preProject
.github\workflows\CreateRelease.yml = .github\workflows\CreateRelease.yml
.github\workflows\main.yml = .github\workflows\main.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -740,6 +750,22 @@ Global
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x64.Build.0 = Release|Any CPU
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x86.ActiveCfg = Release|Any CPU
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x86.Build.0 = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|ARM.Build.0 = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x64.ActiveCfg = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x64.Build.0 = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x86.ActiveCfg = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x86.Build.0 = Debug|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|Any CPU.Build.0 = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|ARM.ActiveCfg = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|ARM.Build.0 = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x64.ActiveCfg = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x64.Build.0 = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x86.ActiveCfg = Release|Any CPU
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -785,6 +811,8 @@ Global
{8ADDBFF3-FCCB-4E16-939F-10E96ECE0C24} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
{6924F4DD-E516-33CB-1443-0640759F3C73} = {2F7F283D-5576-417F-A467-EC210226AC3B}
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
{D6F5850C-F40D-2A48-578B-7B3F15C31F71} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
{2A7B6550-F4EA-4ACE-B659-F262C2FF860E} = {9FC09568-C879-47D8-9D28-E736B8A84C95}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8F6283C5-9029-434E-BD90-E95FB377DA9B}
Expand Down
20 changes: 14 additions & 6 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,29 @@ init:
environment:
PATH: $(PATH);$(PROGRAMFILES)\dotnet\

install:
- ps: |
$ErrorActionPreference = 'Stop'
$dotnetVersion = '10.0.100'
Write-Host "Installing .NET SDK $dotnetVersion..."
iex "& { $(irm https://dot.net/v1/dotnet-install.ps1) } -Version $dotnetVersion -InstallDir '$Env:ProgramFiles\dotnet'"


build_script:
- dotnet build .\src\LinqKit\LinqKit.csproj -c %CONFIGURATION%
- dotnet build .\src\LinqKit.Core\LinqKit.Core.csproj -c %CONFIGURATION%
- dotnet build .\src\LinqKit.EntityFramework\LinqKit.EntityFramework.csproj -c %CONFIGURATION%
- dotnet build .\src\LinqKit.Microsoft.EntityFrameworkCore\LinqKit.Microsoft.EntityFrameworkCore.csproj -c %CONFIGURATION%
- dotnet build .\src\LinqKit.Z.EntityFramework.Classic\LinqKit.Z.EntityFramework.Classic.csproj -c %CONFIGURATION%
- dotnet build .\tests\LinqKit.Tests\LinqKit.Tests.csproj
- dotnet build .\tests\LinqKit.EntityFramework.Tests.Net452\LinqKit.EntityFramework.Tests.Net452.csproj
- dotnet build .\tests\LinqKit.Microsoft.EntityFrameworkCore.Tests\LinqKit.Microsoft.EntityFrameworkCore.Tests.csproj -c %CONFIGURATION%


test_script:
- dotnet test --no-build .\tests\LinqKit.Tests\LinqKit.Tests.csproj
- dotnet test --no-build .\tests\LinqKit.EntityFramework.Tests.Net452\LinqKit.EntityFramework.Tests.Net452.csproj
- dotnet test --no-build .\tests\LinqKit.Microsoft.EntityFrameworkCore.Tests -c %CONFIGURATION%
- dotnet test .\tests\LinqKit.Tests\LinqKit.Tests.csproj
- dotnet test .\tests\LinqKit.Core.Tests\LinqKit.Core.Tests.csproj -c %CONFIGURATION%
- dotnet test .\tests\LinqKit.EntityFramework.Tests.Net452\LinqKit.EntityFramework.Tests.Net452.csproj
- dotnet test .\tests\LinqKit.Microsoft.EntityFrameworkCore8.Tests -c %CONFIGURATION%
- dotnet test .\tests\LinqKit.Microsoft.EntityFrameworkCore9.Tests -c %CONFIGURATION%
- dotnet test .\tests\LinqKit.Microsoft.EntityFrameworkCore10.Tests -c %CONFIGURATION%


#artifacts:
Expand Down
2 changes: 1 addition & 1 deletion src/LinqKit.Core/ExpressionStarter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || EFCORE7)
#if !(NET35 || WINDOWS_APP || NETSTANDARD || PORTABLE || PORTABLE40 || UAP || EFCORE6 || EFCORE7 || NET10_0_OR_GREATER)
/// <summary></summary>
[Pure]
public void CompileToMethod(MethodBuilder method) { Predicate.CompileToMethod(method); }
Expand Down
Loading
Loading