From dcc0474cf7018ebd8c6d0093628f0d52c563f196 Mon Sep 17 00:00:00 2001 From: Serhii Kozachenko Date: Mon, 1 Dec 2025 13:12:18 +0000 Subject: [PATCH 1/2] Add cancellation token support in precompiled query context generation --- .../Query/Internal/PrecompiledQueryCodeGenerator.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs b/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs index ed9c2e6fa28..9ab95c90e0d 100644 --- a/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs +++ b/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs @@ -736,6 +736,13 @@ void ProcessCapturedVariables() if (parameterType == typeof(CancellationToken)) { + // Set the cancellation token on the query context + if (!declaredQueryContextVariable) + { + code.AppendLine("var queryContext = precompiledQueryContext.QueryContext;"); + declaredQueryContextVariable = true; + } + code.AppendLine($"queryContext.CancellationToken = {parameterName};"); continue; } From 953265891a0b3f860a2024efa788c4f267b92fcc Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Thu, 12 Feb 2026 15:22:27 +0100 Subject: [PATCH 2/2] Tweak --- .../Query/Internal/PrecompiledQueryCodeGenerator.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs b/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs index 9ab95c90e0d..d1edb765ca6 100644 --- a/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs +++ b/src/EFCore.Design/Query/Internal/PrecompiledQueryCodeGenerator.cs @@ -742,6 +742,7 @@ void ProcessCapturedVariables() code.AppendLine("var queryContext = precompiledQueryContext.QueryContext;"); declaredQueryContextVariable = true; } + code.AppendLine($"queryContext.CancellationToken = {parameterName};"); continue; }