v10.0.0 Upgrade to .Net 10 and EntityFrameworkCore 10

ramantsitou · ramantsitou · commit f9a8d62b1cbc · 2025-11-22T15:20:03.000+01:00
diff --git a/src/MockQueryable/MockQueryable.Core/MockQueryable.Core.csproj b/src/MockQueryable/MockQueryable.Core/MockQueryable.Core.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <PackageId>MockQueryable.Core</PackageId>
 		<Authors>Roman Titov</Authors>
 	  <Description>
@@ -14,11 +14,11 @@
 	  <PackageTags>Mock EntityFrameworkCore Queryable mock EF UnitTests EntityFrameworkCore</PackageTags>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	  <PackageReleaseNotes>
-		  Upgrade to .Net 9 and EntityFrameworkCore 9
+		  Upgrade to .Net 10 and EntityFrameworkCore 10
 	  </PackageReleaseNotes>
-	  <Version>9.0.0</Version>
-	  <AssemblyVersion>9.0.0.0</AssemblyVersion>
-	  <FileVersion>9.0.0.0</FileVersion>
+	  <Version>10.0.0</Version>
+	  <AssemblyVersion>10.0.0.0</AssemblyVersion>
+	  <FileVersion>10.0.0.0</FileVersion>
 	  <Company></Company>
 	  <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	  <PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/src/MockQueryable/MockQueryable.EntityFrameworkCore/MockQueryable.EntityFrameworkCore.csproj b/src/MockQueryable/MockQueryable.EntityFrameworkCore/MockQueryable.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<PackageId>MockQueryable.EntityFrameworkCore</PackageId>
 		<Authors>Roman Titov</Authors>
 		<Description>
@@ -14,11 +14,11 @@
 		<PackageTags>Mock EntityFrameworkCore Queryable mock EF UnitTests EntityFrameworkCore</PackageTags>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageReleaseNotes>
-			Upgrade to .Net 9 and EntityFrameworkCore 9
+			Upgrade to .Net 10 and EntityFrameworkCore 10
 		</PackageReleaseNotes>
-		<Version>9.0.0</Version>
-		<AssemblyVersion>9.0.0.0</AssemblyVersion>
-		<FileVersion>9.0.0.0</FileVersion>
+		<Version>10.0.0</Version>
+		<AssemblyVersion>10.0.0.0</AssemblyVersion>
+		<FileVersion>10.0.0.0</FileVersion>
 		<Company></Company>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -44,8 +44,8 @@
 		</None>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0" />
 	</ItemGroup>
 
   <ItemGroup>
diff --git a/src/MockQueryable/MockQueryable.EntityFrameworkCore/TestQueryProviderEfCore.cs b/src/MockQueryable/MockQueryable.EntityFrameworkCore/TestQueryProviderEfCore.cs
@@ -5,6 +5,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -92,29 +94,78 @@ public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToke
     private static void ApplyUpdateChangesToDbSet(IEnumerable<T> affectedItems,
         MethodCallExpression methodCallExpression)
     {
-        // Extract the update lambda: opt => opt.SetProperty(...)
-        if ((methodCallExpression.Arguments[1] as UnaryExpression)?.Operand is not LambdaExpression updateLambda)
+
+        if (methodCallExpression.Arguments[1] is not NewArrayExpression arrayExpr)
         {
             return;
         }
 
-        // The body may be a chain of MethodCallExpressions
-        var currentCall = updateLambda.Body as MethodCallExpression;
-        while (currentCall is { Method.Name: nameof(SetPropertyCalls<T>.SetProperty) })
-        {
-            var memberExpr = currentCall.Arguments[0] as LambdaExpression;
-            var valueExpr = currentCall.Arguments[1];
-
-            var propertyInfo = ((memberExpr.Body as MemberExpression)?.Member) as System.Reflection.PropertyInfo;
-            var value = Expression.Lambda(valueExpr).Compile().DynamicInvoke();
 
-            foreach (var item in affectedItems)
+        foreach (var element in arrayExpr.Expressions.Cast<NewExpression>())
+        {
+            var lambdaExpr = ExtractLambda(element.Arguments[0]);
+            if (element.Arguments[1] is ConstantExpression constExpr)
             {
-                propertyInfo?.SetValue(item, value);
+                var value = constExpr.Value;
+
+                foreach (var item in affectedItems)
+                {
+                    SetProperty(item, lambdaExpr, value);
+                }
             }
+            
+            
+        }
+
+
+    }
+
+    private static LambdaExpression ExtractLambda(Expression expr)
+    {
+
+        if (expr is UnaryExpression { NodeType: ExpressionType.Quote } unary)
+        {
+            expr = unary.Operand;
+        }
+
+        if (expr is UnaryExpression { NodeType: ExpressionType.Convert } unary2)
+        {
+            expr = unary2.Operand;
+        }
+
+        return expr as LambdaExpression;
+    }
+
+
+
+    private static void SetProperty(T item, LambdaExpression lambda, object value)
+    {
+        var body = lambda.Body;
+
 
-            // Move to the next chained call (if any)
-            currentCall = currentCall.Object as MethodCallExpression;
+        if (body is UnaryExpression { NodeType: ExpressionType.Convert } unary)
+        {
+            body = unary.Operand;
+        }
+
+        if (body is not MemberExpression memberExpr)
+        {
+            return;
         }
+
+        if (memberExpr.Member is not PropertyInfo prop)
+        {
+            return;
+        }
+
+        var converted = value;
+
+        if (value != null && !prop.PropertyType.IsInstanceOfType(value))
+        {
+            converted = Convert.ChangeType(value, prop.PropertyType);
+        }
+
+        prop.SetValue(item, converted);
     }
+
 }
