Removed ASYNC directive as .NET 4 is not supported anymore and added nuget package System.Interactive.Async that will be used by the async Future methods

maca88 · hazzik · commit 0c4507dd9a4e · 2017-05-04T22:10:14.000+12:00
diff --git a/src/NHibernate/AdoNet/ResultSetWrapper.cs b/src/NHibernate/AdoNet/ResultSetWrapper.cs
@@ -2,10 +2,8 @@
 using System.Collections;
 using System.Data;
 using System.Data.Common;
-#if ASYNC
 using System.Threading;
 using System.Threading.Tasks;
-#endif
 
 namespace NHibernate.AdoNet
 {
@@ -51,7 +49,6 @@ public override bool Read()
 			return rs.Read();
 		}
 
-#if ASYNC
 		public override Task<bool> ReadAsync(CancellationToken cancellationToken)
 		{
 			return rs.ReadAsync(cancellationToken);
@@ -66,7 +63,6 @@ public override Task<bool> IsDBNullAsync(int ordinal, CancellationToken cancella
 		{
 			return rs.IsDBNullAsync(ordinal, cancellationToken);
 		}
-#endif
 
 		public override int Depth
 		{
diff --git a/src/NHibernate/Criterion/QueryOver.cs b/src/NHibernate/Criterion/QueryOver.cs
@@ -102,7 +102,6 @@ private IFutureValue<U> FutureValue<U>()
 			return criteria.FutureValue<U>();
 		}
 
-#if ASYNC
 		private IAsyncEnumerable<TRoot> FutureAsync()
 		{
 			return criteria.FutureAsync<TRoot>();
@@ -122,7 +121,6 @@ private IFutureValueAsync<U> FutureValueAsync<U>()
 		{
 			return criteria.FutureValueAsync<U>();
 		}
-#endif
 
         /// <summary>
         /// Get an executable instance of <c>IQueryOver&lt;TRoot&gt;</c>,
@@ -268,7 +266,6 @@ IFutureValue<TRoot> IQueryOver<TRoot>.FutureValue()
 		IFutureValue<U> IQueryOver<TRoot>.FutureValue<U>()
 		{ return FutureValue<U>(); }
 
-#if ASYNC
 		IAsyncEnumerable<TRoot> IQueryOver<TRoot>.FutureAsync()
 		{ return FutureAsync(); }
 
@@ -280,7 +277,6 @@ IFutureValueAsync<TRoot> IQueryOver<TRoot>.FutureValueAsync()
 
 		IFutureValueAsync<U> IQueryOver<TRoot>.FutureValueAsync<U>()
 		{ return FutureValueAsync<U>(); }
-#endif
 
 		IQueryOver<TRoot,TRoot> IQueryOver<TRoot>.Clone()
 		{ return Clone(); }
diff --git a/src/NHibernate/Driver/BasicResultSetsCommand.cs b/src/NHibernate/Driver/BasicResultSetsCommand.cs
@@ -7,10 +7,8 @@
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 using NHibernate.SqlTypes;
-#if ASYNC
 using System.Threading;
 using System.Threading.Tasks;
-#endif
 
 namespace NHibernate.Driver
 {
@@ -277,7 +275,6 @@ public override bool Read()
 			return reader.Read();
 		}
 
-#if ASYNC
 		public override Task<bool> ReadAsync(CancellationToken cancellationToken)
 		{
 			return reader.ReadAsync(cancellationToken);
@@ -292,7 +289,6 @@ public override Task<bool> NextResultAsync(CancellationToken cancellationToken)
 		{
 			return reader.NextResultAsync(cancellationToken);
 		}
-#endif
 
 		public override int Depth
 		{
diff --git a/src/NHibernate/Driver/NDataReader.cs b/src/NHibernate/Driver/NDataReader.cs
@@ -4,10 +4,8 @@
 using System.Data;
 using System.Data.Common;
 using NHibernate.Util;
-#if ASYNC
 using System.Threading;
 using System.Threading.Tasks;
-#endif
 
 namespace NHibernate.Driver
 {
@@ -165,7 +163,6 @@ public override bool Read()
 			return true;
 		}
 
-#if ASYNC
 		public override Task<bool> ReadAsync(CancellationToken cancellationToken)
 		{
 			return Task.FromResult(Read());
@@ -180,7 +177,6 @@ public override Task<bool> IsDBNullAsync(int ordinal, CancellationToken cancella
 		{
 			return Task.FromResult(IsDBNull(ordinal));
 		}
-#endif
 
 		/// <summary></summary>
 		public override int Depth
diff --git a/src/NHibernate/Driver/NHybridDataReader.cs b/src/NHibernate/Driver/NHybridDataReader.cs
@@ -2,10 +2,8 @@
 using System.Collections;
 using System.Data;
 using System.Data.Common;
-#if ASYNC
 using System.Threading;
 using System.Threading.Tasks;
-#endif
 
 namespace NHibernate.Driver
 {
@@ -130,7 +128,6 @@ public override bool Read()
 			return _isMidstream;
 		}
 
-#if ASYNC
 		public override async Task<bool> ReadAsync(CancellationToken cancellationToken)
 		{
 			_isMidstream = await _reader.ReadAsync(cancellationToken);
@@ -147,7 +144,6 @@ public override Task<bool> IsDBNullAsync(int ordinal, CancellationToken cancella
 		{
 			return _reader.IsDBNullAsync(ordinal, cancellationToken);
 		}
-#endif
 
 		/// <summary></summary>
 		public override int Depth
diff --git a/src/NHibernate/ICriteria.cs b/src/NHibernate/ICriteria.cs
@@ -315,7 +315,6 @@ public interface ICriteria : ICloneable
 		/// <returns></returns>
 		IFutureValue<T> FutureValue<T>();
 
-#if ASYNC
 		/// <summary>
 		/// Get a enumerable that when enumerated will execute
 		/// a batch of queries in a single database roundtrip
@@ -333,7 +332,6 @@ public interface ICriteria : ICloneable
 		/// <typeparam name="T"></typeparam>
 		/// <returns></returns>
 		IFutureValueAsync<T> FutureValueAsync<T>();
-#endif
 
 		/// <summary>
 		/// Set the read-only mode for entities (and proxies) loaded by this Criteria. This
diff --git a/src/NHibernate/IFutureValueAsync.cs b/src/NHibernate/IFutureValueAsync.cs
@@ -1,4 +1,3 @@
-﻿#if ASYNC
 using System.Threading.Tasks;
 
 namespace NHibernate
@@ -8,4 +7,3 @@ public interface IFutureValueAsync<T>
 		Task<T> GetValue();
 	}
 }
-#endif
diff --git a/src/NHibernate/IQuery.cs b/src/NHibernate/IQuery.cs
@@ -635,7 +635,6 @@ public interface IQuery
 		/// <returns></returns>
 		IFutureValue<T> FutureValue<T>();
 
-#if ASYNC
 		/// <summary>
 		/// Get a enumerable that when enumerated will execute
 		/// a batch of queries in a single database roundtrip
@@ -653,6 +652,5 @@ public interface IQuery
 		/// <typeparam name="T"></typeparam>
 		/// <returns></returns>
 		IFutureValueAsync<T> FutureValueAsync<T>();
-#endif
 	}
 }
diff --git a/src/NHibernate/IQueryOver.cs b/src/NHibernate/IQueryOver.cs
@@ -115,7 +115,6 @@ public interface IQueryOver<TRoot> : IQueryOver
 		/// </summary>
 		IFutureValue<U> FutureValue<U>();
 
-#if ASYNC
 		/// <summary>
 		/// Get a enumerable that when enumerated will execute
 		/// a batch of queries in a single database roundtrip
@@ -143,7 +142,6 @@ public interface IQueryOver<TRoot> : IQueryOver
 		/// single roundtrip
 		/// </summary>
 		IFutureValueAsync<U> FutureValueAsync<U>();
-#endif
 
 		/// <summary>
 		/// Creates an exact clone of the IQueryOver
diff --git a/src/NHibernate/Impl/AbstractQueryImpl.cs b/src/NHibernate/Impl/AbstractQueryImpl.cs
@@ -904,7 +904,6 @@ public IFutureValue<T> FutureValue<T>()
 			return session.FutureQueryBatch.GetFutureValue<T>();
 		}
 
-#if ASYNC
 		public IAsyncEnumerable<T> FutureAsync<T>()
 		{
 			if (!session.Factory.ConnectionProvider.Driver.SupportsMultipleQueries)
@@ -926,7 +925,6 @@ public IFutureValueAsync<T> FutureValueAsync<T>()
 			session.FutureQueryBatch.Add<T>(this);
 			return session.FutureQueryBatch.GetFutureValueAsync<T>();
 		}
-#endif
 
 		/// <summary> Override the current session cache mode, just for this query.
 		/// </summary>
diff --git a/src/NHibernate/Impl/CriteriaImpl.cs b/src/NHibernate/Impl/CriteriaImpl.cs
@@ -423,7 +423,6 @@ public IEnumerable<T> Future<T>()
 			return session.FutureCriteriaBatch.GetEnumerator<T>();
 		}
 
-#if ASYNC
 		public IFutureValueAsync<T> FutureValueAsync<T>()
 		{
 			if (!session.Factory.ConnectionProvider.Driver.SupportsMultipleQueries)
@@ -445,7 +444,6 @@ public IAsyncEnumerable<T> FutureAsync<T>()
 			session.FutureCriteriaBatch.Add<T>(this);
 			return session.FutureCriteriaBatch.GetAsyncEnumerator<T>();
 		}
-#endif
 
 		public object UniqueResult()
 		{
@@ -819,7 +817,6 @@ public IEnumerable<T> Future<T>()
 				return root.Future<T>();
 			}
 
-#if ASYNC
 			public IFutureValueAsync<T> FutureValueAsync<T>()
 			{
 				return root.FutureValueAsync<T>();
@@ -829,7 +826,6 @@ public IAsyncEnumerable<T> FutureAsync<T>()
 			{
 				return root.FutureAsync<T>();
 			}
-#endif
 
 			public void List(IList results)
 			{
diff --git a/src/NHibernate/Impl/DelayedAsyncEnumerator.cs b/src/NHibernate/Impl/DelayedAsyncEnumerator.cs
@@ -1,4 +1,3 @@
-﻿#if ASYNC
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -67,5 +66,4 @@ public void Dispose()
 			}
 		}
 	}
-}
-#endif
+}
diff --git a/src/NHibernate/Impl/FutureBatch.cs b/src/NHibernate/Impl/FutureBatch.cs
@@ -1,9 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-#if ASYNC
 using System.Threading.Tasks;
