From df82c69061a61278ffcd72a515099fdd57bd11fa Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Mon, 15 Feb 2021 12:41:25 +0200
Subject: [PATCH 1/2] Fix missing ConfigureAwait(false) in FutureEnumerable

---
 src/NHibernate/Multi/QueryBatchExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NHibernate/Multi/QueryBatchExtensions.cs b/src/NHibernate/Multi/QueryBatchExtensions.cs
index c5405ff9a66..79ba3818a4f 100644
--- a/src/NHibernate/Multi/QueryBatchExtensions.cs
+++ b/src/NHibernate/Multi/QueryBatchExtensions.cs
@@ -578,7 +578,7 @@ public FutureEnumerable(IQueryBatch batch, IQueryBatchItem<TResult> query)
 
 			public async Task<IEnumerable<TResult>> GetEnumerableAsync(CancellationToken cancellationToken = default(CancellationToken))
 			{
-				return await _result.GetValueAsync(cancellationToken);
+				return await _result.GetValueAsync(cancellationToken).ConfigureAwait(false);
 			}
 
 			public IEnumerable<TResult> GetEnumerable()

From fffa21166ef54a34a469ccad5f67997c9c5c75c2 Mon Sep 17 00:00:00 2001
From: Roman Artiukhin <bahusdrive@gmail.com>
Date: Mon, 15 Feb 2021 12:50:13 +0200
Subject: [PATCH 2/2] Make it auto generated

---
 src/NHibernate/Async/Multi/QueryBatchExtensions.cs | 10 ++++++++++
 src/NHibernate/Multi/QueryBatchExtensions.cs       |  7 +------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/NHibernate/Async/Multi/QueryBatchExtensions.cs b/src/NHibernate/Async/Multi/QueryBatchExtensions.cs
index 5786847c97e..24e5db5fa7c 100644
--- a/src/NHibernate/Async/Multi/QueryBatchExtensions.cs
+++ b/src/NHibernate/Async/Multi/QueryBatchExtensions.cs
@@ -61,6 +61,16 @@ partial class FutureList<TResult> : IFutureList<TResult>
 			}
 		}
 
+		partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
+		{
+
+			public async Task<IEnumerable<TResult>> GetEnumerableAsync(CancellationToken cancellationToken = default(CancellationToken))
+			{
+				cancellationToken.ThrowIfCancellationRequested();
+				return await (_result.GetValueAsync(cancellationToken)).ConfigureAwait(false);
+			}
+		}
+
 		#endregion Helper classes
 	}
 }
diff --git a/src/NHibernate/Multi/QueryBatchExtensions.cs b/src/NHibernate/Multi/QueryBatchExtensions.cs
index 79ba3818a4f..3b10d428265 100644
--- a/src/NHibernate/Multi/QueryBatchExtensions.cs
+++ b/src/NHibernate/Multi/QueryBatchExtensions.cs
@@ -567,7 +567,7 @@ public IList<TResult> Value
 			}
 		}
 
-		class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
+		partial class FutureEnumerable<TResult> : IFutureEnumerable<TResult>
 		{
 			private readonly IFutureList<TResult> _result;
 
@@ -576,11 +576,6 @@ public FutureEnumerable(IQueryBatch batch, IQueryBatchItem<TResult> query)
 				_result = new FutureList<TResult>(batch, query);
 			}
 
-			public async Task<IEnumerable<TResult>> GetEnumerableAsync(CancellationToken cancellationToken = default(CancellationToken))
-			{
-				return await _result.GetValueAsync(cancellationToken).ConfigureAwait(false);
-			}
-
 			public IEnumerable<TResult> GetEnumerable()
 			{
 				return _result.Value;