Skip to content

Commit b28b920

Browse files
StefHStefH
authored
Fix LeftJoin for .NET 10 (#220)
* Fix LeftJoin for .NET 10 * appveyor * appv 2 * 8910 * -c
1 parent 33505e2 commit b28b920

22 files changed

Lines changed: 460 additions & 309 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99

1010
env:
1111
Prerelease: ci
12+
CONFIGURATION: ReleaseForGithubActions
1213

1314
steps:
1415
- name: Print GITHUB_RUN_NUMBER
@@ -28,29 +29,30 @@ jobs:
2829
2930
- name: Build Projects
3031
run: |
31-
dotnet build ./src/LinqKit.Core/LinqKit.Core.csproj -c ReleaseForGithubActions
32-
dotnet build ./src/LinqKit/LinqKit.csproj -c ReleaseForGithubActions
33-
dotnet build ./src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj -c ReleaseForGithubActions
34-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore/LinqKit.Microsoft.EntityFrameworkCore.csproj -c ReleaseForGithubActions
35-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore2/LinqKit.Microsoft.EntityFrameworkCore2.csproj -c ReleaseForGithubActions
36-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore3/LinqKit.Microsoft.EntityFrameworkCore3.csproj -c ReleaseForGithubActions
37-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore31.csproj -c ReleaseForGithubActions
38-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore5.csproj -c ReleaseForGithubActions
39-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore6.csproj -c ReleaseForGithubActions
40-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore7/LinqKit.Microsoft.EntityFrameworkCore7.csproj -c ReleaseForGithubActions
41-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCore8.csproj -c ReleaseForGithubActions
42-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore9/LinqKit.Microsoft.EntityFrameworkCore9.csproj -c ReleaseForGithubActions
43-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore10/LinqKit.Microsoft.EntityFrameworkCore10.csproj -c ReleaseForGithubActions
44-
dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c ReleaseForGithubActions
32+
dotnet build ./src/LinqKit.Core/LinqKit.Core.csproj -c $env:CONFIGURATION
33+
dotnet build ./src/LinqKit/LinqKit.csproj -c $env:CONFIGURATION
34+
dotnet build ./src/LinqKit.EntityFramework/LinqKit.EntityFramework.csproj -c $env:CONFIGURATION
35+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore/LinqKit.Microsoft.EntityFrameworkCore.csproj -c $env:CONFIGURATION
36+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore2/LinqKit.Microsoft.EntityFrameworkCore2.csproj -c $env:CONFIGURATION
37+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore3/LinqKit.Microsoft.EntityFrameworkCore3.csproj -c $env:CONFIGURATION
38+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore31.csproj -c $env:CONFIGURATION
39+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore5.csproj -c $env:CONFIGURATION
40+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore6.csproj -c $env:CONFIGURATION
41+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore7/LinqKit.Microsoft.EntityFrameworkCore7.csproj -c $env:CONFIGURATION
42+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCore8.csproj -c $env:CONFIGURATION
43+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore9/LinqKit.Microsoft.EntityFrameworkCore9.csproj -c $env:CONFIGURATION
44+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore10/LinqKit.Microsoft.EntityFrameworkCore10.csproj -c $env:CONFIGURATION
45+
dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c $env:CONFIGURATION
4546
4647
- name: Run Tests
4748
run: |
48-
dotnet test ./tests/LinqKit.Tests/LinqKit.Tests.csproj -c ReleaseForGithubActions
49-
dotnet test ./tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj -c ReleaseForGithubActions
50-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore31.Tests -c ReleaseForGithubActions
51-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore5.Tests -c ReleaseForGithubActions
52-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c ReleaseForGithubActions
53-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests -c ReleaseForGithubActions
54-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c ReleaseForGithubActions
55-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests -c ReleaseForGithubActions
56-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore10.Tests -c ReleaseForGithubActions
49+
dotnet test ./tests/LinqKit.Core.Tests/LinqKit.Core.Tests.csproj -c $env:CONFIGURATION
50+
dotnet test ./tests/LinqKit.Tests/LinqKit.Tests.csproj -c $env:CONFIGURATION
51+
dotnet test ./tests/LinqKit.EntityFramework.Tests.Net452/LinqKit.EntityFramework.Tests.Net452.csproj -c $env:CONFIGURATION
52+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore31.Tests -c $env:CONFIGURATION
53+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore5.Tests -c $env:CONFIGURATION
54+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c $env:CONFIGURATION
55+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests -c $env:CONFIGURATION
56+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c $env:CONFIGURATION
57+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests -c $env:CONFIGURATION
58+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore10.Tests -c $env:CONFIGURATION

‎LinqKit Solution.sln‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 18
4-
VisualStudioVersion = 18.0.11201.2 d18.0
4+
VisualStudioVersion = 18.0.11201.2
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F7F283D-5576-417F-A467-EC210226AC3B}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9FC09568-C879-47D8-9D28-E736B8A84C95}"
99
ProjectSection(SolutionItems) = preProject
10+
.github\workflows\CreateRelease.yml = .github\workflows\CreateRelease.yml
1011
Directory.Build.props = Directory.Build.props
1112
Generate ReleaseNotes.bat = Generate ReleaseNotes.bat
1213
LICENSE = LICENSE
14+
.github\workflows\main.yml = .github\workflows\main.yml
1315
NuGet.txt = NuGet.txt
1416
PackageReleaseNotes.template = PackageReleaseNotes.template
1517
PackageReleaseNotes.txt = PackageReleaseNotes.txt
@@ -117,6 +119,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Microsoft.EntityFra
117119
EndProject
118120
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}"
119121
EndProject
122+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Core.Tests", "tests\LinqKit.Core.Tests\LinqKit.Core.Tests.csproj", "{D6F5850C-F40D-2A48-578B-7B3F15C31F71}"
123+
EndProject
124+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{2A7B6550-F4EA-4ACE-B659-F262C2FF860E}"
125+
ProjectSection(SolutionItems) = preProject
126+
.github\workflows\CreateRelease.yml = .github\workflows\CreateRelease.yml
127+
.github\workflows\main.yml = .github\workflows\main.yml
128+
EndProjectSection
129+
EndProject
120130
Global
121131
GlobalSection(SolutionConfigurationPlatforms) = preSolution
122132
Debug|Any CPU = Debug|Any CPU
@@ -740,6 +750,22 @@ Global
740750
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x64.Build.0 = Release|Any CPU
741751
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x86.ActiveCfg = Release|Any CPU
742752
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x86.Build.0 = Release|Any CPU
753+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
754+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
755+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|ARM.ActiveCfg = Debug|Any CPU
756+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|ARM.Build.0 = Debug|Any CPU
757+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x64.ActiveCfg = Debug|Any CPU
758+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x64.Build.0 = Debug|Any CPU
759+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x86.ActiveCfg = Debug|Any CPU
760+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Debug|x86.Build.0 = Debug|Any CPU
761+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
762+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|Any CPU.Build.0 = Release|Any CPU
763+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|ARM.ActiveCfg = Release|Any CPU
764+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|ARM.Build.0 = Release|Any CPU
765+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x64.ActiveCfg = Release|Any CPU
766+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x64.Build.0 = Release|Any CPU
767+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x86.ActiveCfg = Release|Any CPU
768+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71}.Release|x86.Build.0 = Release|Any CPU
743769
EndGlobalSection
744770
GlobalSection(SolutionProperties) = preSolution
745771
HideSolutionNode = FALSE
@@ -785,6 +811,8 @@ Global
785811
{8ADDBFF3-FCCB-4E16-939F-10E96ECE0C24} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
786812
{6924F4DD-E516-33CB-1443-0640759F3C73} = {2F7F283D-5576-417F-A467-EC210226AC3B}
787813
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
814+
{D6F5850C-F40D-2A48-578B-7B3F15C31F71} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
815+
{2A7B6550-F4EA-4ACE-B659-F262C2FF860E} = {9FC09568-C879-47D8-9D28-E736B8A84C95}
788816
EndGlobalSection
789817
GlobalSection(ExtensibilityGlobals) = postSolution
790818
SolutionGuid = {8F6283C5-9029-434E-BD90-E95FB377DA9B}

