Up date to latest ef core dependency (#244)

CirrusRedOrg · Jun 22, 2024 · 2d5930a · 2d5930a
1 parent 4a11689
commit 2d5930a
Show file tree

Hide file tree

Showing 3 changed files with 448 additions and 20 deletions.
diff --git a/Dependencies.targets b/Dependencies.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<EFCoreVersion>[8.0.3,8.0.999]</EFCoreVersion>
+		<EFCoreVersion>[8.0.6,8.0.999]</EFCoreVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -10,7 +10,7 @@
 		<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
 		<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
-		<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+		<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
 		<PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
 		<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
 
@@ -28,9 +28,9 @@
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
 		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
 		<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-		<PackageReference Update="MSTest.TestAdapter" Version="3.2.2" />
-		<PackageReference Update="MSTest.TestFramework" Version="3.2.2" />
+		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+		<PackageReference Update="MSTest.TestAdapter" Version="3.4.3" />
+		<PackageReference Update="MSTest.TestFramework" Version="3.4.3" />
 		<PackageReference Update="coverlet.collector" Version="6.0.2" />
 		<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
 

diff --git a/src/EFCore.Jet/Query/Internal/JetLiftOrderByPostprocessor.cs b/src/EFCore.Jet/Query/Internal/JetLiftOrderByPostprocessor.cs
@@ -128,9 +128,9 @@ public virtual Expression Process(Expression expression)
                         selectExpression.PushdownIntoSubquery();
                     }
 
-                    for (int j = 0; j < columnsToRewrite.Count; j++)
+                    foreach (var colr in columnsToRewrite)
                     {
-                        (int? index, OrderingExpression? oexp, bool ascending, bool rewrite, bool referstocurouter) = columnsToRewrite[j];
+                        (int? index, OrderingExpression? oexp, bool ascending, bool rewrite, bool referstocurouter) = colr.Value;
                         if (index.HasValue)
                         {
                             var proj = selectExpression.Projection[index.Value];
@@ -145,20 +145,9 @@ public virtual Expression Process(Expression expression)
                         }
                     }
 
-                    if (isscalarselect)
+                    if (isscalarselect && selectExpression.Projection.Count > 1)
                     {
-                        List<ProjectionExpression> newProjections = new List<ProjectionExpression>();
-                        for (int j = 0; j < selectExpression.Projection.Count; j++)
-                        {
-                            var proj = selectExpression.Projection[j];
-                            var item = columnsToRewrite.SingleOrDefault(c => c.Value.indexcol == j);
-                            if (item.Value.indexcol == null)
-                            {
-                                newProjections.Add(proj);
-                            }
-
-                        }
-
+                        List<ProjectionExpression> newProjections = [selectExpression.Projection[0]];
                         selectExpression = selectExpression.Update(newProjections, selectExpression.Tables, selectExpression.Predicate,
                             selectExpression.GroupBy, selectExpression.Having, selectExpression.Orderings,
                             selectExpression.Limit, selectExpression.Offset);