Use BCL types

Ix.NET/Source/System.Interactive.Async.Providers/System.Interactive.Async.Providers.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Interactive Extensions Async Providers Library used to build query providers and express queries over async enumerable sequences.</Description>
     <AssemblyTitle>Interactive Extensions - Async Providers Library</AssemblyTitle>
-    <TargetFrameworks>net45;net46;netstandard2.0;netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netstandard2.1;netcoreapp3.0</TargetFrameworks>
     <PackageTags>Ix;Interactive;Extensions;Enumerable;Asynchronous</PackageTags>
   </PropertyGroup>
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Amb.cs

@@ -94,8 +94,8 @@ namespace System.Linq
                 }
 
                 try
-                {
-                    await using (AsyncEnumerableExtensions.ConfigureAwait(winner, false))
+                {                    
+                    await using (winner.ConfigureAwait(false))
                     {
                         if (!await moveNextWinner.ConfigureAwait(false))
                         {
@@ -204,7 +204,7 @@ namespace System.Linq
 
                 try
                 {
-                    await using (AsyncEnumerableExtensions.ConfigureAwait(winner, false))
+                    await using (winner.ConfigureAwait(false))
                     {
                         if (!await moveNextWinner.ConfigureAwait(false))
                         {
@@ -246,7 +246,7 @@ namespace System.Linq
         {
             if (enumerator != null)
             {
-                await using (AsyncEnumerableExtensions.ConfigureAwait(enumerator, false))
+                await using (enumerator.ConfigureAwait(false))
                 {
                     if (moveNextAsync != null)
                     {

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Buffer.cs

@@ -25,7 +25,7 @@ namespace System.Linq
             {
                 var buffer = new List<TSource>(count);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     buffer.Add(item);
 
@@ -65,7 +65,7 @@ namespace System.Linq
 
                 var index = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     if (index++ % skip == 0)
                     {

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Catch.cs

@@ -64,7 +64,7 @@ namespace System.Linq
 
                 if (err != null)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(err, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in err.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -122,7 +122,7 @@ namespace System.Linq
 
                 if (err != null)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(err, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in err.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -181,7 +181,7 @@ namespace System.Linq
 
                 if (err != null)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(err, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in err.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Concat.cs

@@ -21,9 +21,9 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var source in AsyncEnumerableExtensions.WithCancellation(sources, cancellationToken).ConfigureAwait(false))
+                await foreach (var source in sources.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -46,7 +46,7 @@ namespace System.Linq
             {
                 foreach (var source in sources)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -69,7 +69,7 @@ namespace System.Linq
             {
                 foreach (var source in sources)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Defer.cs

@@ -21,7 +21,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(factory(), cancellationToken).ConfigureAwait(false))
+                await foreach (var item in factory().WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     yield return item;
                 }
@@ -41,7 +41,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation((await factory().ConfigureAwait(false)), cancellationToken).ConfigureAwait(false))
+                await foreach (var item in (await factory().ConfigureAwait(false)).WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     yield return item;
                 }
@@ -62,7 +62,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation((await factory(cancellationToken).ConfigureAwait(false)), cancellationToken).ConfigureAwait(false))
+                await foreach (var item in (await factory(cancellationToken).ConfigureAwait(false)).WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     yield return item;
                 }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Expand.cs

@@ -29,7 +29,7 @@ namespace System.Linq
 
                 while (queue.Count > 0)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(queue.Dequeue(), cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in queue.Dequeue().WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         queue.Enqueue(selector(item));
 
@@ -60,7 +60,7 @@ namespace System.Linq
 
                 while (queue.Count > 0)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(queue.Dequeue(), cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in queue.Dequeue().WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         queue.Enqueue(await selector(item).ConfigureAwait(false));
 
@@ -92,7 +92,7 @@ namespace System.Linq
 
                 while (queue.Count > 0)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(queue.Dequeue(), cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in queue.Dequeue().WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         queue.Enqueue(await selector(item, cancellationToken).ConfigureAwait(false));
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Finally.cs

@@ -25,7 +25,7 @@ namespace System.Linq
             {
                 try
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -54,7 +54,7 @@ namespace System.Linq
             {
                 try
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/IgnoreElements.cs

@@ -21,7 +21,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var _ in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var _ in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                 }
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Repeat.cs

@@ -44,7 +44,7 @@ namespace System.Linq
             {
                 while (true)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -69,7 +69,7 @@ namespace System.Linq
             {
                 for (var i = 0; i < count; i++)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Scan.cs

@@ -63,7 +63,7 @@ namespace System.Linq
             {
                 var res = seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     res = accumulator(res, item);
 
@@ -159,7 +159,7 @@ namespace System.Linq
             {
                 var res = seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     res = await accumulator(res, item).ConfigureAwait(false);
 
@@ -186,7 +186,7 @@ namespace System.Linq
             {
                 var res = seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     res = await accumulator(res, item, cancellationToken).ConfigureAwait(false);
 

Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Using.cs

@@ -27,7 +27,7 @@ namespace System.Linq
             {
                 using (var resource = resourceFactory())
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(enumerableFactory(resource), cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in enumerableFactory(resource).WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -52,7 +52,7 @@ namespace System.Linq
             {
                 using (var resource = await resourceFactory().ConfigureAwait(false))
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation((await enumerableFactory(resource).ConfigureAwait(false)), cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in (await enumerableFactory(resource).ConfigureAwait(false)).WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }
@@ -78,7 +78,7 @@ namespace System.Linq
             {
                 using (var resource = await resourceFactory(cancellationToken).ConfigureAwait(false))
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation((await enumerableFactory(resource, cancellationToken).ConfigureAwait(false)), cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in (await enumerableFactory(resource, cancellationToken).ConfigureAwait(false)).WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return item;
                     }

Ix.NET/Source/System.Linq.Async.Queryable/System.Linq.Async.Queryable.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;net46;netstandard2.0;netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netstandard2.1;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' != 'netcoreapp3.0' and '$(TargetFramework)' != 'netstandard2.1' " Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview6.19252.4" />
+    <PackageReference Condition="'$(TargetFramework)' != 'netcoreapp3.0' and '$(TargetFramework)' != 'netstandard2.1' " Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview6.19259.10" />
     <ReferenceAssemblyProjectReference Include="..\refs\System.Linq.Async.Ref\System.Linq.Async.Ref.csproj" />
   </ItemGroup>
 

Ix.NET/Source/System.Linq.Async/System/Linq/AsyncEnumerableHelpers.cs

@@ -106,7 +106,7 @@ namespace System.Collections.Generic
         {
             var set = new Set<T>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 set.Add(item);
             }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Aggregate.cs

@@ -115,7 +115,7 @@ namespace System.Linq
             {
                 var acc = _seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     acc = _accumulator(acc, item);
                 }
@@ -137,7 +137,7 @@ namespace System.Linq
             {
                 var acc = _seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     acc = await _accumulator(acc, item).ConfigureAwait(false);
                 }
@@ -160,7 +160,7 @@ namespace System.Linq
             {
                 var acc = _seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     acc = await _accumulator(acc, item, _cancellationToken).ConfigureAwait(false);
                 }
@@ -185,7 +185,7 @@ namespace System.Linq
             {
                 var acc = _seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     acc = _accumulator(acc, item);
                 }
@@ -209,7 +209,7 @@ namespace System.Linq
             {
                 var acc = _seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     acc = await _accumulator(acc, item).ConfigureAwait(false);
                 }
@@ -234,7 +234,7 @@ namespace System.Linq
             {
                 var acc = _seed;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     acc = await _accumulator(acc, item, _cancellationToken).ConfigureAwait(false);
                 }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/All.cs

@@ -21,7 +21,7 @@ namespace System.Linq
 
             static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, Func<TSource, bool> _predicate, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (!_predicate(item))
                     {
@@ -44,7 +44,7 @@ namespace System.Linq
 
             static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, Func<TSource, ValueTask<bool>> _predicate, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (!await _predicate(item).ConfigureAwait(false))
                     {
@@ -68,7 +68,7 @@ namespace System.Linq
 
             static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, Func<TSource, CancellationToken, ValueTask<bool>> _predicate, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (!await _predicate(item, _cancellationToken).ConfigureAwait(false))
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Any.cs

@@ -37,7 +37,7 @@ namespace System.Linq
 
             static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, Func<TSource, bool> _predicate, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (_predicate(item))
                     {
@@ -60,7 +60,7 @@ namespace System.Linq
 
             static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, Func<TSource, ValueTask<bool>> _predicate, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (await _predicate(item).ConfigureAwait(false))
                     {
@@ -84,7 +84,7 @@ namespace System.Linq
 
             static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, Func<TSource, CancellationToken, ValueTask<bool>> _predicate, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (await _predicate(item, _cancellationToken).ConfigureAwait(false))
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/AppendPrepend.cs

@@ -206,7 +206,7 @@ namespace System.Linq
                 }
                 else
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         array[index] = item;
                         ++index;
@@ -234,7 +234,7 @@ namespace System.Linq
                     list.Add(_item);
                 }
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     list.Add(item);
                 }
@@ -395,7 +395,7 @@ namespace System.Linq
                 }
                 else
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         array[index] = item;
                         ++index;
@@ -421,7 +421,7 @@ namespace System.Linq
                     list.Add(n.Item);
                 }
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     list.Add(item);
                 }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Cast.cs

@@ -28,7 +28,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TResult> Core(CancellationToken cancellationToken)
             {
-                await foreach (var obj in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var obj in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     yield return (TResult)obj;
                 }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Concat.cs

@@ -84,7 +84,7 @@ namespace System.Linq
                         break;
                     }
 
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         list.Add(item);
                     }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Contains.cs

@@ -28,7 +28,7 @@ namespace System.Linq
 
                 static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, TSource _value, CancellationToken _cancellationToken)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                     {
                         if (EqualityComparer<TSource>.Default.Equals(item, _value))
                         {
@@ -45,7 +45,7 @@ namespace System.Linq
 
                 static async ValueTask<bool> Core(IAsyncEnumerable<TSource> _source, TSource _value, IEqualityComparer<TSource> _comparer, CancellationToken _cancellationToken)
                 {
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                     {
                         if (_comparer.Equals(item, _value))
                         {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Count.cs

@@ -32,7 +32,7 @@ namespace System.Linq
             {
                 var count = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -57,7 +57,7 @@ namespace System.Linq
             {
                 var count = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (_predicate(item))
                     {
@@ -85,7 +85,7 @@ namespace System.Linq
             {
                 var count = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (await _predicate(item).ConfigureAwait(false))
                     {
@@ -114,7 +114,7 @@ namespace System.Linq
             {
                 var count = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (await _predicate(item, _cancellationToken).ConfigureAwait(false))
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ElementAt.cs

@@ -37,7 +37,7 @@ namespace System.Linq
 
                     if (_index >= 0)
                     {
-                        await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                        await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                         {
                             if (_index == 0)
                             {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ElementAtOrDefault.cs

@@ -40,7 +40,7 @@ namespace System.Linq
                     }
                     else
                     {
-                        await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                        await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                         {
                             if (_index == 0)
                             {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Except.cs

@@ -28,12 +28,12 @@ namespace System.Linq
             {
                 var set = new Set<TSource>(comparer);
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(second, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in second.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     set.Add(element);
                 }
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(first, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in first.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     if (set.Add(element))
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ForEach.cs

@@ -28,7 +28,7 @@ namespace System.Linq
 
             static async Task Core(IAsyncEnumerable<TSource> _source, Action<TSource> _action, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     _action(item);
                 }
@@ -48,7 +48,7 @@ namespace System.Linq
             {
                 var index = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     _action(item, checked(index++));
                 }
@@ -66,7 +66,7 @@ namespace System.Linq
 
             static async Task Core(IAsyncEnumerable<TSource> _source, Func<TSource, Task> _action, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     await _action(item).ConfigureAwait(false);
                 }
@@ -84,7 +84,7 @@ namespace System.Linq
 
             static async Task Core(IAsyncEnumerable<TSource> _source, Func<TSource, CancellationToken, Task> _action, CancellationToken _cancellationToken)
             {
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     await _action(item, _cancellationToken).ConfigureAwait(false);
                 }
@@ -104,7 +104,7 @@ namespace System.Linq
             {
                 var index = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     await _action(item, checked(index++)).ConfigureAwait(false);
                 }
@@ -124,7 +124,7 @@ namespace System.Linq
             {
                 var index = 0;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     await _action(item, checked(index++), _cancellationToken).ConfigureAwait(false);
                 }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Intersect.cs

@@ -28,12 +28,12 @@ namespace System.Linq
             {
                 var set = new Set<TSource>(comparer);
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(second, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in second.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     set.Add(element);
                 }
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(first, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in first.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     if (set.Remove(element))
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/LastOrDefault.cs

@@ -101,7 +101,7 @@ namespace System.Linq
                     var last = default(TSource);
                     var hasLast = false;
 
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                     {
                         hasLast = true;
                         last = item;
@@ -119,7 +119,7 @@ namespace System.Linq
             var last = default(TSource);
             var hasLast = false;
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 if (predicate(item))
                 {
@@ -136,7 +136,7 @@ namespace System.Linq
             var last = default(TSource);
             var hasLast = false;
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 if (await predicate(item).ConfigureAwait(false))
                 {
@@ -154,7 +154,7 @@ namespace System.Linq
             var last = default(TSource);
             var hasLast = false;
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 if (await predicate(item, cancellationToken).ConfigureAwait(false))
                 {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/LongCount.cs

@@ -21,7 +21,7 @@ namespace System.Linq
             {
                 var count = 0L;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -46,7 +46,7 @@ namespace System.Linq
             {
                 var count = 0L;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (_predicate(item))
                     {
@@ -74,7 +74,7 @@ namespace System.Linq
             {
                 var count = 0L;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (await _predicate(item).ConfigureAwait(false))
                     {
@@ -103,7 +103,7 @@ namespace System.Linq
             {
                 var count = 0L;
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     if (await _predicate(item, _cancellationToken).ConfigureAwait(false))
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Lookup.cs

@@ -91,7 +91,7 @@ namespace System.Linq.Internal
 
             var lookup = new Lookup<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = keySelector(item);
                 var group = lookup.GetGrouping(key, create: true);
@@ -110,7 +110,7 @@ namespace System.Linq.Internal
 
             var lookup = new Lookup<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = keySelector(item);
                 lookup.GetGrouping(key, create: true).Add(item);
@@ -123,7 +123,7 @@ namespace System.Linq.Internal
         {
             var lookup = new Lookup<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = keySelector(item);
                 if (key != null)
@@ -356,7 +356,7 @@ namespace System.Linq.Internal
 
             var lookup = new LookupWithTask<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = await keySelector(item).ConfigureAwait(false);
                 var group = lookup.GetGrouping(key, create: true);
@@ -377,7 +377,7 @@ namespace System.Linq.Internal
 
             var lookup = new LookupWithTask<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = await keySelector(item, cancellationToken).ConfigureAwait(false);
                 var group = lookup.GetGrouping(key, create: true);
@@ -397,7 +397,7 @@ namespace System.Linq.Internal
 
             var lookup = new LookupWithTask<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = await keySelector(item).ConfigureAwait(false);
                 lookup.GetGrouping(key, create: true).Add(item);
@@ -414,7 +414,7 @@ namespace System.Linq.Internal
 
             var lookup = new LookupWithTask<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = await keySelector(item, cancellationToken).ConfigureAwait(false);
                 lookup.GetGrouping(key, create: true).Add(item);
@@ -428,7 +428,7 @@ namespace System.Linq.Internal
         {
             var lookup = new LookupWithTask<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = await keySelector(item).ConfigureAwait(false);
                 if (key != null)
@@ -445,7 +445,7 @@ namespace System.Linq.Internal
         {
             var lookup = new LookupWithTask<TKey, TElement>(comparer);
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 var key = await keySelector(item, cancellationToken).ConfigureAwait(false);
                 if (key != null)

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/OfType.cs

@@ -28,7 +28,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TResult> Core(CancellationToken cancellationToken)
             {
-                await foreach (var obj in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var obj in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     if (obj is TResult result)
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Select.cs

@@ -43,7 +43,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -110,7 +110,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -140,7 +140,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/SelectMany.cs

@@ -59,7 +59,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -68,7 +68,7 @@ namespace System.Linq
 
                     var inner = selector(element, index);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return subElement;
                     }
@@ -93,7 +93,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -102,7 +102,7 @@ namespace System.Linq
 
                     var inner = await selector(element, index).ConfigureAwait(false);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return subElement;
                     }
@@ -128,7 +128,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -137,7 +137,7 @@ namespace System.Linq
 
                     var inner = await selector(element, index, cancellationToken).ConfigureAwait(false);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return subElement;
                     }
@@ -163,11 +163,11 @@ namespace System.Linq
 
             async IAsyncEnumerator<TResult> Core(CancellationToken cancellationToken)
             {
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     var inner = collectionSelector(element);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return resultSelector(element, subElement);
                     }
@@ -192,11 +192,11 @@ namespace System.Linq
 
             async IAsyncEnumerator<TResult> Core(CancellationToken cancellationToken)
             {
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     var inner = await collectionSelector(element).ConfigureAwait(false);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return await resultSelector(element, subElement).ConfigureAwait(false);
                     }
@@ -222,11 +222,11 @@ namespace System.Linq
 
             async IAsyncEnumerator<TResult> Core(CancellationToken cancellationToken)
             {
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     var inner = await collectionSelector(element, cancellationToken).ConfigureAwait(false);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return await resultSelector(element, subElement, cancellationToken).ConfigureAwait(false);
                     }
@@ -254,7 +254,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -263,7 +263,7 @@ namespace System.Linq
 
                     var inner = collectionSelector(element, index);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return resultSelector(element, subElement);
                     }
@@ -290,7 +290,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -299,7 +299,7 @@ namespace System.Linq
 
                     var inner = await collectionSelector(element, index).ConfigureAwait(false);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return await resultSelector(element, subElement).ConfigureAwait(false);
                     }
@@ -327,7 +327,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -336,7 +336,7 @@ namespace System.Linq
 
                     var inner = await collectionSelector(element, index, cancellationToken).ConfigureAwait(false);
 
-                    await foreach (var subElement in AsyncEnumerableExtensions.WithCancellation(inner, cancellationToken).ConfigureAwait(false))
+                    await foreach (var subElement in inner.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         yield return await resultSelector(element, subElement, cancellationToken).ConfigureAwait(false);
                     }
@@ -404,7 +404,7 @@ namespace System.Linq
                 {
                     var count = 0;
 
-                    await foreach (var element in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                    await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                     {
                         checked
                         {
@@ -429,7 +429,7 @@ namespace System.Linq
             {
                 var list = new List<TResult>();
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(_source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     var items = _selector(element);
 
@@ -543,7 +543,7 @@ namespace System.Linq
                 {
                     var count = 0;
 
-                    await foreach (var element in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                    await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                     {
                         var items = await _selector(element).ConfigureAwait(false);
 
@@ -570,7 +570,7 @@ namespace System.Linq
             {
                 var list = new List<TResult>();
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(_source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     var items = await _selector(element).ConfigureAwait(false);
 
@@ -685,7 +685,7 @@ namespace System.Linq
                 {
                     var count = 0;
 
-                    await foreach (var element in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                    await foreach (var element in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                     {
                         var items = await _selector(element, _cancellationToken).ConfigureAwait(false);
 
@@ -712,7 +712,7 @@ namespace System.Linq
             {
                 var list = new List<TResult>();
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(_source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in _source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     var items = await _selector(element, cancellationToken).ConfigureAwait(false);
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Sum.Generated.cs

@@ -21,7 +21,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (int value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (int value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -46,7 +46,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -73,7 +73,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -101,7 +101,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -127,7 +127,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (long value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (long value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -152,7 +152,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -179,7 +179,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -207,7 +207,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -233,7 +233,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (float value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (float value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     sum += value;
                 }
@@ -255,7 +255,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -279,7 +279,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -304,7 +304,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -327,7 +327,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (double value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (double value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     sum += value;
                 }
@@ -349,7 +349,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -373,7 +373,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -398,7 +398,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -421,7 +421,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (decimal value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (decimal value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     sum += value;
                 }
@@ -443,7 +443,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -467,7 +467,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -492,7 +492,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -515,7 +515,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (int? value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (int? value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -540,7 +540,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -567,7 +567,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -595,7 +595,7 @@ namespace System.Linq
             {
                 var sum = 0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -621,7 +621,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (long? value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (long? value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -646,7 +646,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -673,7 +673,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -701,7 +701,7 @@ namespace System.Linq
             {
                 var sum = 0L;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -727,7 +727,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (float? value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (float? value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     sum += value.GetValueOrDefault();
                 }
@@ -749,7 +749,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -773,7 +773,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -798,7 +798,7 @@ namespace System.Linq
             {
                 var sum = 0.0f;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -821,7 +821,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (double? value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (double? value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     sum += value.GetValueOrDefault();
                 }
@@ -843,7 +843,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -867,7 +867,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -892,7 +892,7 @@ namespace System.Linq
             {
                 var sum = 0.0;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -915,7 +915,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (decimal? value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (decimal? value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     sum += value.GetValueOrDefault();
                 }
@@ -937,7 +937,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -961,7 +961,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -986,7 +986,7 @@ namespace System.Linq
             {
                 var sum = 0m;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Sum.Generated.tt

@@ -46,7 +46,7 @@ foreach (var o in os)
             {
                 var sum = <#=o.zero#>;
 
-                await foreach (<#=o.type#> value in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (<#=o.type#> value in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
 <#
 if (o.@checked)
@@ -84,7 +84,7 @@ else
             {
                 var sum = <#=o.zero#>;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = _selector(item);
 
@@ -125,7 +125,7 @@ else
             {
                 var sum = <#=o.zero#>;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item).ConfigureAwait(false);
 
@@ -167,7 +167,7 @@ else
             {
                 var sum = <#=o.zero#>;
 
-                await foreach (TSource item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (TSource item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var value = await _selector(item, _cancellationToken).ConfigureAwait(false);
 

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/TakeWhile.cs

@@ -23,7 +23,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     if (!predicate(element))
                     {
@@ -52,7 +52,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -84,7 +84,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     if (!await predicate(element).ConfigureAwait(false))
                     {
@@ -112,7 +112,7 @@ namespace System.Linq
 
             async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
             {
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     if (!await predicate(element, cancellationToken).ConfigureAwait(false))
                     {
@@ -142,7 +142,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -177,7 +177,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ToDictionary.cs

@@ -26,7 +26,7 @@ namespace System.Linq
             {
                 var d = new Dictionary<TKey, TSource>(_comparer);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var key = _keySelector(item);
 
@@ -53,7 +53,7 @@ namespace System.Linq
             {
                 var d = new Dictionary<TKey, TSource>(_comparer);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var key = await _keySelector(item).ConfigureAwait(false);
 
@@ -81,7 +81,7 @@ namespace System.Linq
             {
                 var d = new Dictionary<TKey, TSource>(_comparer);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var key = await _keySelector(item, _cancellationToken).ConfigureAwait(false);
 
@@ -111,7 +111,7 @@ namespace System.Linq
             {
                 var d = new Dictionary<TKey, TElement>(_comparer);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var key = _keySelector(item);
                     var value = _elementSelector(item);
@@ -141,7 +141,7 @@ namespace System.Linq
             {
                 var d = new Dictionary<TKey, TElement>(_comparer);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var key = await _keySelector(item).ConfigureAwait(false);
                     var value = await _elementSelector(item).ConfigureAwait(false);
@@ -172,7 +172,7 @@ namespace System.Linq
             {
                 var d = new Dictionary<TKey, TElement>(_comparer);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     var key = await _keySelector(item, _cancellationToken).ConfigureAwait(false);
                     var value = await _elementSelector(item, _cancellationToken).ConfigureAwait(false);

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ToHashSet.cs

@@ -24,7 +24,7 @@ namespace System.Linq
             {
                 var set = new HashSet<TSource>(_comparer);
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     set.Add(item);
                 }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/ToList.cs

@@ -24,7 +24,7 @@ namespace System.Linq
             {
                 var list = new List<TSource>();
 
-                await foreach (var item in AsyncEnumerableExtensions.WithCancellation(_source, _cancellationToken).ConfigureAwait(false))
+                await foreach (var item in _source.WithCancellation(_cancellationToken).ConfigureAwait(false))
                 {
                     list.Add(item);
                 }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Union.cs

@@ -162,7 +162,7 @@ namespace System.Linq
                         return set;
                     }
 
-                    await foreach (var item in AsyncEnumerableExtensions.WithCancellation(enumerable, cancellationToken).ConfigureAwait(false))
+                    await foreach (var item in enumerable.WithCancellation(cancellationToken).ConfigureAwait(false))
                     {
                         set.Add(item);
                     }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Utilities.cs

@@ -38,7 +38,7 @@ namespace System.Linq
                 }
             }
 
-            await foreach (var item in AsyncEnumerableExtensions.WithCancellation(collection, cancellationToken).ConfigureAwait(false))
+            await foreach (var item in collection.WithCancellation(cancellationToken).ConfigureAwait(false))
             {
                 list.Add(item);
             }

Ix.NET/Source/System.Linq.Async/System/Linq/Operators/Where.cs

@@ -41,7 +41,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -107,7 +107,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {
@@ -140,7 +140,7 @@ namespace System.Linq
             {
                 var index = -1;
 
-                await foreach (var element in AsyncEnumerableExtensions.WithCancellation(source, cancellationToken).ConfigureAwait(false))
+                await foreach (var element in source.WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     checked
                     {

Ix.NET/Source/System.Linq.Async/System/Threading/Tasks/AsyncEnumerableExt.cs

@@ -11,7 +11,7 @@ namespace System.Threading.Tasks
     {
         public static ConfiguredCancelableAsyncEnumerable<T>.Enumerator GetConfiguredAsyncEnumerator<T>(this IAsyncEnumerable<T> enumerable, CancellationToken cancellationToken, bool continueOnCapturedContext)
         {
-            return AsyncEnumerableExtensions.ConfigureAwait(enumerable, continueOnCapturedContext).WithCancellation(cancellationToken).GetAsyncEnumerator();
+            return enumerable.ConfigureAwait(continueOnCapturedContext).WithCancellation(cancellationToken).GetAsyncEnumerator();
         }
     }
 }

Ix.NET/Source/System.Linq.Async/System/Threading/Tasks/AsyncEnumerableExtensions.cs

@@ -1,78 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information. 
-
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace System.Threading.Tasks
-{
-
-    // This type is only public for ref assms < .NET Standard 2.1 and implementations    
-#if !BCL_HAS_CONFIGUREAWAIT || !REFERENCE_ASSEMBLY
-    public
-#else
-    internal
-#endif
-        static class AsyncEnumerableExtensions
-    {
-#if !BCL_HAS_CONFIGUREAWAIT // https://github.com/dotnet/coreclr/pull/21939
-
-        /// <summary>Configures how awaits on the tasks returned from an async disposable will be performed.</summary>
-        /// <param name="source">The source async disposable.</param>
-        /// <param name="continueOnCapturedContext">Whether to capture and marshal back to the current context.</param>
-        /// <returns>The configured async disposable.</returns>
-        public static ConfiguredAsyncDisposable ConfigureAwait(this IAsyncDisposable source, bool continueOnCapturedContext) =>
-            new ConfiguredAsyncDisposable(source, continueOnCapturedContext);
-
-        /// <summary>Configures how awaits on the tasks returned from an async iteration will be performed.</summary>
-        /// <typeparam name="T">The type of the objects being iterated.</typeparam>
-        /// <param name="source">The source enumerable being iterated.</param>
-        /// <param name="continueOnCapturedContext">Whether to capture and marshal back to the current context.</param>
-        /// <returns>The configured enumerable.</returns>
-        public static ConfiguredCancelableAsyncEnumerable<T> ConfigureAwait<T>(
-            this IAsyncEnumerable<T> source, bool continueOnCapturedContext) =>
-            new ConfiguredCancelableAsyncEnumerable<T>(source, continueOnCapturedContext, cancellationToken: default);
-
-        /// <summary>Sets the <see cref="CancellationToken"/> to be passed to <see cref="IAsyncEnumerable{T}.GetAsyncEnumerator(CancellationToken)"/> when iterating.</summary>
-        /// <typeparam name="T">The type of the objects being iterated.</typeparam>
-        /// <param name="source">The source enumerable being iterated.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use.</param>
-        /// <returns>The configured enumerable.</returns>
-        public static ConfiguredCancelableAsyncEnumerable<T> WithCancellation<T>(
-            this IAsyncEnumerable<T> source, CancellationToken cancellationToken) =>
-            new ConfiguredCancelableAsyncEnumerable<T>(source, continueOnCapturedContext: true, cancellationToken);
-
-
-#else
-        // we need to carry an impl that delegates to the BCL version of these in the lib
-        // They won't be in the ref
-
-        /// <summary>Configures how awaits on the tasks returned from an async disposable will be performed.</summary>
-        /// <param name="source">The source async disposable.</param>
-        /// <param name="continueOnCapturedContext">Whether to capture and marshal back to the current context.</param>
-        /// <returns>The configured async disposable.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ConfiguredAsyncDisposable ConfigureAwait(this IAsyncDisposable source, bool continueOnCapturedContext) =>
-            TaskExtensions.ConfigureAwait(source, continueOnCapturedContext);
-
-        /// <summary>Configures how awaits on the tasks returned from an async iteration will be performed.</summary>
-        /// <typeparam name="T">The type of the objects being iterated.</typeparam>
-        /// <param name="source">The source enumerable being iterated.</param>
-        /// <param name="continueOnCapturedContext">Whether to capture and marshal back to the current context.</param>
-        /// <returns>The configured enumerable.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ConfiguredCancelableAsyncEnumerable<T> ConfigureAwait<T>(
-            this IAsyncEnumerable<T> source, bool continueOnCapturedContext) => TaskExtensions.ConfigureAwait(source, continueOnCapturedContext);
-
-        /// <summary>Sets the <see cref="CancellationToken"/> to be passed to <see cref="IAsyncEnumerable{T}.GetAsyncEnumerator(CancellationToken)"/> when iterating.</summary>
-        /// <typeparam name="T">The type of the objects being iterated.</typeparam>
-        /// <param name="source">The source enumerable being iterated.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/> to use.</param>
-        /// <returns>The configured enumerable.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ConfiguredCancelableAsyncEnumerable<T> WithCancellation<T>(
-            this IAsyncEnumerable<T> source, CancellationToken cancellationToken) => TaskExtensions.WithCancellation(source, cancellationToken);
-#endif
-    }
-}

Ix.NET/Source/refs/System.Linq.Async.Ref/System.Linq.Async.Ref.csproj

@@ -9,8 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' != 'netcoreapp3.0' and '$(TargetFramework)' != 'netstandard2.1' "
-                      Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview6.19252.4" />
+    <PackageReference Condition="'$(TargetFramework)' != 'netcoreapp3.0' and '$(TargetFramework)' != 'netstandard2.1' " Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview6.19259.10" />
   </ItemGroup>
 
   <ItemGroup>