‎appveyor.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,29 @@ init:
1313
environment:
1414
PATH: $(PATH);$(PROGRAMFILES)\dotnet\
1515

16+
install:
17+
- ps: |
18+
$ErrorActionPreference = 'Stop'
19+
$dotnetVersion = '10.0.100'
20+
Write-Host "Installing .NET SDK $dotnetVersion..."
21+
iex "& { $(irm https://dot.net/v1/dotnet-install.ps1) } -Version $dotnetVersion -InstallDir '$Env:ProgramFiles\dotnet'"
22+
1623
1724
build_script:
1825
- dotnet build .\src\LinqKit\LinqKit.csproj -c %CONFIGURATION%
26+
- dotnet build .\src\LinqKit.Core\LinqKit.Core.csproj -c %CONFIGURATION%
1927
- dotnet build .\src\LinqKit.EntityFramework\LinqKit.EntityFramework.csproj -c %CONFIGURATION%
2028
- dotnet build .\src\LinqKit.Microsoft.EntityFrameworkCore\LinqKit.Microsoft.EntityFrameworkCore.csproj -c %CONFIGURATION%
2129
- dotnet build .\src\LinqKit.Z.EntityFramework.Classic\LinqKit.Z.EntityFramework.Classic.csproj -c %CONFIGURATION%
22-
- dotnet build .\tests\LinqKit.Tests\LinqKit.Tests.csproj
23-
- dotnet build .\tests\LinqKit.EntityFramework.Tests.Net452\LinqKit.EntityFramework.Tests.Net452.csproj
24-
- dotnet build .\tests\LinqKit.Microsoft.EntityFrameworkCore.Tests\LinqKit.Microsoft.EntityFrameworkCore.Tests.csproj -c %CONFIGURATION%
2530

2631

2732
test_script:
28-
- dotnet test --no-build .\tests\LinqKit.Tests\LinqKit.Tests.csproj
29-
- dotnet test --no-build .\tests\LinqKit.EntityFramework.Tests.Net452\LinqKit.EntityFramework.Tests.Net452.csproj
30-
- dotnet test --no-build .\tests\LinqKit.Microsoft.EntityFrameworkCore.Tests -c %CONFIGURATION%
33+
- dotnet test .\tests\LinqKit.Tests\LinqKit.Tests.csproj
34+
- dotnet test .\tests\LinqKit.Core.Tests\LinqKit.Core.Tests.csproj -c %CONFIGURATION%
35+
- dotnet test .\tests\LinqKit.EntityFramework.Tests.Net452\LinqKit.EntityFramework.Tests.Net452.csproj
36+
- dotnet test .\tests\LinqKit.Microsoft.EntityFrameworkCore8.Tests -c %CONFIGURATION%
37+
- dotnet test .\tests\LinqKit.Microsoft.EntityFrameworkCore9.Tests -c %CONFIGURATION%
38+
- dotnet test .\tests\LinqKit.Microsoft.EntityFrameworkCore10.Tests -c %CONFIGURATION%
3139

3240

3341
#artifacts:

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

0 commit comments

Comments
 (0)
⚡