diff --git a/src/MockQueryable/MockQueryable.FakeItEasy/MockQueryable.FakeItEasy.csproj b/src/MockQueryable/MockQueryable.FakeItEasy/MockQueryable.FakeItEasy.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <PackageId>MockQueryable.FakeItEasy</PackageId>
     <Authors>Roman Titov</Authors>
 	  <Description>
@@ -14,11 +14,11 @@
 	  <PackageTags>Mock EntityFrameworkCore Queryable mock EF UnitTests EntityFrameworkCore</PackageTags>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	  <PackageReleaseNotes>
-		  Upgrade to .Net 9 and EntityFrameworkCore 9
+		  Upgrade to .Net 10 and EntityFrameworkCore 10
 	  </PackageReleaseNotes>
-	  <Version>9.0.0</Version>
-	  <AssemblyVersion>9.0.0.0</AssemblyVersion>
-	  <FileVersion>9.0.0.0</FileVersion>
+	  <Version>10.0.0</Version>
+	  <AssemblyVersion>10.0.0.0</AssemblyVersion>
+	  <FileVersion>10.0.0.0</FileVersion>
     <Company></Company>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	<PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/src/MockQueryable/MockQueryable.Moq/MockQueryable.Moq.csproj b/src/MockQueryable/MockQueryable.Moq/MockQueryable.Moq.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 	  <PackageId>MockQueryable.Moq</PackageId>
     <Authors>Roman Titov</Authors>
 	  <Description>
@@ -14,11 +14,11 @@
 	  <PackageTags>Mock EntityFrameworkCore Queryable mock EF UnitTests EntityFrameworkCore</PackageTags>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	  <PackageReleaseNotes>
-		  Upgrade to .Net 9 and EntityFrameworkCore 9
+		  Upgrade to .Net 10 and EntityFrameworkCore 10
 	  </PackageReleaseNotes>
-	  <Version>9.0.0</Version>
-	  <AssemblyVersion>9.0.0.0</AssemblyVersion>
-	  <FileVersion>9.0.0.0</FileVersion>
+	  <Version>10.0.0</Version>
+	  <AssemblyVersion>10.0.0.0</AssemblyVersion>
+	  <FileVersion>10.0.0.0</FileVersion>
     <Company></Company>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	<PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/src/MockQueryable/MockQueryable.NSubstitute/MockQueryable.NSubstitute.csproj b/src/MockQueryable/MockQueryable.NSubstitute/MockQueryable.NSubstitute.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 	  <PackageId>MockQueryable.NSubstitute</PackageId>
 		<Authors>Roman Titov</Authors>
 	  <Description>
@@ -14,11 +14,11 @@
 	  <PackageTags>Mock EntityFrameworkCore Queryable mock EF UnitTests EntityFrameworkCore</PackageTags>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	  <PackageReleaseNotes>
-		  Upgrade to .Net 9 and EntityFrameworkCore 9
+		  Upgrade to .Net 10 and EntityFrameworkCore 10
 	  </PackageReleaseNotes>
-	  <Version>9.0.0</Version>
-	  <AssemblyVersion>9.0.0.0</AssemblyVersion>
-	  <FileVersion>9.0.0.0</FileVersion>
+	  <Version>10.0.0</Version>
+	  <AssemblyVersion>10.0.0.0</AssemblyVersion>
+	  <FileVersion>10.0.0.0</FileVersion>
     <Company></Company>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	<PackageReadmeFile>README.md</PackageReadmeFile>
diff --git a/src/MockQueryable/MockQueryable.Sample/MockQueryable.Sample.csproj b/src/MockQueryable/MockQueryable.Sample/MockQueryable.Sample.csproj
@@ -1,23 +1,22 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFramework>net9</TargetFramework>
+	  <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="SampleLikeExpressionVisitor.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="15.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+    <PackageReference Include="AutoMapper" Version="15.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <!--<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />-->
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MockQueryable/MockQueryable.Sample/MyServiceFakeItEasyTests.cs b/src/MockQueryable/MockQueryable.Sample/MyServiceFakeItEasyTests.cs
@@ -257,7 +257,7 @@ public void GetUsersByLastName_ExpressionVisitorMissing_ThrowsException()
         Assert.That(
             exception.Message,
             Is.EqualTo(
-                "The 'ILike' method is not supported because the query has switched to client-evaluation. " +
+                "The 'Like' method is not supported because the query has switched to client-evaluation. " +
                 "This usually happens when the arguments to the method cannot be translated to server. " +
                 "Rewrite the query to avoid client evaluation of arguments so that method can be translated to server."));
     }
