scottksmith95 · StefH · Nov 18, 2023 · Nov 18, 2023 · Nov 18, 2023 · Nov 18, 2023
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,11 +15,14 @@ jobs:
       run: |
         echo "GITHUB_RUN_NUMBER is ${env:GITHUB_RUN_NUMBER}"
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-dotnet@v1
+    - uses: actions/setup-dotnet@v3
       with:
-       dotnet-version: '7.0.x'
+       dotnet-version: | 
+          6.0.x
+          7.0.x
+          8.0.x
 
     - name: Build Projects
       run: |
@@ -33,6 +36,7 @@ jobs:
         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.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCored8.csproj -c ReleaseForGithubActions
         dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c ReleaseForGithubActions
 
     - name: Run Tests
@@ -42,4 +46,5 @@ jobs:
         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.EntityFrameworkCore7.Tests -c ReleaseForGithubActions
+        dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c ReleaseForGithubActions
diff --git a/LinqKit Solution.sln b/LinqKit Solution.sln
@@ -91,12 +91,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFra
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFrameworkCore31.Tests", "tests\LinqKit.Microsoft.EntityFrameworkCore31.Tests\LinqKit.Microsoft.EntityFrameworkCore31.Tests.csproj", "{4FD0A2B1-B136-4E2C-B1BE-0E55D0619C79}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{C922EF4A-F2E6-4C7C-B0F7-E109CE17471C}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\CreateRelease.yml = .github\workflows\CreateRelease.yml
-		.github\workflows\main.yml = .github\workflows\main.yml
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure Pipelines", "Azure Pipelines", "{13CE5DB5-58FA-4AD8-AD0E-40721703DA84}"
 	ProjectSection(SolutionItems) = preProject
 		azure-pipelines-nuget.yml = azure-pipelines-nuget.yml
