Skip to content

Fix/2670 memoryextensions net10 followup #2710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JKamsker merged 3 commits into from
Oct 7, 2025
Merged

Fix/2670 memoryextensions net10 followup #2710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faccdb9
Add .NET 10 target framework to test project
NicholasBaum Oct 6, 2025
60d0317
Added support for Contains 3-parameter overload
NicholasBaum Oct 6, 2025
ff5fc06
Fix CI
JKamsker Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/_reusable-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
type: string
default: |
[
{ "display": ".NET 8", "sdk": "8.0.x", "framework": "net8.0", "includePrerelease": false },
{ "display": ".NET 9", "sdk": "9.0.x\n8.0.x", "framework": "net8.0", "includePrerelease": true },
{ "display": ".NET 10", "sdk": "10.0.x\n8.0.x", "framework": "net8.0", "includePrerelease": true }
{ "display": ".NET 8", "sdk": "8.0.x", "framework": "net8.0", "includePrerelease": false, "msbuildProps": "" },
{ "display": ".NET 9", "sdk": "9.0.x\n8.0.x", "framework": "net8.0", "includePrerelease": true, "msbuildProps": "" },
{ "display": ".NET 10", "sdk": "10.0.x\n8.0.x", "framework": "net10.0", "includePrerelease": true, "msbuildProps": "-p:LiteDBTestsEnableNet10=true" }
]

jobs:
Expand Down Expand Up @@ -79,6 +79,7 @@ jobs:
--configuration Release
--framework ${{ matrix.item.framework }}
--no-dependencies
${{ matrix.item.msbuildProps }}

- name: Run tests
timeout-minutes: 5
Expand All @@ -91,6 +92,7 @@ jobs:
--settings tests.runsettings
--logger "trx;LogFileName=TestResults.trx"
--logger "console;verbosity=detailed"
${{ matrix.item.msbuildProps }}

repro-runner:
runs-on: ubuntu-latest
Expand Down
4 changes: 3 additions & 1 deletion LiteDB.Tests/LiteDB.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<LiteDBTestsEnableNet10 Condition="'$(LiteDBTestsEnableNet10)' == ''">false</LiteDBTestsEnableNet10>
<TargetFrameworks>net461;net481;net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(LiteDBTestsEnableNet10)' == 'true'">$(TargetFrameworks);net10.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<AssemblyName>LiteDB.Tests</AssemblyName>
<RootNamespace>LiteDB.Tests</RootNamespace>
Expand Down Expand Up @@ -64,4 +66,4 @@
<ProjectReference Include="..\LiteDB\LiteDB.csproj" />
</ItemGroup>

</Project>
</Project>
16 changes: 13 additions & 3 deletions LiteDB/Client/Mapper/Linq/TypeResolver/MemoryExtensionsResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,21 @@ internal class MemoryExtensionsResolver : ITypeResolver
{
public string ResolveMethod(MethodInfo method)
{
if (method.Name == nameof(System.MemoryExtensions.Contains))
if (method.Name != nameof(System.MemoryExtensions.Contains))
return null;
var parameters = method.GetParameters();

if (parameters.Length == 2)
{
return "@0 ANY = @1";
}

// Support the 3-parameter overload only when comparer defaults to null.
if (parameters.Length == 3)
{
var parameters = method.GetParameters();
var third = parameters[2];

if (parameters.Length == 2)
if (third.HasDefaultValue && third.DefaultValue == null)
{
return "@0 ANY = @1";
}
Expand Down
Loading