Skip to content

Commit cdafbbf

Browse files
RIE-UPPERSOLUTIONSRIE-UPPERSOLUTIONS
authored
Add support for .Net 10 (#217)
* Extend main.yml for net10 * Extend README.md for net10 * Add "InternalsVisibleTo" for LinqKit.Microsoft.EntityFrameworkCore10 * Add new projects for net10 * Add net10 relevant projects to solution * Fix typos in main.yml
1 parent 6511192 commit cdafbbf

7 files changed

Lines changed: 157 additions & 6 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
7.0.x
2525
8.0.x
2626
9.0.x
27+
10.0.x
2728
2829
- name: Build Projects
2930
run: |
@@ -36,9 +37,10 @@ jobs:
3637
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore31/LinqKit.Microsoft.EntityFrameworkCore31.csproj -c ReleaseForGithubActions
3738
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore5/LinqKit.Microsoft.EntityFrameworkCore5.csproj -c ReleaseForGithubActions
3839
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore6/LinqKit.Microsoft.EntityFrameworkCore6.csproj -c ReleaseForGithubActions
39-
dotnet build ./src/LinqKit.Microsoft.EntityFrameworkCore7/LinqKit.Microsoft.EntityFrameworkCored7.csproj -c ReleaseForGithubActions
40-
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
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
4244
dotnet build ./src/LinqKit.Z.EntityFramework.Classic/LinqKit.Z.EntityFramework.Classic.csproj -c ReleaseForGithubActions
4345
4446
- name: Run Tests
@@ -50,4 +52,5 @@ jobs:
5052
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore6.Tests -c ReleaseForGithubActions
5153
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore7.Tests -c ReleaseForGithubActions
5254
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore8.Tests -c ReleaseForGithubActions
53-
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests -c ReleaseForGithubActions
55+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore9.Tests -c ReleaseForGithubActions
56+
dotnet test ./tests/LinqKit.Microsoft.EntityFrameworkCore10.Tests -c ReleaseForGithubActions

‎LinqKit Solution.sln‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31606.5
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11201.2 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F7F283D-5576-417F-A467-EC210226AC3B}"
77
EndProject
@@ -113,6 +113,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Microsoft.EntityFra
113113
EndProject
114114
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Microsoft.EntityFrameworkCore9.Tests", "tests\LinqKit.Microsoft.EntityFrameworkCore9.Tests\LinqKit.Microsoft.EntityFrameworkCore9.Tests.csproj", "{8ADDBFF3-FCCB-4E16-939F-10E96ECE0C24}"
115115
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinqKit.Microsoft.EntityFrameworkCore10", "src\LinqKit.Microsoft.EntityFrameworkCore10\LinqKit.Microsoft.EntityFrameworkCore10.csproj", "{6924F4DD-E516-33CB-1443-0640759F3C73}"
117+
EndProject
118+
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}"
119+
EndProject
116120
Global
117121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
118122
Debug|Any CPU = Debug|Any CPU
@@ -704,6 +708,38 @@ Global
704708
{8ADDBFF3-FCCB-4E16-939F-10E96ECE0C24}.Release|x64.Build.0 = Release|Any CPU
705709
{8ADDBFF3-FCCB-4E16-939F-10E96ECE0C24}.Release|x86.ActiveCfg = Release|Any CPU
706710
{8ADDBFF3-FCCB-4E16-939F-10E96ECE0C24}.Release|x86.Build.0 = Release|Any CPU
711+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
712+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|Any CPU.Build.0 = Debug|Any CPU
713+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|ARM.ActiveCfg = Debug|Any CPU
714+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|ARM.Build.0 = Debug|Any CPU
715+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|x64.ActiveCfg = Debug|Any CPU
716+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|x64.Build.0 = Debug|Any CPU
717+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|x86.ActiveCfg = Debug|Any CPU
718+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Debug|x86.Build.0 = Debug|Any CPU
719+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|Any CPU.ActiveCfg = Release|Any CPU
720+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|Any CPU.Build.0 = Release|Any CPU
721+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|ARM.ActiveCfg = Release|Any CPU
722+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|ARM.Build.0 = Release|Any CPU
723+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|x64.ActiveCfg = Release|Any CPU
724+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|x64.Build.0 = Release|Any CPU
725+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|x86.ActiveCfg = Release|Any CPU
726+
{6924F4DD-E516-33CB-1443-0640759F3C73}.Release|x86.Build.0 = Release|Any CPU
727+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
728+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
729+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|ARM.ActiveCfg = Debug|Any CPU
730+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|ARM.Build.0 = Debug|Any CPU
731+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|x64.ActiveCfg = Debug|Any CPU
732+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|x64.Build.0 = Debug|Any CPU
733+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|x86.ActiveCfg = Debug|Any CPU
734+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Debug|x86.Build.0 = Debug|Any CPU
735+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
736+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|Any CPU.Build.0 = Release|Any CPU
737+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|ARM.ActiveCfg = Release|Any CPU
738+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|ARM.Build.0 = Release|Any CPU
739+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x64.ActiveCfg = Release|Any CPU
740+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x64.Build.0 = Release|Any CPU
741+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x86.ActiveCfg = Release|Any CPU
742+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD}.Release|x86.Build.0 = Release|Any CPU
707743
EndGlobalSection
708744
GlobalSection(SolutionProperties) = preSolution
709745
HideSolutionNode = FALSE
@@ -747,6 +783,8 @@ Global
747783
{4052A1DE-FE04-4939-9602-172ED0F54D74} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
748784
{AC3816A2-410E-447D-9747-3368719F01C7} = {2F7F283D-5576-417F-A467-EC210226AC3B}
749785
{8ADDBFF3-FCCB-4E16-939F-10E96ECE0C24} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
786+
{6924F4DD-E516-33CB-1443-0640759F3C73} = {2F7F283D-5576-417F-A467-EC210226AC3B}
787+
{6700F0EC-ABC9-6321-9501-6F87C2B62AAD} = {0BE21A11-8EF0-404B-AFC0-533A62386C4C}
750788
EndGlobalSection
751789
GlobalSection(ExtensibilityGlobals) = postSolution
752790
SolutionGuid = {8F6283C5-9029-434E-BD90-E95FB377DA9B}

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
| LinqKit.Microsoft.EntityFrameworkCore 7 | [![Nuget](https://img.shields.io/badge/nuget-v7.1.6-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/7.1.6) | 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.6-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/8.1.6) | Microsoft.EntityFrameworkCore<ul><li>≥ 8.0.0</li></ul> | <ul><li>net8.0</li></ul>|
2222
| LinqKit.Microsoft.EntityFrameworkCore 9 | [![Nuget](https://img.shields.io/badge/nuget-v9.0.6-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/9.0.6) | Microsoft.EntityFrameworkCore<ul><li>≥ 9.0.0</li></ul> | <ul><li>net8.0</li><li>net9.0</li></ul>|
23+
| LinqKit.Microsoft.EntityFrameworkCore 10 | [![Nuget](https://img.shields.io/badge/nuget-v10.0.0-blue) ![Nuget](https://img.shields.io/nuget/dt/LinqKit.Microsoft.EntityFrameworkCore)](https://www.nuget.org/packages/LinqKit.Microsoft.EntityFrameworkCore/10.0.0) | Microsoft.EntityFrameworkCore<ul><li>≥ 10.0.0</li></ul> | <ul><li>net8.0</li><li>net9.0</li><li>net10.0</li></ul>|
2324
| 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>|
2425

2526

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@
100100
LinqKit.Microsoft.EntityFrameworkCore9, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f77c6bb1a3b2c5b07d843b1c9b845dffcce043e3711d17877ed730ad2e53983b3ed7c1346673cc9d3953a430334fa3c8ce73430ef58a930de917f6d34251a145f4f267d535ea2f797e717d7ce9684711888cc788cf71b4c03b531f52a88ab70e52b6e1fb783f0ef8b0c6afe55b573bf3f4982088325448aef8f3b1fea5d5a7c8
101101
</_Parameter1>
102102
</AssemblyAttribute>
103+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
104+
<_Parameter1>
105+
LinqKit.Microsoft.EntityFrameworkCore10, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f77c6bb1a3b2c5b07d843b1c9b845dffcce043e3711d17877ed730ad2e53983b3ed7c1346673cc9d3953a430334fa3c8ce73430ef58a930de917f6d34251a145f4f267d535ea2f797e717d7ce9684711888cc788cf71b4c03b531f52a88ab70e52b6e1fb783f0ef8b0c6afe55b573bf3f4982088325448aef8f3b1fea5d5a7c8
106+
</_Parameter1>
107+
</AssemblyAttribute>
103108
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
104109
<_Parameter1>
105110
LinqKit.Net35, PublicKey=002400000480000094000000060200000024000052534131000400000100010009af226acf80fc92af220b3e8080830297eeb9711ca1d8cf2a567c211dfdae8bd2fd7e37777b3d0368e8b6c4ed7252ad4f19f3eb38a3f26a0bbc7016d064bf0a111a40058e97239c11d8c2cdc1e93367f862a5e0166253463f90adba77c183cc8334d07198b8e80c69022f9bc6b260de3b1753c33b587e8c51175e1f6a1152d2

‎src/LinqKit.Microsoft.EntityFrameworkCore10/LinqKit.Microsoft.EntityFrameworkCore10.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>10.0.$(PatchVersion)</Version>
6+
<DefineConstants>$(DefineConstants);EFCORE;EFCORE3;EFCORE5;EFCORE6;EFCORE7;EFCORE8,EFCORE9,EFCORE10</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>net10.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="10.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.EntityFrameworkCore10.Tests/LinqKit.Microsoft.EntityFrameworkCore10.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>net10.0</TargetFramework>
6+
<AssemblyName>LinqKit.Microsoft.EntityFrameworkCore10.Tests</AssemblyName>
7+
<PackageId>LinqKit.Microsoft.EntityFrameworkCore10.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.EntityFrameworkCore10\LinqKit.Microsoft.EntityFrameworkCore10.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="10.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.EntityFrameworkCore10.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("b7d6c596-46f9-4c44-a1cd-5ddc51e9d589")]

0 commit comments

Comments
 (0)
⚡