Skip to content

Commit 787f45f

Browse files
author
Danny Logsdon
committed
# 2.2.3
- Added target framework for Net10 and new test projects - Update ServiceQueryRequestExtensions to add shorthand filter expressions for existing ServiceQueryRequest filter types (, ), lt, <, lte, <=, =, eq, etc. - Update test project references to latest available versions - Update Cosmos tests, as they standardized rounding and errors for aggregate sum and average - Updated MongoDb driver to 3.5.2
1 parent 70e017b commit 787f45f

50 files changed

Lines changed: 3373 additions & 664 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ReleaseNotes.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 2.2.3
2+
- Added target framework for Net10 and new test projects
3+
- Update ServiceQueryRequestExtensions to add shorthand filter expressions for existing ServiceQueryRequest filter types (, ), lt, <, lte, <=, =, eq, etc.
4+
- Update test project references to latest available versions
5+
- Update Cosmos tests, as they standardized rounding and errors for aggregate sum and average
6+
- Updated MongoDb driver to 3.5.2
7+
18
# 2.2.2
29
- Added new package ServiceQuery.EntityFrameworkCore8 to specifically target EFC 8 since base library uses EFC 9 for .NET 8 runtime
310
- Update MongoDb driver to 3.4.1

‎ServiceQueryV2.sln‎

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceQueryNet8.Integratio
3939
EndProject
4040
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceQuery.EntityFrameworkCore8", "src\V2\ServiceQuery.EntityFrameworkCore8\ServiceQuery.EntityFrameworkCore8.csproj", "{4FCD2A2E-2200-7C0D-2854-2F008B2DE541}"
4141
EndProject
42+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceQueryNet10.Xunit", "src\V2\Tests\ServiceQueryNet10.Xunit\ServiceQueryNet10.Xunit.csproj", "{8318EF15-206A-C1C0-13CC-E7CD833C2CFA}"
43+
EndProject
44+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceQueryNet10.Integration.XunitAzureDataTables", "src\V2\Tests\ServiceQueryNet10.Integration.XunitAzureDataTables\ServiceQueryNet10.Integration.XunitAzureDataTables.csproj", "{A34D4669-F8BF-724F-85C3-EEF89E895D40}"
45+
EndProject
46+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceQueryNet10.Integration.XunitEntityFrameworkCore", "src\V2\Tests\ServiceQueryNet10.Integration.XunitEntityFrameworkCore\ServiceQueryNet10.Integration.XunitEntityFrameworkCore.csproj", "{DC3D89E5-742B-D22E-0A11-01246C6808EC}"
47+
EndProject
48+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceQueryNet10.Integration.XunitMongoDb", "src\V2\Tests\ServiceQueryNet10.Integration.XunitMongoDb\ServiceQueryNet10.Integration.XunitMongoDb.csproj", "{5EE66142-A08B-35EE-99EF-742A5F4CBCA0}"
49+
EndProject
50+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net8", "Net8", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
51+
EndProject
52+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net9", "Net9", "{0A827EBE-B64B-4041-A47C-6861DD040488}"
53+
EndProject
54+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net10", "Net10", "{E95953CA-29A4-441D-BFF0-7D2711FAAE3D}"
55+
EndProject
56+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net6", "Net6", "{EABAB36D-A27A-4359-8C73-B8107ABF13C8}"
57+
EndProject
58+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net7", "Net7", "{F061F24B-920E-48DA-A0AD-A50975A86B1A}"
59+
EndProject
60+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceQuery.AzureDataTablesNet10.Integration.Xunit", "src\V2\Tests\ServiceQuery.AzureDataTablesNet10.Integration.Xunit\ServiceQuery.AzureDataTablesNet10.Integration.Xunit.csproj", "{4E2092C1-64FB-C3DB-4741-ACD93008F41C}"
61+
EndProject
4262
Global
4363
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4464
Debug|Any CPU = Debug|Any CPU
@@ -113,23 +133,53 @@ Global
113133
{4FCD2A2E-2200-7C0D-2854-2F008B2DE541}.Debug|Any CPU.Build.0 = Debug|Any CPU
114134
{4FCD2A2E-2200-7C0D-2854-2F008B2DE541}.Release|Any CPU.ActiveCfg = Release|Any CPU
115135
{4FCD2A2E-2200-7C0D-2854-2F008B2DE541}.Release|Any CPU.Build.0 = Release|Any CPU
136+
{8318EF15-206A-C1C0-13CC-E7CD833C2CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137+
{8318EF15-206A-C1C0-13CC-E7CD833C2CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
138+
{8318EF15-206A-C1C0-13CC-E7CD833C2CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
139+
{8318EF15-206A-C1C0-13CC-E7CD833C2CFA}.Release|Any CPU.Build.0 = Release|Any CPU
140+
{A34D4669-F8BF-724F-85C3-EEF89E895D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141+
{A34D4669-F8BF-724F-85C3-EEF89E895D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
142+
{A34D4669-F8BF-724F-85C3-EEF89E895D40}.Release|Any CPU.ActiveCfg = Release|Any CPU
143+
{A34D4669-F8BF-724F-85C3-EEF89E895D40}.Release|Any CPU.Build.0 = Release|Any CPU
144+
{DC3D89E5-742B-D22E-0A11-01246C6808EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145+
{DC3D89E5-742B-D22E-0A11-01246C6808EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
146+
{DC3D89E5-742B-D22E-0A11-01246C6808EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{DC3D89E5-742B-D22E-0A11-01246C6808EC}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{5EE66142-A08B-35EE-99EF-742A5F4CBCA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149+
{5EE66142-A08B-35EE-99EF-742A5F4CBCA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
150+
{5EE66142-A08B-35EE-99EF-742A5F4CBCA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
151+
{5EE66142-A08B-35EE-99EF-742A5F4CBCA0}.Release|Any CPU.Build.0 = Release|Any CPU
152+
{4E2092C1-64FB-C3DB-4741-ACD93008F41C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153+
{4E2092C1-64FB-C3DB-4741-ACD93008F41C}.Debug|Any CPU.Build.0 = Debug|Any CPU
154+
{4E2092C1-64FB-C3DB-4741-ACD93008F41C}.Release|Any CPU.ActiveCfg = Release|Any CPU
155+
{4E2092C1-64FB-C3DB-4741-ACD93008F41C}.Release|Any CPU.Build.0 = Release|Any CPU
116156
EndGlobalSection
117157
GlobalSection(SolutionProperties) = preSolution
118158
HideSolutionNode = FALSE
119159
EndGlobalSection
120160
GlobalSection(NestedProjects) = preSolution
121-
{8733EF80-F310-44D6-90C6-A572CBC2EB48} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
122-
{7FB0E42A-2384-4A38-8DA1-967C0E8814D7} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
123-
{AA3755A1-26D1-4CD2-AC03-9B37B8168740} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
124-
{948ED4A3-76FB-451C-B44A-9228DA3C5697} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
125-
{1129724A-6E10-4476-9C88-A992A4449825} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
126-
{838CB3AC-6958-4DCC-83DE-2D2E20EB81B9} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
127-
{5E2F484A-9C35-4375-8A97-85B4E81EA11A} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
128-
{261DD773-A462-43BA-AF12-95DE7A5CEA00} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
129-
{0D7EA704-D09A-4A24-A2A2-F018D53FC9E3} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
130-
{421FF239-D905-4089-B402-AA75C17445CF} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
131-
{0BA404C5-8F6E-41C2-BD90-5F4BCA4F0320} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
132-
{D438D91C-487D-442F-AB8A-899C32D7671A} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
161+
{8733EF80-F310-44D6-90C6-A572CBC2EB48} = {EABAB36D-A27A-4359-8C73-B8107ABF13C8}
162+
{7FB0E42A-2384-4A38-8DA1-967C0E8814D7} = {F061F24B-920E-48DA-A0AD-A50975A86B1A}
163+
{AA3755A1-26D1-4CD2-AC03-9B37B8168740} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
164+
{948ED4A3-76FB-451C-B44A-9228DA3C5697} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
165+
{1129724A-6E10-4476-9C88-A992A4449825} = {0A827EBE-B64B-4041-A47C-6861DD040488}
166+
{838CB3AC-6958-4DCC-83DE-2D2E20EB81B9} = {0A827EBE-B64B-4041-A47C-6861DD040488}
167+
{5E2F484A-9C35-4375-8A97-85B4E81EA11A} = {0A827EBE-B64B-4041-A47C-6861DD040488}
168+
{261DD773-A462-43BA-AF12-95DE7A5CEA00} = {0A827EBE-B64B-4041-A47C-6861DD040488}
169+
{0D7EA704-D09A-4A24-A2A2-F018D53FC9E3} = {0A827EBE-B64B-4041-A47C-6861DD040488}
170+
{421FF239-D905-4089-B402-AA75C17445CF} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
171+
{0BA404C5-8F6E-41C2-BD90-5F4BCA4F0320} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
172+
{D438D91C-487D-442F-AB8A-899C32D7671A} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
173+
{8318EF15-206A-C1C0-13CC-E7CD833C2CFA} = {E95953CA-29A4-441D-BFF0-7D2711FAAE3D}
174+
{A34D4669-F8BF-724F-85C3-EEF89E895D40} = {E95953CA-29A4-441D-BFF0-7D2711FAAE3D}
175+
{DC3D89E5-742B-D22E-0A11-01246C6808EC} = {E95953CA-29A4-441D-BFF0-7D2711FAAE3D}
176+
{5EE66142-A08B-35EE-99EF-742A5F4CBCA0} = {E95953CA-29A4-441D-BFF0-7D2711FAAE3D}
177+
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
178+
{0A827EBE-B64B-4041-A47C-6861DD040488} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
179+
{E95953CA-29A4-441D-BFF0-7D2711FAAE3D} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
180+
{EABAB36D-A27A-4359-8C73-B8107ABF13C8} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
181+
{F061F24B-920E-48DA-A0AD-A50975A86B1A} = {F66B4611-7D9E-47B0-909A-969B74F46E48}
182+
{4E2092C1-64FB-C3DB-4741-ACD93008F41C} = {E95953CA-29A4-441D-BFF0-7D2711FAAE3D}
133183
EndGlobalSection
134184
GlobalSection(ExtensibilityGlobals) = postSolution
135185
SolutionGuid = {F708D827-C6F0-4D56-A3C1-F45D8B98F897}

‎src/V2/ServiceQuery.AzureDataTables/ServiceQuery.AzureDataTables.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>2.2.2</Version>
4+
<Version>2.2.3</Version>
55
<Description>ServiceQuery allows dynamic querying of data over service boundaries. Visit http://ServiceQuery.com to learn more.</Description>
66
<PackageId>ServiceQuery.AzureDataTables</PackageId>
77
<Title>ServiceQuery.AzureDataTables</Title>
88
<AssemblyTitle>ServiceQuery.AzureDataTables</AssemblyTitle>
99
<Authors>holomodular</Authors>
1010
<Company>HoloModular LLC</Company>
1111
<Product>ServiceQuery</Product>
12-
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
12+
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
1313
<Nullable>disable</Nullable>
1414
<Copyright>Copyright © 2025 HoloModular LLC. All Rights Reserved.</Copyright>
1515
<PackageProjectUrl>https://ServiceQuery.com</PackageProjectUrl>
@@ -34,7 +34,7 @@
3434

3535
<ItemGroup>
3636
<PackageReference Include="Azure.Data.Tables" Version="12.11.0" />
37-
<PackageReference Include="ServiceQuery" Version="2.2.2" />
37+
<PackageReference Include="ServiceQuery" Version="2.2.3" />
3838
</ItemGroup>
3939

4040
</Project>

‎src/V2/ServiceQuery.EntityFrameworkCore/ServiceQuery.EntityFrameworkCore.csproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>2.2.2</Version>
4+
<Version>2.2.3</Version>
55
<Description>ServiceQuery allows dynamic querying of data over service boundaries. Visit http://ServiceQuery.com to learn more.</Description>
66
<PackageId>ServiceQuery.EntityFrameworkCore</PackageId>
77
<Title>ServiceQuery.EntityFrameworkCore</Title>
88
<AssemblyTitle>ServiceQuery.EntityFrameworkCore</AssemblyTitle>
99
<Authors>holomodular</Authors>
1010
<Company>HoloModular LLC</Company>
1111
<Product>ServiceQuery</Product>
12-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
12+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
1313
<Nullable>disable</Nullable>
1414
<Copyright>Copyright © 2025 HoloModular LLC. All Rights Reserved.</Copyright>
1515
<PackageProjectUrl>https://ServiceQuery.com</PackageProjectUrl>
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="ServiceQuery" Version="2.2.2" />
36+
<PackageReference Include="ServiceQuery" Version="2.2.3" />
3737
</ItemGroup>
3838

3939

@@ -61,4 +61,10 @@
6161
</PackageReference>
6262
</ItemGroup>
6363

64+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
65+
<PackageReference Include="Microsoft.EntityFrameworkCore">
66+
<Version>10.0.0</Version>
67+
</PackageReference>
68+
</ItemGroup>
69+
6470
</Project>

‎src/V2/ServiceQuery.EntityFrameworkCore8/ServiceQuery.EntityFrameworkCore8.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>2.2.2</Version>
4+
<Version>2.2.3</Version>
55
<Description>ServiceQuery allows dynamic querying of data over service boundaries. Visit http://ServiceQuery.com to learn more.</Description>
66
<PackageId>ServiceQuery.EntityFrameworkCore8</PackageId>
77
<Title>ServiceQuery.EntityFrameworkCore8</Title>
@@ -38,7 +38,7 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="ServiceQuery" Version="2.2.2" />
41+
<PackageReference Include="ServiceQuery" Version="2.2.3" />
4242
</ItemGroup>
4343

4444
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

‎src/V2/ServiceQuery.MongoDb/ServiceQuery.MongoDb.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>2.2.2</Version>
4+
<Version>2.2.3</Version>
55
<Description>ServiceQuery allows dynamic querying of data over service boundaries. Visit http://ServiceQuery.com to learn more.</Description>
66
<PackageId>ServiceQuery.MongoDb</PackageId>
77
<Title>ServiceQuery.MongoDb</Title>
88
<AssemblyTitle>ServiceQuery.MongoDb</AssemblyTitle>
99
<Authors>holomodular</Authors>
1010
<Company>HoloModular LLC</Company>
1111
<Product>ServiceQuery</Product>
12-
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
12+
<TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
1313
<Nullable>disable</Nullable>
1414
<Copyright>Copyright © 2025 HoloModular LLC. All Rights Reserved.</Copyright>
1515
<PackageProjectUrl>https://ServiceQuery.com</PackageProjectUrl>
@@ -33,8 +33,8 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="MongoDB.Driver" Version="3.4.1" />
37-
<PackageReference Include="ServiceQuery" Version="2.2.2" />
36+
<PackageReference Include="MongoDB.Driver" Version="3.5.2" />
37+
<PackageReference Include="ServiceQuery" Version="2.2.3" />
3838
</ItemGroup>
3939

4040
</Project>

‎src/V2/ServiceQuery/Extensions/ServiceQueryExtensions.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,12 @@ private static IQueryable<T> BuildOrderBy<T>(this IQueryable<T> queryable, Servi
10631063
}
10641064
}
10651065

1066+
/// <summary>
1067+
/// Returns the query as a set of filters
1068+
/// </summary>
1069+
/// <param name="query"></param>
1070+
/// <param name="options"></param>
1071+
/// <returns></returns>
10661072
public static ServiceQueryFilterSet GetFilterSet(this IServiceQuery query, ServiceQueryOptions options)
10671073
{
10681074
if (query.Filters != null && options != null && !options.AllowMissingExpressions)

0 commit comments

Comments
 (0)