@@ -115,6 +109,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFra
 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
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFrameworkCore8", "src\LinqKit.Microsoft.EntityFrameworkCore8\LinqKit.Microsoft.EntityFrameworkCore8.csproj", "{001EA7F4-182C-4D16-B876-23AE9633FD3E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFrameworkCore8.Tests", "tests\LinqKit.Microsoft.EntityFrameworkCore8.Tests\LinqKit.Microsoft.EntityFrameworkCore8.Tests.csproj", "{4052A1DE-FE04-4939-9602-172ED0F54D74}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -674,6 +672,38 @@ Global
 		{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
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|x64.Build.0 = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Debug|x86.Build.0 = Debug|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|ARM.Build.0 = Release|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|x64.ActiveCfg = Release|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|x64.Build.0 = Release|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|x86.ActiveCfg = Release|Any CPU
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E}.Release|x86.Build.0 = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|ARM.Build.0 = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|x64.Build.0 = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Debug|x86.Build.0 = Debug|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|ARM.ActiveCfg = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|ARM.Build.0 = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|x64.ActiveCfg = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|x64.Build.0 = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|x86.ActiveCfg = Release|Any CPU
+		{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -709,13 +739,14 @@ Global
 		{FCD65032-6289-465A-9230-DD6BD2FFB376} = {2F7F283D-5576-417F-A467-EC210226AC3B}
 		{4931C08A-96EA-4311-BF18-E89EBAC32AF7} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
 		{4FD0A2B1-B136-4E2C-B1BE-0E55D0619C79} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
-		{C922EF4A-F2E6-4C7C-B0F7-E109CE17471C} = {9FC09568-C879-47D8-9D28-E736B8A84C95}
 		{13CE5DB5-58FA-4AD8-AD0E-40721703DA84} = {9FC09568-C879-47D8-9D28-E736B8A84C95}
 		{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}
+		{001EA7F4-182C-4D16-B876-23AE9633FD3E} = {2F7F283D-5576-417F-A467-EC210226AC3B}
+		{4052A1DE-FE04-4939-9602-172ED0F54D74} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8F6283C5-9029-434E-BD90-E95FB377DA9B}

diff --git a/README.md b/README.md
@@ -13,11 +13,12 @@
 | LinqKit.Core | [![Nuget](https://img.shields.io/nuget/v/LinqKit.Core) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Core)](https://www.nuget.org/packages/LinqKit.Core) | - | <ul><li>net35</li><li>net40</li><li>net45 and up</li><li>.NETPortable Profile</li><li>netstandard1.3</li><li>netstandard2.0</li><li>netstandard2.1</li><li>uap10</li></ul>|
 | LinqKit.EntityFramework | [![Nuget](https://img.shields.io/nuget/v/LinqKit.EntityFramework) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.EntityFramework)](https://www.nuget.org/packages/LinqKit.EntityFramework) | EntityFramework<ul><li>≥ 6.2.0 (net45)</li><li>≥ 6.3.0 (netstandard2.1) | <ul><li>net45 and up</li><li>netstandard2.1</li></ul> |
 | LinqKit.Microsoft.EntityFrameworkCore 1 | [![Nuget](https://img.shields.io/badge/nuget-v1.2.0-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/1.2.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 1.1.1</li></ul> | <ul><li>net451</li><li>netstandard1.3</li></ul>|
-| LinqKit.Microsoft.EntityFrameworkCore 2 | [![Nuget](https://img.shields.io/badge/nuget-v2.1.0-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/2.1.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 2.0.1</li></ul> | <ul><li>netstandard2.0</li></ul> |
-| 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.Microsoft.EntityFrameworkCore 2 | [![Nuget](https://img.shields.io/badge/nuget-v2.1.5-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/2.1.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 2.0.1</li></ul> | <ul><li>netstandard2.0</li></ul> |
+| LinqKit.Microsoft.EntityFrameworkCore 3 | [![Nuget](https://img.shields.io/badge/nuget-v3.1.5-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.5-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.5-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.5-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.Microsoft.EntityFrameworkCore 8 | [![Nuget](https://img.shields.io/badge/nuget-v8.1.5-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/8.0.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 8.0.0</li></ul> | <ul><li>net8.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/LinqKit.Core.csproj b/src/LinqKit.Core/LinqKit.Core.csproj
@@ -90,6 +90,11 @@
 				LinqKit.Microsoft.EntityFrameworkCore7, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f77c6bb1a3b2c5b07d843b1c9b845dffcce043e3711d17877ed730ad2e53983b3ed7c1346673cc9d3953a430334fa3c8ce73430ef58a930de917f6d34251a145f4f267d535ea2f797e717d7ce9684711888cc788cf71b4c03b531f52a88ab70e52b6e1fb783f0ef8b0c6afe55b573bf3f4982088325448aef8f3b1fea5d5a7c8
 			</_Parameter1>
 		</AssemblyAttribute>
+		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+			<_Parameter1>
+				LinqKit.Microsoft.EntityFrameworkCore8, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f77c6bb1a3b2c5b07d843b1c9b845dffcce043e3711d17877ed730ad2e53983b3ed7c1346673cc9d3953a430334fa3c8ce73430ef58a930de917f6d34251a145f4f267d535ea2f797e717d7ce9684711888cc788cf71b4c03b531f52a88ab70e52b6e1fb783f0ef8b0c6afe55b573bf3f4982088325448aef8f3b1fea5d5a7c8
+			</_Parameter1>
+		</AssemblyAttribute>
 		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
 			<_Parameter1>
 				LinqKit.Net35, PublicKey=002400000480000094000000060200000024000052534131000400000100010009af226acf80fc92af220b3e8080830297eeb9711ca1d8cf2a567c211dfdae8bd2fd7e37777b3d0368e8b6c4ed7252ad4f19f3eb38a3f26a0bbc7016d064bf0a111a40058e97239c11d8c2cdc1e93367f862a5e0166253463f90adba77c183cc8334d07198b8e80c69022f9bc6b260de3b1753c33b587e8c51175e1f6a1152d2

diff --git a/src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCore8.csproj b/src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCore8.csproj
@@ -0,0 +1,49 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../version.xml" />
+
+  <PropertyGroup>
+    <Version>8.1.$(PatchVersion)</Version>
+    <DefineConstants>$(DefineConstants);EFCORE;EFCORE3;EFCORE5;EFCORE6;EFCORE7</DefineConstants>
+    <Description>LinqKit.Microsoft.EntityFrameworkCore contains extensions for LINQ to SQL and EntityFrameworkCore. With Include(...) and IDbAsync support.</Description>
+    <AssemblyTitle>LinqKit for Microsoft.EntityFrameworkCore with Include(...) and IAsync support.</AssemblyTitle>
+    <Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>LinqKit.Microsoft.EntityFrameworkCore</AssemblyName>
+    <AssemblyOriginatorKeyFile>../LinqKit.Microsoft.EntityFrameworkCore/LinqKit.Microsoft.EntityFrameworkCore.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageId>LinqKit.Microsoft.EntityFrameworkCore</PackageId>
+    <PackageTags>linq;EF;EntityFramework;Entity;Framework;Core;EntityFrameworkCore</PackageTags>
+    <PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
+    <RootNamespace>LinqKit</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions' ">
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+      <Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs" />
+      <Compile Include="..\LinqKit.Microsoft.EntityFrameworkCore\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Timestamp" Version="1.0.2">
+        <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/....Microsoft.EntityFrameworkCore7.Tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests.csproj b/....Microsoft.EntityFrameworkCore7.Tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests.csproj
@@ -3,16 +3,16 @@
 	<PropertyGroup>
 		<Authors>Stef Heyenrath</Authors>
 		<TargetFramework>net7.0</TargetFramework>
-		<AssemblyName>LinqKit.Microsoft.EntityFrameworkCore6.Tests</AssemblyName>
-		<PackageId>LinqKit.Microsoft.EntityFrameworkCore6.Tests</PackageId>
+		<AssemblyName>LinqKit.Microsoft.EntityFrameworkCore7.Tests</AssemblyName>
+		<PackageId>LinqKit.Microsoft.EntityFrameworkCore7.Tests</PackageId>
 		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
 		<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
 		<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
 		<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\src\LinqKit.Microsoft.EntityFrameworkCore6\LinqKit.Microsoft.EntityFrameworkCore6.csproj" />
+		<ProjectReference Include="..\..\src\LinqKit.Microsoft.EntityFrameworkCore7\LinqKit.Microsoft.EntityFrameworkCore7.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -23,7 +23,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="FluentAssertions" Version="5.10.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
 		<PackageReference Include="Moq" Version="4.8.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">