diff --git a/src/MockQueryable/MockQueryable.Sample/MyServiceMoqTests.cs b/src/MockQueryable/MockQueryable.Sample/MyServiceMoqTests.cs
@@ -297,7 +297,7 @@ public void GetUsersByLastName_ExpressionVisitorMissing_ThrowsException()
         Assert.That(
             exception.Message,
             Is.EqualTo(
-                "The 'ILike' method is not supported because the query has switched to client-evaluation. " +
+                "The 'Like' method is not supported because the query has switched to client-evaluation. " +
                 "This usually happens when the arguments to the method cannot be translated to server. " +
                 "Rewrite the query to avoid client evaluation of arguments so that method can be translated to server."));
     }
diff --git a/src/MockQueryable/MockQueryable.Sample/MyServiceNSubstituteTests.cs b/src/MockQueryable/MockQueryable.Sample/MyServiceNSubstituteTests.cs
@@ -335,7 +335,7 @@ public void GetUsersByLastName_ExpressionVisitorMissing_ThrowsException()
         Assert.That(
             exception.Message,
             Is.EqualTo(
-                "The 'ILike' method is not supported because the query has switched to client-evaluation. " +
+                "The 'Like' method is not supported because the query has switched to client-evaluation. " +
                 "This usually happens when the arguments to the method cannot be translated to server. " +
                 "Rewrite the query to avoid client evaluation of arguments so that method can be translated to server."));
     }
diff --git a/src/MockQueryable/MockQueryable.Sample/SampleLikeExpressionVisitor.cs b/src/MockQueryable/MockQueryable.Sample/SampleLikeExpressionVisitor.cs
@@ -18,7 +18,8 @@ public class SampleLikeExpressionVisitor : ExpressionVisitor
     /// </summary>
     protected override Expression VisitMethodCall(MethodCallExpression node)
     {
-        if (node.Method.Name is nameof(NpgsqlDbFunctionsExtensions.ILike) or nameof(DbFunctionsExtensions.Like) &&
+        //TODO: Use nameof(NpgsqlDbFunctionsExtensions.ILike) after upgrade to 10.0 version
+        if (node.Method.Name is "ILike" or nameof(DbFunctionsExtensions.Like) &&
             node.Arguments.Count == 3)
         {
 
diff --git a/src/MockQueryable/MockQueryable.Sample/TestDbSetRepository.cs b/src/MockQueryable/MockQueryable.Sample/TestDbSetRepository.cs
@@ -45,8 +45,9 @@ public async Task<IEnumerable<UserEntity>> GetUsersByFirstName(string firstName)
 
         public async Task<IEnumerable<UserEntity>> GetUsersByLastName(string firstName)
         {
+            //TODO: change back to EF.Functions.ILike
             return await _dbSet
-                .Where(x => EF.Functions.ILike(x.LastName, $"%{firstName}%"))
+                .Where(x => EF.Functions.Like(x.LastName, $"%{firstName}%"))
                 .ToListAsync();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public void GetUsersByLastName_ExpressionVisitorMissing_ThrowsException()`
`257`	`257`	`Assert.That(`
`258`	`258`	`exception.Message,`
`259`	`259`	`Is.EqualTo(`
`260`		`- "The 'ILike' method is not supported because the query has switched to client-evaluation. " +`
	`260`	`+ "The 'Like' method is not supported because the query has switched to client-evaluation. " +`
`261`	`261`	`"This usually happens when the arguments to the method cannot be translated to server. " +`
`262`	`262`	`"Rewrite the query to avoid client evaluation of arguments so that method can be translated to server."));`
`263`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public void GetUsersByLastName_ExpressionVisitorMissing_ThrowsException()`
`297`	`297`	`Assert.That(`
`298`	`298`	`exception.Message,`
`299`	`299`	`Is.EqualTo(`
`300`		`- "The 'ILike' method is not supported because the query has switched to client-evaluation. " +`
	`300`	`+ "The 'Like' method is not supported because the query has switched to client-evaluation. " +`
`301`	`301`	`"This usually happens when the arguments to the method cannot be translated to server. " +`
`302`	`302`	`"Rewrite the query to avoid client evaluation of arguments so that method can be translated to server."));`
`303`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ public void GetUsersByLastName_ExpressionVisitorMissing_ThrowsException()`
`335`	`335`	`Assert.That(`
`336`	`336`	`exception.Message,`
`337`	`337`	`Is.EqualTo(`
`338`		`- "The 'ILike' method is not supported because the query has switched to client-evaluation. " +`
	`338`	`+ "The 'Like' method is not supported because the query has switched to client-evaluation. " +`
`339`	`339`	`"This usually happens when the arguments to the method cannot be translated to server. " +`
`340`	`340`	`"Rewrite the query to avoid client evaluation of arguments so that method can be translated to server."));`
`341`	`341`	`}`