Skip to content

Commit 83b9f5d

Browse files
Copilotadamsitnik
andcommitted
Use System.Linq.AsyncEnumerable package instead of System.Linq.Async
Co-authored-by: adamsitnik <6011991+adamsitnik@users.noreply.github.com>
1 parent 6900bbf commit 83b9f5d

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

eng/packages/General.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
3333
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
3434
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
35-
<PackageVersion Include="System.Linq.Async" Version="7.0.0-preview.9" />
35+
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0" />
3636
<PackageVersion Include="System.Memory" Version="4.5.5" />
3737
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
3838
<PackageVersion Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ItemGroup>
3030

3131
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
32-
<PackageReference Include="System.Linq.Async" />
32+
<PackageReference Include="System.Linq.AsyncEnumerable" />
3333
</ItemGroup>
3434

3535
</Project>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public async Task StreamingCachesSuccessResultsAsync(bool conversationIdSet)
276276
GetStreamingResponseAsyncCallback = delegate
277277
{
278278
innerCallCount++;
279-
return ToAsyncEnumerableAsync(actualUpdate);
279+
return actualUpdate.ToAsyncEnumerable();
280280
}
281281
};
282282
using var outer = new DistributedCachingChatClient(testClient, _storage)
@@ -320,7 +320,7 @@ public async Task StreamingCoalescesConsecutiveTextChunksAsync(bool? coalesce)
320320

321321
using var testClient = new TestChatClient
322322
{
323-
GetStreamingResponseAsyncCallback = delegate { return ToAsyncEnumerableAsync(expectedResponse); }
323+
GetStreamingResponseAsyncCallback = delegate { return expectedResponse.ToAsyncEnumerable(); }
324324
};
325325
using var outer = new DistributedCachingChatClient(testClient, _storage)
326326
{
@@ -398,7 +398,7 @@ public async Task StreamingCoalescingPropagatesMetadataAsync()
398398

399399
using var testClient = new TestChatClient
400400
{
401-
GetStreamingResponseAsyncCallback = delegate { return ToAsyncEnumerableAsync(expectedResponse); }
401+
GetStreamingResponseAsyncCallback = delegate { return expectedResponse.ToAsyncEnumerable(); }
402402
};
403403
using var outer = new DistributedCachingChatClient(testClient, _storage)
404404
{
@@ -772,9 +772,6 @@ private static async Task<List<T>> ToListAsync<T>(IAsyncEnumerable<T> values)
772772
return result;
773773
}
774774

775-
private static IAsyncEnumerable<T> ToAsyncEnumerableAsync<T>(IEnumerable<T> values)
776-
=> values.ToAsyncEnumerable();
777-
778775
private static IAsyncEnumerable<T> ToAsyncEnumerableAsync<T>(Task preTask, IEnumerable<T> valueFactories)
779776
=> ToAsyncEnumerableAsync(preTask, valueFactories.Select<T, Func<T>>(v => () => v));
780777

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
35-
<PackageReference Include="System.Linq.Async" />
35+
<PackageReference Include="System.Linq.AsyncEnumerable" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
<PackageReference Include="OpenTelemetry.Exporter.InMemory" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
31-
<PackageReference Include="System.Linq.Async" />
32-
</ItemGroup>
33-
3430
<ItemGroup>
3531
<Compile Include="..\Microsoft.Extensions.AI.Abstractions.Tests\TestChatClient.cs" />
3632
<Compile Include="..\Microsoft.Extensions.AI.Abstractions.Tests\TestEmbeddingGenerator.cs" />

0 commit comments

Comments
 (0)