Up date to latest ef core dependency (#244)

ChrisJollyAU · web-flow · commit 2d5930abc91b · 2024-06-23T02:17:23.000+08:00
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);
diff --git a/test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs b/test/EFCore.Jet.FunctionalTests/Query/ComplexTypeQueryJetTest.cs

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,9 @@ public virtual Expression Process(Expression expression)`
`128`	`128`	`selectExpression.PushdownIntoSubquery();`
`129`	`129`	`}`
`130`	`130`
`131`		`- for (int j = 0; j < columnsToRewrite.Count; j++)`
	`131`	`+ foreach (var colr in columnsToRewrite)`
`132`	`132`	`{`
`133`		`- (int? index, OrderingExpression? oexp, bool ascending, bool rewrite, bool referstocurouter) = columnsToRewrite[j];`
	`133`	`+ (int? index, OrderingExpression? oexp, bool ascending, bool rewrite, bool referstocurouter) = colr.Value;`
`134`	`134`	`if (index.HasValue)`
`135`	`135`	`{`
`136`	`136`	`var proj = selectExpression.Projection[index.Value];`
`@@ -145,20 +145,9 @@ public virtual Expression Process(Expression expression)`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`148`		`- if (isscalarselect)`
	`148`	`+ if (isscalarselect && selectExpression.Projection.Count > 1)`
`149`	`149`	`{`
`150`		`- List<ProjectionExpression> newProjections = new List<ProjectionExpression>();`
`151`		`- for (int j = 0; j < selectExpression.Projection.Count; j++)`
`152`		`- {`
`153`		`- var proj = selectExpression.Projection[j];`
`154`		`- var item = columnsToRewrite.SingleOrDefault(c => c.Value.indexcol == j);`
`155`		`- if (item.Value.indexcol == null)`
`156`		`- {`
`157`		`- newProjections.Add(proj);`
`158`		`- }`
`159`		`-`
`160`		`- }`
`161`		`-`
	`150`	`+ List<ProjectionExpression> newProjections = [selectExpression.Projection[0]];`
`162`	`151`	`selectExpression = selectExpression.Update(newProjections, selectExpression.Tables, selectExpression.Predicate,`
`163`	`152`	`selectExpression.GroupBy, selectExpression.Having, selectExpression.Orderings,`
`164`	`153`	`selectExpression.Limit, selectExpression.Offset);`