Skip to content

Commit adb475e

Browse files
SerhiyBalanSerhiyBalan
committed
EF9 and EF10 support
1 parent 23a7936 commit adb475e

File tree

8 files changed

+134
-0
lines changed

8 files changed

+134
-0
lines changed

‎BlazarTech.QueryableValues.sln‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryableValues.SqlServer.E
3636
EndProject
3737
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QueryableValues.SqlServer.Tests.EFCore8", "tests\QueryableValues.SqlServer.Tests.EFCore8\QueryableValues.SqlServer.Tests.EFCore8.csproj", "{9387545B-CABC-4C63-A163-4F64C65A370F}"
3838
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QueryableValues.SqlServer.EFCore9", "src\QueryableValues.SqlServer.EFCore9\QueryableValues.SqlServer.EFCore9.csproj", "{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}"
40+
EndProject
41+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QueryableValues.SqlServer.EFCore10", "src\QueryableValues.SqlServer.EFCore10\QueryableValues.SqlServer.EFCore10.csproj", "{C15498D8-E387-451A-8C2F-E52F3DDBC48F}"
42+
EndProject
43+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QueryableValues.SqlServer.Tests.EFCore9", "tests\QueryableValues.SqlServer.Tests.EFCore9\QueryableValues.SqlServer.Tests.EFCore9.csproj", "{07C70A98-52DF-41E6-90A0-A7DB803228D2}"
44+
EndProject
45+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QueryableValues.SqlServer.Tests.EFCore10", "tests\QueryableValues.SqlServer.Tests.EFCore10\QueryableValues.SqlServer.Tests.EFCore10.csproj", "{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}"
46+
EndProject
3947
Global
4048
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4149
Debug|Any CPU = Debug|Any CPU
@@ -138,6 +146,38 @@ Global
138146
{9387545B-CABC-4C63-A163-4F64C65A370F}.Test_All|Any CPU.Build.0 = Test_All|Any CPU
139147
{9387545B-CABC-4C63-A163-4F64C65A370F}.Test|Any CPU.ActiveCfg = Test|Any CPU
140148
{9387545B-CABC-4C63-A163-4F64C65A370F}.Test|Any CPU.Build.0 = Test|Any CPU
149+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Debug|Any CPU.Build.0 = Debug|Any CPU
151+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Release|Any CPU.ActiveCfg = Release|Any CPU
152+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Release|Any CPU.Build.0 = Release|Any CPU
153+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Test_All|Any CPU.ActiveCfg = Debug|Any CPU
154+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Test_All|Any CPU.Build.0 = Debug|Any CPU
155+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Test|Any CPU.ActiveCfg = Test|Any CPU
156+
{6FB261E0-4137-44D5-A2E9-E7AFFB16F745}.Test|Any CPU.Build.0 = Test|Any CPU
157+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Debug|Any CPU.Build.0 = Debug|Any CPU
159+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Release|Any CPU.ActiveCfg = Release|Any CPU
160+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Release|Any CPU.Build.0 = Release|Any CPU
161+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Test_All|Any CPU.ActiveCfg = Debug|Any CPU
162+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Test_All|Any CPU.Build.0 = Debug|Any CPU
163+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Test|Any CPU.ActiveCfg = Test|Any CPU
164+
{C15498D8-E387-451A-8C2F-E52F3DDBC48F}.Test|Any CPU.Build.0 = Test|Any CPU
165+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
166+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
167+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
168+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Release|Any CPU.Build.0 = Release|Any CPU
169+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Test_All|Any CPU.ActiveCfg = Test_All|Any CPU
170+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Test_All|Any CPU.Build.0 = Test_All|Any CPU
171+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Test|Any CPU.ActiveCfg = Test|Any CPU
172+
{07C70A98-52DF-41E6-90A0-A7DB803228D2}.Test|Any CPU.Build.0 = Test|Any CPU
173+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Debug|Any CPU.Build.0 = Debug|Any CPU
175+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Release|Any CPU.ActiveCfg = Release|Any CPU
176+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Release|Any CPU.Build.0 = Release|Any CPU
177+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Test_All|Any CPU.ActiveCfg = Test_All|Any CPU
178+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Test_All|Any CPU.Build.0 = Test_All|Any CPU
179+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Test|Any CPU.ActiveCfg = Test|Any CPU
180+
{D38DC9DE-C57A-46AE-BFE1-B198EF1D5A20}.Test|Any CPU.Build.0 = Test|Any CPU
141181
EndGlobalSection
142182
GlobalSection(SolutionProperties) = preSolution
143183
HideSolutionNode = FALSE

