Merge branch 'release/7.0' into release/8.0

ajcvickers · ajcvickers · commit 141740fdcac4 · 2023-11-22T11:52:09.000Z
diff --git a/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.cs
@@ -201,7 +201,8 @@ private static Task<int> NonQueryResultAsync(
                                 state.commandSource),
                             cancellationToken);
                     },
-                    null);
+                    null,
+                    relationalQueryContext.CancellationToken);
             }
             finally
             {

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,8 @@ private static Task<int> NonQueryResultAsync(`
`201`	`201`	`state.commandSource),`
`202`	`202`	`cancellationToken);`
`203`	`203`	`},`
`204`		`- null);`
	`204`	`+ null,`
	`205`	`+ relationalQueryContext.CancellationToken);`
`205`	`206`	`}`
`206`	`207`	`finally`
`207`	`208`	`{`