Add .NET 9

.github/workflows/ci.yml

@@ -19,12 +19,16 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x'
 
     - name: Build
       run: |
         dotnet build ./src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj -c Release -p:buildType=azure-pipelines-ci
 
-    - name: Run Tests EFCore net8.0
+    - name: Run Tests EFCore net9.0
       run: |
         dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj -c Release -p:buildType=azure-pipelines-ci
 
@@ -38,6 +42,10 @@ jobs:
 
     steps:  
     - uses: actions/checkout@v4
+
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x'
 
     - uses: actions/setup-java@v4
       with:
@@ -75,13 +83,18 @@ jobs:
 
     - name: Run Tests EFCore net8.0 (with Coverage)
       run: |
-        dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.Tests/System.Linq.Dynamic.Core.Tests.csproj --configuration Debug -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-efcore.xml
+        dotnet-coverage collect 'dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net8/System.Linq.Dynamic.Core.Tests.Net8.csproj --configuration Debug --framework net8.0 -p:buildType=azure-pipelines-ci' -f xml -o dynamic-coverage-efcore.xml
 
     - name: End analysis on SonarCloud
       if: ${{ steps.secret-check.outputs.run_analysis == 'true' }}
       run: |
         dotnet sonarscanner end /d:sonar.token=${{ secrets.SONAR_TOKEN }}
 
+    # - name: Run Tests EFCore net8.0
+    #   run: |
+    #     dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net8.csproj -c Release -p:buildType=azure-pipelines-ci
+    #   continue-on-error: true
+
     # - name: Run Tests EFCore net7.0
     #   run: |
     #     dotnet test ./test/System.Linq.Dynamic.Core.Tests.Net7/System.Linq.Dynamic.Core.Tests.Net7.csproj -c Release -p:buildType=azure-pipelines-ci

README.md

@@ -77,7 +77,7 @@ If it's not possible to add that attribute, you need to implement a custom [Cust
 The following frameworks are supported:
 - net35, net40, net45, net46 and up
 - netstandard1.3, netstandard2.0 and netstandard2.1
-- netcoreapp3.1, net5.0, net6.0, net7.0 and net8.0
+- netcoreapp3.1, net5.0, net6.0, net7.0, net8.0 and net9.0
 - uap10.0
 
 ### Fork details

System.Linq.Dynamic.Core.sln