‎Version.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
<VersionEFCore6>6.9.3</VersionEFCore6>
66
<VersionEFCore7>7.4.3</VersionEFCore7>
77
<VersionEFCore8>8.1.1</VersionEFCore8>
8+
<VersionEFCore9>9.0.0</VersionEFCore9>
9+
<VersionEFCore10>10.0.0</VersionEFCore10>
810
</PropertyGroup>
911
</Project>

‎src/QueryableValues.SqlServer.EFCore10/QueryableValues.SqlServer.EFCore10.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../SharedProjectProperties.xml" />
3+
<Import Project="../../Version.xml" />
4+
5+
<PropertyGroup>
6+
<VersionPrefix>$(VersionEFCore10)</VersionPrefix>
7+
<TargetFramework>net10.0</TargetFramework>
8+
<Configurations>Debug;Release;Test</Configurations>
9+
<DefineConstants>$(DefineConstants);EFCORE;EFCORE10</DefineConstants>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[10.0,)" />
15+
</ItemGroup>
16+
</Project>

‎src/QueryableValues.SqlServer.EFCore9/QueryableValues.SqlServer.EFCore9.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../SharedProjectProperties.xml" />
3+
<Import Project="../../Version.xml" />
4+
5+
<PropertyGroup>
6+
<VersionPrefix>$(VersionEFCore9)</VersionPrefix>
7+
<TargetFramework>net9.0</TargetFramework>
8+
<Configurations>Debug;Release;Test</Configurations>
9+
<DefineConstants>$(DefineConstants);EFCORE;EFCORE9</DefineConstants>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[9.0,)" />
15+
</ItemGroup>
16+
</Project>

‎src/SharedProjectProperties.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,7 @@
5959
<InternalsVisibleTo Include="BlazarTech.QueryableValues.SqlServer.Tests.EFCore6" />
6060
<InternalsVisibleTo Include="BlazarTech.QueryableValues.SqlServer.Tests.EFCore7" />
6161
<InternalsVisibleTo Include="BlazarTech.QueryableValues.SqlServer.Tests.EFCore8" />
62+
<InternalsVisibleTo Include="BlazarTech.QueryableValues.SqlServer.Tests.EFCore9" />
63+
<InternalsVisibleTo Include="BlazarTech.QueryableValues.SqlServer.Tests.EFCore10" />
6264
</ItemGroup>
6365
</Project>

‎tests/QueryableValues.SqlServer.Tests.EFCore10/QueryableValues.SqlServer.Tests.EFCore10.csproj‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../SharedTestProjectProperties.xml" />
3+
4+
<PropertyGroup>
5+
<TargetFrameworks>net10.0</TargetFrameworks>
6+
<AssemblyName>BlazarTech.QueryableValues.SqlServer.Tests.EFCore10</AssemblyName>
7+
<DefineConstants>$(DefineConstants);TESTS;EFCORE10</DefineConstants>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
12+
<PackageReference Include="xunit" Version="2.6.2" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
<PrivateAssets>all</PrivateAssets>
16+
</PackageReference>
17+
<PackageReference Include="coverlet.collector" Version="6.0.0">
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
<PrivateAssets>all</PrivateAssets>
20+
</PackageReference>
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<ProjectReference Include="..\..\src\QueryableValues.SqlServer.EFCore10\QueryableValues.SqlServer.EFCore10.csproj" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
26+
</ItemGroup>
27+
</Project>

‎tests/QueryableValues.SqlServer.Tests.EFCore9/QueryableValues.SqlServer.Tests.EFCore9.csproj‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../SharedTestProjectProperties.xml" />
3+
4+
<PropertyGroup>
5+
<TargetFrameworks>net9.0</TargetFrameworks>
6+
<AssemblyName>BlazarTech.QueryableValues.SqlServer.Tests.EFCore9</AssemblyName>
7+
<DefineConstants>$(DefineConstants);TESTS;EFCORE9</DefineConstants>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
12+
<PackageReference Include="xunit" Version="2.6.2" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
<PrivateAssets>all</PrivateAssets>
16+
</PackageReference>
17+
<PackageReference Include="coverlet.collector" Version="6.0.0">
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
<PrivateAssets>all</PrivateAssets>
20+
</PackageReference>
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<ProjectReference Include="..\..\src\QueryableValues.SqlServer.EFCore9\QueryableValues.SqlServer.EFCore9.csproj" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
26+
</ItemGroup>
27+
</Project>

‎tests/QueryableValues.SqlServer.Tests/Integration/MyDbContext.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ internal static class DatabaseName
1616
public const string Name = "QueryableValuesTestsEFCore7";
1717
#elif EFCORE8
1818
public const string Name = "QueryableValuesTestsEFCore8";
19+
#elif EFCORE9
20+
public const string Name = "QueryableValuesTestsEFCore9";
21+
#elif EFCORE10
22+
public const string Name = "QueryableValuesTestsEFCore10";
1923
#endif
2024
}
2125

0 commit comments

Comments
 (0)