-#endif
 
 namespace NHibernate.Impl
 {
@@ -54,7 +52,6 @@ public IEnumerable<TResult> GetEnumerator<TResult>()
 			return new DelayedEnumerator<TResult>(() => GetCurrentResult<TResult>(currentIndex));
 		}
 
-#if ASYNC
 		public IFutureValueAsync<TResult> GetFutureValueAsync<TResult>()
 		{
 			int currentIndex = index;
@@ -71,7 +68,6 @@ private async Task<IEnumerable<TResult>> GetCurrentResultAsync<TResult>(int curr
 		{
 			return ((IList)(await GetResultsAsync())[currentIndex]).Cast<TResult>();
 		}
-#endif
 
 		private IList GetResults()
 		{
diff --git a/src/NHibernate/Impl/FutureValueAsync.cs b/src/NHibernate/Impl/FutureValueAsync.cs
@@ -1,4 +1,3 @@
-﻿#if ASYNC
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,5 +34,4 @@ public async Task<T> GetValue()
 
 		public Delegate ExecuteOnEval { get; set; }
 	}
-}
-#endif
+}
diff --git a/src/NHibernate/Linq/DefaultQueryProvider.cs b/src/NHibernate/Linq/DefaultQueryProvider.cs
@@ -8,20 +8,16 @@
 using NHibernate.Impl;
 using NHibernate.Type;
 using NHibernate.Util;
