Support both net6 and net7

zoriya · zoriya · commit c15b9704198c · 2023-10-14T00:28:34.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -23,11 +23,15 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworkVersion>net6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>net7.0;net6.0</TargetFrameworkVersion>
     <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
     <EFCoreVersion>6.0.0</EFCoreVersion>
     <TestEFCoreVersion>$(EFCoreVersion)</TestEFCoreVersion>
   </PropertyGroup>
-   
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <EFCoreVersion>7.0.0</EFCoreVersion>
+    <TestEFCoreVersion>$(EFCoreVersion)</TestEFCoreVersion>
+  </PropertyGroup>
 
 </Project>
diff --git a/samples/BasicSample/BasicSample.csproj b/samples/BasicSample/BasicSample.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/BasicSample/Program.cs b/samples/BasicSample/Program.cs
@@ -159,6 +159,9 @@ public static void Main(string[] args)
                 
                 result = dbContext.Users.FirstOrDefault(x => x.TotalSpent > 1);
                 Console.WriteLine($"Our first user {result.FullName} has spent {result.TotalSpent}");
+                
+                var spent = dbContext.Users.Sum(x => x.TotalSpent);
+                Console.WriteLine($"Our users combined spent: {spent}");
             }
 
             {
diff --git a/samples/ReadmeSample/ReadmeSample.csproj b/samples/ReadmeSample/ReadmeSample.csproj
@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCore.Projectables/EntityFrameworkCore.Projectables.csproj b/src/EntityFrameworkCore.Projectables/EntityFrameworkCore.Projectables.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
diff --git a/src/EntityFrameworkCore.Projectables/Services/ProjectableExpressionReplacer.cs b/src/EntityFrameworkCore.Projectables/Services/ProjectableExpressionReplacer.cs
@@ -128,8 +128,8 @@ bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out La
                     var self = _AddProjectableSelect(call.Arguments.First(), _entityType);
                     return call.Update(null, call.Arguments.Skip(1).Prepend(self));
                 }
-                case QueryRootExpression root:
-                    return _AddProjectableSelect(root, root.EntityType);
+                case QueryRootExpression root when _entityType != null:
+                    return _AddProjectableSelect(root, _entityType);
                 default:
                     return ret;
             }
@@ -214,7 +214,11 @@ PropertyInfo property when nodeExpression is not null
 
         protected override Expression VisitExtension(Expression node)
         {
+#if NET7_0_OR_GREATER
+            if (node is EntityQueryRootExpression root)
+#else
             if (node is QueryRootExpression root)
+#endif
             {
                 _entityType = root.EntityType;
             }
diff --git a/tests/EntityFrameworkCore.Projectables.FunctionalTests/EntityFrameworkCore.Projectables.FunctionalTests.csproj b/tests/EntityFrameworkCore.Projectables.FunctionalTests/EntityFrameworkCore.Projectables.FunctionalTests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(TestEFCoreVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="ScenarioTests.XUnit" Version="1.0.0" />
     <PackageReference Include="Verify.Xunit" Version="11.5.0" />

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,9 @@ public static void Main(string[] args)`
`159`	`159`
`160`	`160`	`result = dbContext.Users.FirstOrDefault(x => x.TotalSpent > 1);`
`161`	`161`	`Console.WriteLine($"Our first user {result.FullName} has spent {result.TotalSpent}");`
	`162`	`+`
	`163`	`+ var spent = dbContext.Users.Sum(x => x.TotalSpent);`
	`164`	`+ Console.WriteLine($"Our users combined spent: {spent}");`
`162`	`165`	`}`
`163`	`166`
`164`	`167`	`{`
Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,8 @@ bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out La`
`128`	`128`	`var self = _AddProjectableSelect(call.Arguments.First(), _entityType);`
`129`	`129`	`return call.Update(null, call.Arguments.Skip(1).Prepend(self));`
`130`	`130`	`}`
`131`		`- case QueryRootExpression root:`
`132`		`- return _AddProjectableSelect(root, root.EntityType);`
	`131`	`+ case QueryRootExpression root when _entityType != null:`
	`132`	`+ return _AddProjectableSelect(root, _entityType);`
`133`	`133`	`default:`
`134`	`134`	`return ret;`
`135`	`135`	`}`
`@@ -214,7 +214,11 @@ PropertyInfo property when nodeExpression is not null`
`214`	`214`
`215`	`215`	`protected override Expression VisitExtension(Expression node)`
`216`	`216`	`{`
	`217`	`+#if NET7_0_OR_GREATER`
	`218`	`+ if (node is EntityQueryRootExpression root)`
	`219`	`+#else`
`217`	`220`	`if (node is QueryRootExpression root)`
	`221`	`+#endif`
`218`	`222`	`{`
`219`	`223`	`_entityType = root.EntityType;`
`220`	`224`	`}`