Skip to content

Commit da5dbb0

Browse files
rizirizi
authored
Add .NET 9 (#204) (#205)
1 parent 4a7aae4 commit da5dbb0

File tree

7 files changed

+133
-1
lines changed

7 files changed

+133
-1
lines changed

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
6.0.x
2424
7.0.x
2525
8.0.x
26+
9.0.x
2627
2728
- name: Build Projects
2829
run: |
@@ -37,6 +38,7 @@ jobs:
3738
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore6.csproj -c ReleaseForGithubActions
3839
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore7/LinqKit.Microsoft.EntityFrameworkCored7.csproj -c ReleaseForGithubActions
3940
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCored8.csproj -c ReleaseForGithubActions
41+
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore8/LinqKit.Microsoft.EntityFrameworkCored9.csproj -c ReleaseForGithubActions
4042
dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c ReleaseForGithubActions
4143
4244
- name: Run Tests
@@ -47,4 +49,5 @@ jobs:
4749
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore5.Tests -c ReleaseForGithubActions
4850
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c ReleaseForGithubActions
4951
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests -c ReleaseForGithubActions
50-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c ReleaseForGithubActions
52+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c ReleaseForGithubActions
53+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests -c ReleaseForGithubActions

‎LinqKit Solution.sln‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinqKit.Microsoft.EntityFra
113113
EndProject
114114
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}"
115115
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Microsoft.EntityFrameworkCore9", "src\LinqKit.Microsoft.EntityFrameworkCore9\LinqKit.Microsoft.EntityFrameworkCore9.csproj", "{AC3816A2-410E-447D-9747-3368719F01C7}"
117+
EndProject
116118
Global
117119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
118120
Debug|Any CPU = Debug|Any CPU
@@ -704,6 +706,22 @@ Global
704706
{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|x64.Build.0 = Release|Any CPU
705707
{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|x86.ActiveCfg = Release|Any CPU
706708
{4052A1DE-FE04-4939-9602-172ED0F54D74}.Release|x86.Build.0 = Release|Any CPU
709+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
710+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
711+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|ARM.ActiveCfg = Debug|Any CPU
712+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|ARM.Build.0 = Debug|Any CPU
713+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|x64.ActiveCfg = Debug|Any CPU
714+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|x64.Build.0 = Debug|Any CPU
715+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|x86.ActiveCfg = Debug|Any CPU
716+
{AC3816A2-410E-447D-9747-3368719F01C7}.Debug|x86.Build.0 = Debug|Any CPU
717+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
718+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|Any CPU.Build.0 = Release|Any CPU
719+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|ARM.ActiveCfg = Release|Any CPU
720+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|ARM.Build.0 = Release|Any CPU
721+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|x64.ActiveCfg = Release|Any CPU
722+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|x64.Build.0 = Release|Any CPU
723+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|x86.ActiveCfg = Release|Any CPU
724+
{AC3816A2-410E-447D-9747-3368719F01C7}.Release|x86.Build.0 = Release|Any CPU
707725
EndGlobalSection
708726
GlobalSection(SolutionProperties) = preSolution
709727
HideSolutionNode = FALSE
@@ -747,6 +765,7 @@ Global
747765
{B85B8655-37CC-4273-BCF6-7F96D5A25BC5} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
748766
{001EA7F4-182C-4D16-B876-23AE9633FD3E} = {2F7F283D-5576-417F-A467-EC210226AC3B}
749767
{4052A1DE-FE04-4939-9602-172ED0F54D74} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
768+
{AC3816A2-410E-447D-9747-3368719F01C7} = {2F7F283D-5576-417F-A467-EC210226AC3B}
750769
EndGlobalSection
751770
GlobalSection(ExtensibilityGlobals) = postSolution
752771
SolutionGuid = {8F6283C5-9029-434E-BD90-E95FB377DA9B}

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
| 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>|
2020
| 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>|
2121
| 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>|
22+
| LinqKit.Microsoft.EntityFrameworkCore 9 | [![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/9.1.5) | Microsoft.EntityFrameworkCore<ul><li>≥ 9.0.0</li></ul> | <ul><li>net9.0</li></ul>|
2223
| 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>|
2324

2425

‎src/LinqKit.Core/LinqKit.Core.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
LinqKit.Microsoft.EntityFrameworkCore8, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f77c6bb1a3b2c5b07d843b1c9b845dffcce043e3711d17877ed730ad2e53983b3ed7c1346673cc9d3953a430334fa3c8ce73430ef58a930de917f6d34251a145f4f267d535ea2f797e717d7ce9684711888cc788cf71b4c03b531f52a88ab70e52b6e1fb783f0ef8b0c6afe55b573bf3f4982088325448aef8f3b1fea5d5a7c8
9696
</_Parameter1>
9797
</AssemblyAttribute>
98+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
99+
<_Parameter1>
100+
LinqKit.Microsoft.EntityFrameworkCore9, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f77c6bb1a3b2c5b07d843b1c9b845dffcce043e3711d17877ed730ad2e53983b3ed7c1346673cc9d3953a430334fa3c8ce73430ef58a930de917f6d34251a145f4f267d535ea2f797e717d7ce9684711888cc788cf71b4c03b531f52a88ab70e52b6e1fb783f0ef8b0c6afe55b573bf3f4982088325448aef8f3b1fea5d5a7c8
101+
</_Parameter1>
102+
</AssemblyAttribute>
98103
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
99104
<_Parameter1>
100105
LinqKit.Net35, PublicKey=002400000480000094000000060200000024000052534131000400000100010009af226acf80fc92af220b3e8080830297eeb9711ca1d8cf2a567c211dfdae8bd2fd7e37777b3d0368e8b6c4ed7252ad4f19f3eb38a3f26a0bbc7016d064bf0a111a40058e97239c11d8c2cdc1e93367f862a5e0166253463f90adba77c183cc8334d07198b8e80c69022f9bc6b260de3b1753c33b587e8c51175e1f6a1152d2

‎src/LinqKit.Microsoft.EntityFrameworkCore9/LinqKit.Microsoft.EntityFrameworkCore9.csproj‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../../version.xml" />
3+
4+
<PropertyGroup>
5+
<Version>9.0.$(PatchVersion)</Version>
6+
<DefineConstants>$(DefineConstants);EFCORE;EFCORE3;EFCORE5;EFCORE6;EFCORE7</DefineConstants>
7+
<Description>LinqKit.Microsoft.EntityFrameworkCore contains extensions for LINQ to SQL and EntityFrameworkCore. With Include(...) and IDbAsync support.</Description>
8+
<AssemblyTitle>LinqKit for Microsoft.EntityFrameworkCore with Include(...) and IAsync support.</AssemblyTitle>
9+
<Authors>Joseph Albahari;Tomas Petricek;Scott Smith;Tuomas Hietanen;Stef Heyenrath</Authors>
10+
<TargetFrameworks>net9.0</TargetFrameworks>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<AssemblyName>LinqKit.Microsoft.EntityFrameworkCore</AssemblyName>
13+
<AssemblyOriginatorKeyFile>../LinqKit.Microsoft.EntityFrameworkCore/LinqKit.Microsoft.EntityFrameworkCore.snk</AssemblyOriginatorKeyFile>
14+
<SignAssembly>true</SignAssembly>
15+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
16+
<PackageId>LinqKit.Microsoft.EntityFrameworkCore</PackageId>
17+
<PackageTags>linq;EF;EntityFramework;Entity;Framework;Core;EntityFrameworkCore</PackageTags>
18+
<PackageProjectUrl>https://github.com/scottksmith95/LINQKit</PackageProjectUrl>
19+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20+
<RepositoryType>git</RepositoryType>
21+
<RepositoryUrl>https://github.com/scottksmith95/LINQKit</RepositoryUrl>
22+
<RootNamespace>LinqKit</RootNamespace>
23+
</PropertyGroup>
24+
25+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'ReleaseForGithubActions' ">
26+
<PathMap>$(MSBuildProjectDirectory)=/</PathMap>
27+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
28+
</PropertyGroup>
29+
30+
<ItemGroup>
31+
<Compile Include="..\LinqKit.Core\Extensions.cs;..\LinqKit.Core\ExpandableQuery.cs" />
32+
<Compile Include="..\LinqKit.Microsoft.EntityFrameworkCore\*.cs" />
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
37+
<PrivateAssets>All</PrivateAssets>
38+
</PackageReference>
39+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
40+
<PackageReference Include="Timestamp" Version="1.0.2">
41+
<PrivateAssets>All</PrivateAssets>
42+
</PackageReference>
43+
</ItemGroup>
44+
45+
<ItemGroup>
46+
<ProjectReference Include="..\LinqKit.Core\LinqKit.Core.csproj" />
47+
</ItemGroup>
48+
49+
</Project>

‎tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests.csproj‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Authors>Stef Heyenrath</Authors>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<AssemblyName>LinqKit.Microsoft.EntityFrameworkCore9.Tests</AssemblyName>
7+
<PackageId>LinqKit.Microsoft.EntityFrameworkCore9.Tests</PackageId>
8+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
9+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\src\LinqKit.Microsoft.EntityFrameworkCore9\LinqKit.Microsoft.EntityFrameworkCore9.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<Compile Include="..\LinqKit.Microsoft.EntityFrameworkCore.TestFiles\**">
20+
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
21+
</Compile>
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="FluentAssertions" Version="5.10.3" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
28+
<PackageReference Include="Moq" Version="4.8.1" />
29+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
30+
<PrivateAssets>all</PrivateAssets>
31+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
32+
</PackageReference>
33+
<PackageReference Include="xunit" Version="2.4.1" />
34+
</ItemGroup>
35+
36+
</Project>

‎tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyConfiguration("")]
9+
[assembly: AssemblyCompany("")]
10+
[assembly: AssemblyProduct("LinqKit.Microsoft.EntityFrameworkCore.Tests")]
11+
[assembly: AssemblyTrademark("")]
12+
13+
// Setting ComVisible to false makes the types in this assembly not visible
14+
// to COM components. If you need to access a type in this assembly from
15+
// COM, set the ComVisible attribute to true on that type.
16+
[assembly: ComVisible(false)]
17+
18+
// The following GUID is for the ID of the typelib if this project is exposed to COM
19+
[assembly: Guid("caf01996-2e96-4350-ac5d-79da471d1a31")]

0 commit comments

Comments
 (0)