-#if ASYNC
 using System.Threading.Tasks;
-#endif
 
 namespace NHibernate.Linq
 {
 	public interface INhQueryProvider : IQueryProvider
 	{
 		object ExecuteFuture(Expression expression);
 		void SetResultTransformerAndAdditionalCriteria(IQuery query, NhLinqExpression nhExpression, IDictionary<string, Tuple<object, IType>> parameters);
-#if ASYNC
 		Task<TResult> ExecuteAsync<TResult>(Expression expression);
 		object ExecuteFutureAsync(Expression expression);
-#endif
 	}
 
 	public class DefaultQueryProvider : INhQueryProvider
@@ -74,8 +70,6 @@ public virtual object ExecuteFuture(Expression expression)
 			return ExecuteFutureQuery(nhLinqExpression, query, nhQuery);
 		}
 
-#if ASYNC
-
 		public virtual object ExecuteFutureAsync(Expression expression)
 		{
 			IQuery query;
@@ -98,8 +92,6 @@ public virtual async Task<object> ExecuteAsync(Expression expression)
 			return await ExecuteQueryAsync(nhLinqExpression, query, nhQuery);
 		}
 
-#endif
-
 		protected virtual NhLinqExpression PrepareQuery(Expression expression, out IQuery query, out NhLinqExpression nhQuery)
 		{
 			var nhLinqExpression = new NhLinqExpression(expression, Session.Factory);
diff --git a/src/NHibernate/Linq/LinqExtensionMethods.cs b/src/NHibernate/Linq/LinqExtensionMethods.cs
@@ -8,16 +8,13 @@
 using NHibernate.Util;
 using Remotion.Linq;
 using Remotion.Linq.Parsing.ExpressionTreeVisitors;
-#if ASYNC
 using System.Reflection;
 using System.Threading.Tasks;
-#endif
 
 namespace NHibernate.Linq
 {
 	public static class LinqExtensionMethods
 	{
-#if ASYNC
 		private static readonly Dictionary<string, MethodInfo> cachableQueryableMethods;
 
 		static LinqExtensionMethods()
@@ -1584,7 +1581,6 @@ public static IFutureValueAsync<TResult> ToFutureValueAsync<TSource, TResult>(th
 			return (IFutureValueAsync<TResult>)provider.ExecuteFutureAsync(expression);
 		}
 
-#endif
 		public static IQueryable<T> Query<T>(this ISession session)
 		{
 			return new NhQueryable<T>(session.GetSessionImplementation());
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
@@ -85,6 +85,10 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Interactive.Async, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
diff --git a/src/NHibernate/Util/AsyncLock.cs b/src/NHibernate/Util/AsyncLock.cs
@@ -1,4 +1,3 @@
-﻿#if ASYNC
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -45,5 +44,4 @@ public void Dispose()
 			}
 		}
 	}
-}
-#endif
+}
diff --git a/src/NHibernate/Util/AsyncSemaphore.cs b/src/NHibernate/Util/AsyncSemaphore.cs
diff --git a/src/NHibernate/packages.config b/src/NHibernate/packages.config

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,8 @@`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using System.Data;`
`4`	`4`	`using System.Data.Common;`
`5`		`-#if ASYNC`
`6`	`5`	`using System.Threading;`
`7`	`6`	`using System.Threading.Tasks;`
`8`		`-#endif`
`9`	`7`
`10`	`8`	`namespace NHibernate.AdoNet`
`11`	`9`	`{`
`@@ -51,7 +49,6 @@ public override bool Read()`
`51`	`49`	`return rs.Read();`
`52`	`50`	`}`
`53`	`51`
`54`		`-#if ASYNC`
`55`	`52`	`public override Task<bool> ReadAsync(CancellationToken cancellationToken)`
`56`	`53`	`{`
`57`	`54`	`return rs.ReadAsync(cancellationToken);`
`@@ -66,7 +63,6 @@ public override Task<bool> IsDBNullAsync(int ordinal, CancellationToken cancella`
`66`	`63`	`{`
`67`	`64`	`return rs.IsDBNullAsync(ordinal, cancellationToken);`
`68`	`65`	`}`
`69`		`-#endif`
`70`	`66`
`71`	`67`	`public override int Depth`
`72`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ private IFutureValue<U> FutureValue<U>()`
`102`	`102`	`return criteria.FutureValue<U>();`
`103`	`103`	`}`
`104`	`104`
`105`		`-#if ASYNC`
`106`	`105`	`private IAsyncEnumerable<TRoot> FutureAsync()`
`107`	`106`	`{`
`108`	`107`	`return criteria.FutureAsync<TRoot>();`
`@@ -122,7 +121,6 @@ private IFutureValueAsync<U> FutureValueAsync<U>()`
`122`	`121`	`{`
`123`	`122`	`return criteria.FutureValueAsync<U>();`
`124`	`123`	`}`
`125`		`-#endif`
`126`	`124`
`127`	`125`	`/// <summary>`
`128`	`126`	`/// Get an executable instance of <c>IQueryOver<TRoot></c>,`
`@@ -268,7 +266,6 @@ IFutureValue<TRoot> IQueryOver<TRoot>.FutureValue()`
`268`	`266`	`IFutureValue<U> IQueryOver<TRoot>.FutureValue<U>()`
`269`	`267`	`{ return FutureValue<U>(); }`
`270`	`268`
`271`		`-#if ASYNC`
`272`	`269`	`IAsyncEnumerable<TRoot> IQueryOver<TRoot>.FutureAsync()`
`273`	`270`	`{ return FutureAsync(); }`
`274`	`271`
`@@ -280,7 +277,6 @@ IFutureValueAsync<TRoot> IQueryOver<TRoot>.FutureValueAsync()`
`280`	`277`
`281`	`278`	`IFutureValueAsync<U> IQueryOver<TRoot>.FutureValueAsync<U>()`
`282`	`279`	`{ return FutureValueAsync<U>(); }`
`283`		`-#endif`
`284`	`280`
`285`	`281`	`IQueryOver<TRoot,TRoot> IQueryOver<TRoot>.Clone()`
`286`	`282`	`{ return Clone(); }`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,8 @@`
`7`	`7`	`using NHibernate.Engine;`
`8`	`8`	`using NHibernate.SqlCommand;`
`9`	`9`	`using NHibernate.SqlTypes;`
`10`		`-#if ASYNC`
`11`	`10`	`using System.Threading;`
`12`	`11`	`using System.Threading.Tasks;`
`13`		`-#endif`
`14`	`12`
`15`	`13`	`namespace NHibernate.Driver`
`16`	`14`	`{`
`@@ -277,7 +275,6 @@ public override bool Read()`
`277`	`275`	`return reader.Read();`
`278`	`276`	`}`
`279`	`277`
`280`		`-#if ASYNC`
`281`	`278`	`public override Task<bool> ReadAsync(CancellationToken cancellationToken)`
`282`	`279`	`{`
`283`	`280`	`return reader.ReadAsync(cancellationToken);`
`@@ -292,7 +289,6 @@ public override Task<bool> NextResultAsync(CancellationToken cancellationToken)`
`292`	`289`	`{`
`293`	`290`	`return reader.NextResultAsync(cancellationToken);`
`294`	`291`	`}`
`295`		`-#endif`
`296`	`292`
`297`	`293`	`public override int Depth`
`298`	`294`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,8 @@`
`4`	`4`	`using System.Data;`
`5`	`5`	`using System.Data.Common;`
`6`	`6`	`using NHibernate.Util;`
`7`		`-#if ASYNC`
`8`	`7`	`using System.Threading;`
`9`	`8`	`using System.Threading.Tasks;`
`10`		`-#endif`
`11`	`9`
`12`	`10`	`namespace NHibernate.Driver`
`13`	`11`	`{`
`@@ -165,7 +163,6 @@ public override bool Read()`
`165`	`163`	`return true;`
`166`	`164`	`}`
`167`	`165`
`168`		`-#if ASYNC`
`169`	`166`	`public override Task<bool> ReadAsync(CancellationToken cancellationToken)`
`170`	`167`	`{`
`171`	`168`	`return Task.FromResult(Read());`
`@@ -180,7 +177,6 @@ public override Task<bool> IsDBNullAsync(int ordinal, CancellationToken cancella`
`180`	`177`	`{`
`181`	`178`	`return Task.FromResult(IsDBNull(ordinal));`
`182`	`179`	`}`
`183`		`-#endif`
`184`	`180`
`185`	`181`	`/// <summary></summary>`
`186`	`182`	`public override int Depth`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#if ASYNC`
`2`	`1`	`using System.Threading.Tasks;`
`3`	`2`
`4`	`3`	`namespace NHibernate`
`@@ -8,4 +7,3 @@ public interface IFutureValueAsync<T>`
`8`	`7`	`Task<T> GetValue();`
`9`	`8`	`}`
`10`	`9`	`}`
`11`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,6 @@ public interface IQuery`
`635`	`635`	`/// <returns></returns>`
`636`	`636`	`IFutureValue<T> FutureValue<T>();`
`637`	`637`
`638`		`-#if ASYNC`
`639`	`638`	`/// <summary>`
`640`	`639`	`/// Get a enumerable that when enumerated will execute`
`641`	`640`	`/// a batch of queries in a single database roundtrip`
`@@ -653,6 +652,5 @@ public interface IQuery`
`653`	`652`	`/// <typeparam name="T"></typeparam>`
`654`	`653`	`/// <returns></returns>`
`655`	`654`	`IFutureValueAsync<T> FutureValueAsync<T>();`
`656`		`-#endif`
`657`	`655`	`}`
`658`	`656`	`}`
Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,6 @@ public IFutureValue<T> FutureValue<T>()`
`904`	`904`	`return session.FutureQueryBatch.GetFutureValue<T>();`
`905`	`905`	`}`
`906`	`906`
`907`		`-#if ASYNC`
`908`	`907`	`public IAsyncEnumerable<T> FutureAsync<T>()`
`909`	`908`	`{`
`910`	`909`	`if (!session.Factory.ConnectionProvider.Driver.SupportsMultipleQueries)`
`@@ -926,7 +925,6 @@ public IFutureValueAsync<T> FutureValueAsync<T>()`
`926`	`925`	`session.FutureQueryBatch.Add<T>(this);`
`927`	`926`	`return session.FutureQueryBatch.GetFutureValueAsync<T>();`
`928`	`927`	`}`
`929`		`-#endif`
`930`	`928`
`931`	`929`	`/// <summary> Override the current session cache mode, just for this query.`
`932`	`930`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,6 @@ public IEnumerable<T> Future<T>()`
`423`	`423`	`return session.FutureCriteriaBatch.GetEnumerator<T>();`
`424`	`424`	`}`
`425`	`425`
`426`		`-#if ASYNC`
`427`	`426`	`public IFutureValueAsync<T> FutureValueAsync<T>()`
`428`	`427`	`{`
`429`	`428`	`if (!session.Factory.ConnectionProvider.Driver.SupportsMultipleQueries)`
`@@ -445,7 +444,6 @@ public IAsyncEnumerable<T> FutureAsync<T>()`
`445`	`444`	`session.FutureCriteriaBatch.Add<T>(this);`
`446`	`445`	`return session.FutureCriteriaBatch.GetAsyncEnumerator<T>();`
`447`	`446`	`}`
`448`		`-#endif`
`449`	`447`
`450`	`448`	`public object UniqueResult()`
`451`	`449`	`{`
`@@ -819,7 +817,6 @@ public IEnumerable<T> Future<T>()`
`819`	`817`	`return root.Future<T>();`
`820`	`818`	`}`
`821`	`819`
`822`		`-#if ASYNC`
`823`	`820`	`public IFutureValueAsync<T> FutureValueAsync<T>()`
`824`	`821`	`{`
`825`	`822`	`return root.FutureValueAsync<T>();`
`@@ -829,7 +826,6 @@ public IAsyncEnumerable<T> FutureAsync<T>()`
`829`	`826`	`{`
`830`	`827`	`return root.FutureAsync<T>();`
`831`	`828`	`}`
`832`		`-#endif`
`833`	`829`
`834`	`830`	`public void List(IList results)`
`835`	`831`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#if ASYNC`
`2`	`1`	`using System;`
`3`	`2`	`using System.Collections;`
`4`	`3`	`using System.Collections.Generic;`
`@@ -67,5 +66,4 @@ public void Dispose()`
`67`	`66`	`}`
`68`	`67`	`}`
`69`	`68`	`}`
`70`		`-}`
`71`		`-#endif`
	`69`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`using System.Collections;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`		`-#if ASYNC`
`5`	`4`	`using System.Threading.Tasks;`
`6`		`-#endif`
`7`	`5`
`8`	`6`	`namespace NHibernate.Impl`
`9`	`7`	`{`
`@@ -54,7 +52,6 @@ public IEnumerable<TResult> GetEnumerator<TResult>()`
`54`	`52`	`return new DelayedEnumerator<TResult>(() => GetCurrentResult<TResult>(currentIndex));`
`55`	`53`	`}`
`56`	`54`
`57`		`-#if ASYNC`
`58`	`55`	`public IFutureValueAsync<TResult> GetFutureValueAsync<TResult>()`
`59`	`56`	`{`
`60`	`57`	`int currentIndex = index;`
`@@ -71,7 +68,6 @@ private async Task<IEnumerable<TResult>> GetCurrentResultAsync<TResult>(int curr`
`71`	`68`	`{`
`72`	`69`	`return ((IList)(await GetResultsAsync())[currentIndex]).Cast<TResult>();`
`73`	`70`	`}`
`74`		`-#endif`
`75`	`71`
`76`	`72`	`private IList GetResults()`
`77`	`73`	`{`