Replace custom IAsyncEnumerable extensions with System.Linq.AsyncEnumerable

eng/packages/General.props

@@ -32,6 +32,7 @@
     <PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageVersion Include="System.Linq.Async" Version="7.0.0-preview.9" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />

src/Libraries/Microsoft.Extensions.DataIngestion/Microsoft.Extensions.DataIngestion.csproj

@@ -1,3 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -28,4 +28,8 @@
     <PackageReference Include="System.Numerics.Tensors" />
   </ItemGroup>
 
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+    <PackageReference Include="System.Linq.Async" />
+  </ItemGroup>
+
 </Project>

src/Libraries/Microsoft.Extensions.DataIngestion/Utils/Batching.cs

@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-#if NET10_0_OR_GREATER
 using System.Linq;
-#endif
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -69,40 +67,4 @@ internal static async IAsyncEnumerable<IngestionChunk<string>> ProcessAsync<TMet
             }
         }
     }
-
-#if !NET10_0_OR_GREATER
-#pragma warning disable VSTHRD200 // Use "Async" suffix for async methods
-    private static IAsyncEnumerable<TSource[]> Chunk<TSource>(this IAsyncEnumerable<TSource> source, int count)
-#pragma warning restore VSTHRD200 // Use "Async" suffix for async methods
-    {
-        _ = Throw.IfNull(source);
-        _ = Throw.IfLessThanOrEqual(count, 0);
-
-        return CoreAsync(source, count);
-
-        static async IAsyncEnumerable<TSource[]> CoreAsync(IAsyncEnumerable<TSource> source, int count,
-            [EnumeratorCancellation] CancellationToken cancellationToken = default)
-        {
-            var buffer = new TSource[count];
-            int index = 0;
-
-            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
-            {
-                buffer[index++] = item;
-
-                if (index == count)
-                {
-                    index = 0;
-                    yield return buffer;
-                }
-            }
-
-            if (index > 0)
-            {
-                Array.Resize(ref buffer, index);
-                yield return buffer;
-            }
-        }
-    }
-#endif
 }

test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/DistributedCachingChatClientTest.cs

@@ -773,7 +773,7 @@ private static async Task<List<T>> ToListAsync<T>(IAsyncEnumerable<T> values)
     }
 
     private static IAsyncEnumerable<T> ToAsyncEnumerableAsync<T>(IEnumerable<T> values)
-        => ToAsyncEnumerableAsync(Task.CompletedTask, values);
+        => values.ToAsyncEnumerable();
 
     private static IAsyncEnumerable<T> ToAsyncEnumerableAsync<T>(Task preTask, IEnumerable<T> valueFactories)
         => ToAsyncEnumerableAsync(preTask, valueFactories.Select<T, Func<T>>(v => () => v));

test/Libraries/Microsoft.Extensions.AI.Tests/ChatCompletion/ReducingChatClientTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
@@ -61,7 +62,7 @@ public async Task GetResponseAsync_CallsReducerBeforeInnerClient(bool streaming)
             {
                 // Verify that the inner client receives the reduced messages
                 Assert.Same(reducedMessages, messages);
-                return ToAsyncEnumerable(expectedUpdates);
+                return expectedUpdates.ToAsyncEnumerable();
             }
         };
 
@@ -163,15 +164,6 @@ public async Task UseChatReducer_WithConfigureCallback()
         Assert.IsType<ReducingChatClient>(configuredClient);
     }
 
-    private static async IAsyncEnumerable<T> ToAsyncEnumerable<T>(IEnumerable<T> items)
-    {
-        foreach (var item in items)
-        {
-            await Task.Yield();
-            yield return item;
-        }
-    }
-
     private sealed class TestReducer : IChatReducer
     {
         public IEnumerable<ChatMessage>? ReducedMessages { get; set; }

test/Libraries/Microsoft.Extensions.AI.Tests/Microsoft.Extensions.AI.Tests.csproj

@@ -1,3 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -31,6 +31,10 @@
     <PackageReference Include="OpenTelemetry.Exporter.InMemory" />
   </ItemGroup>
 
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+    <PackageReference Include="System.Linq.Async" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Diagnostics.Testing\Microsoft.Extensions.Diagnostics.Testing.csproj" />
     <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.AI.Abstractions\Microsoft.Extensions.AI.Abstractions.csproj" />

test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Chunkers/DocumentChunkerTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 

test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Chunkers/HeaderChunkerTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.ML.Tokenizers;
 using Xunit;

test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Microsoft.Extensions.DataIngestion.Tests.csproj

@@ -1,3 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -27,6 +27,10 @@
     <PackageReference Include="OpenTelemetry.Exporter.InMemory" />
   </ItemGroup>
 
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+    <PackageReference Include="System.Linq.Async" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\Microsoft.Extensions.AI.Abstractions.Tests\TestChatClient.cs" />
     <Compile Include="..\Microsoft.Extensions.AI.Abstractions.Tests\TestEmbeddingGenerator.cs" />

test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Writers/VectorStoreWriterTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.VectorData;
 using Xunit;