@@ -147,6 +147,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmDynamicLinq", "src-blaz
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SldcTrimmer", "src-examples\SldcTrimmer\SldcTrimmer.csproj", "{7A31366C-DD98-41A3-A0C1-A97068BD9658}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9", "src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9.csproj", "{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Dynamic.Core.Tests.Net8", "test\System.Linq.Dynamic.Core.Tests.Net8\System.Linq.Dynamic.Core.Tests.Net8.csproj", "{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -931,6 +935,38 @@ Global
 		{7A31366C-DD98-41A3-A0C1-A97068BD9658}.Release|x64.Build.0 = Release|Any CPU
 		{7A31366C-DD98-41A3-A0C1-A97068BD9658}.Release|x86.ActiveCfg = Release|Any CPU
 		{7A31366C-DD98-41A3-A0C1-A97068BD9658}.Release|x86.Build.0 = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x64.Build.0 = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Debug|x86.Build.0 = Debug|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|ARM.Build.0 = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x64.ActiveCfg = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x64.Build.0 = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x86.ActiveCfg = Release|Any CPU
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}.Release|x86.Build.0 = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x64.Build.0 = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Debug|x86.Build.0 = Debug|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|ARM.Build.0 = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x64.ActiveCfg = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x64.Build.0 = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x86.ActiveCfg = Release|Any CPU
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -984,6 +1020,8 @@ Global
 		{7AFC2836-0F6E-4B0D-8BB3-13317A3B6616} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
 		{2DE2052F-0A50-40C7-B6FF-52B52386BF9A} = {122BC4FA-7563-4E35-9D17-077F16F1629F}
 		{7A31366C-DD98-41A3-A0C1-A97068BD9658} = {BCA2A024-9032-4E56-A6C4-17A15D921728}
+		{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D} = {DBD7D9B6-FCC7-4650-91AF-E6457573A68F}
+		{CEBE3A33-4814-42A4-BD8E-F7F2308A4C8C} = {8463ED7E-69FB-49AE-85CF-0791AFD98E38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {94C56722-194E-4B8B-BC23-B3F754E89A20}

src/Directory.Build.props

@@ -25,4 +25,8 @@
         <None Include="../../resources/logo.png" Pack="true" PackagePath="" />
         <None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>
     </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
+    </ItemGroup>
 </Project>

src/EntityFramework.DynamicLinq/EntityFramework.DynamicLinq.csproj

@@ -34,10 +34,6 @@
         <ProjectReference Include="..\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="EntityFramework" Version="6.5.0" />
     </ItemGroup>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2.csproj

@@ -39,7 +39,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
         <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
     </ItemGroup>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3.csproj

@@ -41,8 +41,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
     </ItemGroup>
 
-</Project>
+</Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore5.csproj

@@ -42,7 +42,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
     </ItemGroup>
 </Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore6.csproj

@@ -42,7 +42,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     </ItemGroup>
 </Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7.csproj

@@ -42,7 +42,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
     </ItemGroup>
 </Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore8/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore8.csproj

@@ -42,7 +42,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     </ItemGroup>
 </Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9.csproj

@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+    <Import Project="../../version.xml" />
+
+    <PropertyGroup>
+        <AssemblyName>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyName>
+        <AssemblyOriginatorKeyFile>../Microsoft.EntityFrameworkCore.DynamicLinq.EFCore2/Microsoft.EntityFrameworkCore.DynamicLinq.snk</AssemblyOriginatorKeyFile>
+        <AssemblyTitle>Microsoft.EntityFrameworkCore.DynamicLinq</AssemblyTitle>
+        <DefineConstants>$(DefineConstants);EFCORE;EFCORE_3X;EFDYNAMICFUNCTIONS;ASYNCENUMERABLE</DefineConstants>
+        <Description>Dynamic Linq extensions for Microsoft.EntityFrameworkCore which adds Async support</Description>
+        <PackageTags>system;linq;dynamic;entityframework;core;async</PackageTags>
+        <ProjectGuid>{C774DAE7-54A0-4FCD-A3B7-3CB63D7E112D}</ProjectGuid>
+        <TargetFrameworks>net9.0</TargetFrameworks>
+        <Version>9.4.$(PatchVersion)</Version>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+        <DebugType>full</DebugType>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <!--<IncludeSource>True</IncludeSource>
+        <IncludeSymbols>True</IncludeSymbols>
+        <PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
+        <DebugType>portable</DebugType>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(buildType)' == 'azure-pipelines-ci' ">
+        <TargetFrameworks>net9.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="..\System.Linq.Dynamic.Core\Res.cs" />
+        <Compile Include="..\System.Linq.Dynamic.Core\Compatibility\*.cs" />
+        <Compile Include="..\System.Linq.Dynamic.Core\Extensions\*.cs" />
+        <Compile Include="..\System.Linq.Dynamic.Core\Validation\*.cs" />
+        <Compile Include="..\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore3\*.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\System.Linq.Dynamic.Core\System.Linq.Dynamic.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+    </ItemGroup>
+</Project>

src/Microsoft.EntityFrameworkCore.DynamicLinq.EFCore9/Properties/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+using System.Runtime.InteropServices;
+
+[assembly: ComVisible(false)]
+#if !(NETSTANDARD2_1)
+[assembly: Guid("b467c675-c014-4b55-85b9-9578941d2ef7")]
+#endif

src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.csproj

@@ -9,7 +9,7 @@
         <Description>This is a .NETStandard / .NET Core port of the the Microsoft assembly for the .Net 4.0 Dynamic language functionality.</Description>
         <PackageTags>system;linq;dynamic;core;dotnet;NETCoreApp;NETStandard</PackageTags>
         <ProjectGuid>{D3804228-91F4-4502-9595-39584E510002}</ProjectGuid>
-        <TargetFrameworks>net35;net40;net45;net452;net46;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net35;net40;net45;net452;net46;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
         <Version>1.4.$(PatchVersion)</Version>
         <!--<IsTrimmable>true</IsTrimmable>-->
     </PropertyGroup>
@@ -59,10 +59,6 @@
         </EmbeddedResource>
     </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
-    </ItemGroup>
-
     <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
         <PackageReference Include="NetLegacySupport.ConcurrentDictionary">
             <Version>1.1.1</Version>

src/Z.EntityFramework.Classic.DynamicLinq/Z.EntityFramework.Classic.DynamicLinq.csproj

@@ -35,7 +35,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
         <PackageReference Include="Z.EntityFramework.Classic" Version="7.1.7" />
     </ItemGroup>
 </Project>

test/EntityFramework.DynamicLinq.Tests/EntityFramework.DynamicLinq.Tests.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net461;net8.0</TargetFrameworks>
+        <TargetFrameworks>net461;net8.0;net9.0</TargetFrameworks>
         <DebugType>full</DebugType>
         <DefineConstants>EF;NET461</DefineConstants>
         <AssemblyName>EntityFramework.DynamicLinq.Tests</AssemblyName>
@@ -68,10 +68,15 @@
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
-        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.5" />
+        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.6" />
     </ItemGroup>
 
-    <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
+        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="9.0.6" />
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0' ">
         <DefineConstants>$(DefineConstants);AspNetCoreIdentity</DefineConstants>
     </PropertyGroup>
 

test/System.Linq.Dynamic.Core.Tests.Net5/System.Linq.Dynamic.Core.Tests.Net5.csproj

@@ -9,6 +9,7 @@
         <AssemblyOriginatorKeyFile>../../src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.snk</AssemblyOriginatorKeyFile>
         <IsPackable>false</IsPackable>
         <DefineConstants>$(DefineConstants);NETCOREAPP;EFCORE;EFCORE_3X;NETCOREAPP3_1;AspNetCoreIdentity</DefineConstants>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

test/System.Linq.Dynamic.Core.Tests.Net8/System.Linq.Dynamic.Core.Tests.Net8.csproj

@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <AssemblyName>System.Linq.Dynamic.Core.Tests</AssemblyName>
+        <DebugType>full</DebugType>
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>../../src/System.Linq.Dynamic.Core/System.Linq.Dynamic.Core.snk</AssemblyOriginatorKeyFile>
+        <IsPackable>false</IsPackable>
+        <DefineConstants>$(DefineConstants);NETCOREAPP;EFCORE;EFCORE_3X;NETCOREAPP3_1;AspNetCoreIdentity</DefineConstants>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Linq.PropertyTranslator.Core" Version="1.0.5" />
+        <PackageReference Include="QueryInterceptor.Core" Version="1.0.9" />
+        <PackageReference Include="NFluent" Version="2.8.0" />
+        <PackageReference Include="Moq" Version="4.18.2" />
+        <PackageReference Include="FluentAssertions" Version="6.8.0" />
+
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+        <PackageReference Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.3" />
+        <PackageReference Include="NodaTime" Version="3.1.5" />
+        <PackageReference Include="Testcontainers.MsSql" Version="3.10.0" />
+
+        <ProjectReference Include="..\..\src\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7\Microsoft.EntityFrameworkCore.DynamicLinq.EFCore7.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\System.Linq.Dynamic.Core.Tests\*.cs" />
+        <Compile Include="..\System.Linq.Dynamic.Core.Tests\*\*.cs" />
+        <Compile Include="..\System.Linq.Dynamic.Core.Tests\*\*\*.cs" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Remove="TestResults\**" />
+        <EmbeddedResource Remove="TestResults\**" />
+        <None Remove="TestResults\**" />
+    </ItemGroup>
+</Project>