Skip to content

Use Microsoft.Bcl.AsyncInterfaces for net461 and netstandard2.0 #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 12, 2019
Merged

Use Microsoft.Bcl.AsyncInterfaces for net461 and netstandard2.0 #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e690374
Use Microsoft.Bcl.AsyncInterfaces
May 2, 2019
3edb789
Use BCL types
May 12, 2019
ca93b96
Build against preview 5
May 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Ix.NET/Source/Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<DebugType Condition="'$(Configuration)' != 'Debug'">embedded</DebugType>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- While in beta, we need to set 8.0 manually (rather than latest). -->
<LangVersion>8.0</LangVersion>
<!-- While in beta, we need to set preview for 8.0 manually (rather than latest). -->
<LangVersion>preview</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions Ix.NET/Source/Directory.build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
<DefineConstants>$(DefineConstants);NO_ARRAY_EMPTY;NO_TASK_FROMEXCEPTION</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'net461'">
<DefineConstants>$(DefineConstants);USE_ASYNC_ITERATOR</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'netstandard2.1'">
Expand All @@ -21,11 +21,6 @@
<Product>$(AssemblyName) ($(TargetFramework))</Product>
</PropertyGroup>

<ItemGroup>
<!-- Workaround https://github.com/dotnet/sdk/issues/2976 -->
<PackageReference Update="Microsoft.NETCore.Platforms" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup Condition="'$(IsTestProject)' == 'true'">
<UseSourceLink>true</UseSourceLink>
<CoverletOutputFormat>cobertura</CoverletOutputFormat>
Expand Down
11 changes: 11 additions & 0 deletions Ix.NET/Source/NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion Ix.NET/Source/System.Interactive.Async.Providers/System.Interactive.Async.Providers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion Ix.NET/Source/System.Interactive.Async/System.Interactive.Async.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.</Description>
<AssemblyTitle>Interactive Extensions - Async 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>

Expand Down
8 changes: 4 additions & 4 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Amb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
}

try
{
await using (AsyncEnumerableExtensions.ConfigureAwait(winner, false))
{
await using (winner.ConfigureAwait(false))
{
if (!await moveNextWinner.ConfigureAwait(false))
{
Expand Down Expand Up @@ -204,7 +204,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)

try
{
await using (AsyncEnumerableExtensions.ConfigureAwait(winner, false))
await using (winner.ConfigureAwait(false))
{
if (!await moveNextWinner.ConfigureAwait(false))
{
Expand Down Expand Up @@ -246,7 +246,7 @@ private static async Task AwaitMoveNextAsyncAndDispose<T>(Task<bool> moveNextAsy
{
if (enumerator != null)
{
await using (AsyncEnumerableExtensions.ConfigureAwait(enumerator, false))
await using (enumerator.ConfigureAwait(false))
{
if (moveNextAsync != null)
{
Expand Down
4 changes: 2 additions & 2 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Buffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async IAsyncEnumerator<IList<TSource>> Core(CancellationToken cancellationToken)
{
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);

Expand Down Expand Up @@ -65,7 +65,7 @@ async IAsyncEnumerator<IList<TSource>> Core(CancellationToken cancellationToken)

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)
{
Expand Down
6 changes: 3 additions & 3 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Catch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)

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;
}
Expand Down Expand Up @@ -122,7 +122,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)

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;
}
Expand Down Expand Up @@ -181,7 +181,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)

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;
}
Expand Down
8 changes: 4 additions & 4 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Concat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ public static IAsyncEnumerable<TSource> Concat<TSource>(this IAsyncEnumerable<IA

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;
}
Expand All @@ -46,7 +46,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand All @@ -69,7 +69,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand Down
6 changes: 3 additions & 3 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Defer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static IAsyncEnumerable<TSource> Defer<TSource>(Func<IAsyncEnumerable<TSo

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;
}
Expand All @@ -41,7 +41,7 @@ public static IAsyncEnumerable<TSource> Defer<TSource>(Func<Task<IAsyncEnumerabl

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;
}
Expand All @@ -62,7 +62,7 @@ public static IAsyncEnumerable<TSource> Defer<TSource>(Func<CancellationToken, T

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;
}
Expand Down
6 changes: 3 additions & 3 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Expand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)

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));

Expand Down Expand Up @@ -60,7 +60,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)

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));

Expand Down Expand Up @@ -92,7 +92,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)

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));

Expand Down
4 changes: 2 additions & 2 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Finally.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand Down Expand Up @@ -54,7 +54,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand Down
2 changes: 1 addition & 1 deletion Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/IgnoreElements.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static IAsyncEnumerable<TSource> IgnoreElements<TSource>(this IAsyncEnume

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))
{
}

Expand Down
4 changes: 2 additions & 2 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Repeat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand All @@ -69,7 +69,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand Down
6 changes: 3 additions & 3 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Scan.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ async IAsyncEnumerator<TAccumulate> Core(CancellationToken cancellationToken)
{
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);

Expand Down Expand Up @@ -159,7 +159,7 @@ async IAsyncEnumerator<TAccumulate> Core(CancellationToken cancellationToken)
{
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);

Expand All @@ -186,7 +186,7 @@ async IAsyncEnumerator<TAccumulate> Core(CancellationToken cancellationToken)
{
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);

Expand Down
6 changes: 3 additions & 3 deletions Ix.NET/Source/System.Interactive.Async/System/Linq/Operators/Using.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand All @@ -52,7 +52,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand All @@ -78,7 +78,7 @@ async IAsyncEnumerator<TSource> Core(CancellationToken cancellationToken)
{
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;
}
Expand Down
2 changes: 1 addition & 1 deletion Ix.NET/Source/System.Linq.Async.Queryable/System.Linq.Async.Queryable.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 2 additions & 6 deletions Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">

<PropertyGroup>
<TargetFrameworks>net45;net46;netstandard2.0;netstandard2.1;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net461;netstandard2.0;netstandard2.1;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand All @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Condition="'$(TargetFramework)' != 'netcoreapp3.0' and '$(TargetFramework)' != 'netstandard2.1' " Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
<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>

Expand Down Expand Up @@ -87,8 +87,4 @@
</None>
</ItemGroup>

<ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>

</Project>
Loading