Skip to content

Commit e462768

Browse files
csrakowskicsrakowski
committed
Dropped all out-of-support Target Frameworks
1 parent 1ba38db commit e462768

11 files changed

Lines changed: 21 additions & 101 deletions

‎src/CSRakowski.Parallel/CSRakowski.Parallel.csproj‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net80;net60;netstandard2.1;netstandard2.0;netstandard1.1</TargetFrameworks>
4+
<TargetFrameworks>net80;net472;netstandard2.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Company />
77
<PackageId>CSRakowski.ParallelAsync</PackageId>
@@ -21,21 +21,12 @@
2121
<AssemblyName>CSRakowski.Parallel</AssemblyName>
2222
</PropertyGroup>
2323

24-
<PropertyGroup>
25-
<!-- Suppress "NETSDK1215: Targeting .NET Standard prior to 2.0 is no longer recommended." This is expected for legacy compatibility. -->
26-
<NoWarn>$(NoWarn);NETSDK1215</NoWarn>
27-
</PropertyGroup>
28-
2924
<PropertyGroup>
3025
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSRakowski.Parallel.xml</DocumentationFile>
3126
</PropertyGroup>
3227

3328
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net472'">
34-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
38-
<PackageReference Include="CSRakowski.AsyncStreamsPreparations" Version="1.6.0" />
29+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[6.0.0,)" />
3930
</ItemGroup>
4031

4132
<ItemGroup>

‎src/CSRakowski.Parallel/Extensions/ParallelAsyncEx.AsyncStreams.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
namespace CSRakowski.Parallel.Extensions
1010
{
11-
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
12-
1311
/// <summary>
1412
/// Extension methods to allow using the functionalities of <see cref="ParallelAsync"/> with a fluent syntax
1513
/// </summary>
@@ -69,6 +67,4 @@ public static IAsyncEnumerable<TResult> ForEachAsyncStream<TInput, TResult>(this
6967

7068
#endregion ForEachAsyncStream overloads
7169
}
72-
73-
#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
7470
}

‎src/CSRakowski.Parallel/ParallelAsync.AsyncStreams.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
namespace CSRakowski.Parallel
99
{
10-
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
11-
1210
public static partial class ParallelAsync
1311
{
1412
#region IEnumerable<T>
@@ -576,5 +574,4 @@ private static async IAsyncEnumerable<TResult> ForEachAsyncStreamImplUnorderedAs
576574
#endregion IAsyncEnumerable<T>
577575
}
578576

579-
#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
580-
}
577+
}

‎tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncBenchmarks_AsyncStreams.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,11 @@ public async Task<int> IEnumerable_ForEachAsyncStream()
6565
{
6666
int count = 0;
6767

68-
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
69-
7068
await foreach (var r in ParallelAsync.ForEachAsyncStream(InputNumbers, TestFunctions.JustAddOne_WithCancellationToken, MaxBatchSize, AllowOutOfOrder, NumberOfItemsInCollection, CancellationToken.None))
7169
{
7270
count++;
7371
}
7472

75-
#else
76-
77-
await Task.CompletedTask;
78-
79-
#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
80-
8173
return count;
8274
}
8375

@@ -86,18 +78,10 @@ public async Task<int> IAsyncEnumerable_ForEachAsyncStream()
8678
{
8779
int count = 0;
8880

89-
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
90-
9181
await foreach (var r in ParallelAsync.ForEachAsyncStream(InputNumbersAsync, TestFunctions.JustAddOne_WithCancellationToken, MaxBatchSize, AllowOutOfOrder, NumberOfItemsInCollection, CancellationToken.None))
9282
{
9383
count++;
9484
}
95-
96-
#else
97-
98-
await Task.CompletedTask;
99-
100-
#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
10185

10286
return count;
10387
}

‎tests/CSRakowski.Parallel.Tests/ExtensionMethodsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ await parallelAsync.ForEachAsync((el) => {
8383
Interlocked.Add(ref sum, el);
8484
Interlocked.Increment(ref count);
8585

86-
return TaskHelper.CompletedTask;
86+
return Task.CompletedTask;
8787
});
8888

8989
Assert.Equal(55, sum);
@@ -106,7 +106,7 @@ await parallelAsync.ForEachAsync((el, ct) => {
106106
Interlocked.Add(ref sum, el);
107107
Interlocked.Increment(ref count);
108108

109-
return TaskHelper.CompletedTask;
109+
return Task.CompletedTask;
110110
});
111111

112112
Assert.Equal(55, sum);

‎tests/CSRakowski.Parallel.Tests/ExtensionMethodsTests_AsyncStreams.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
namespace CSRakowski.Parallel.Tests
1616
{
17-
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
18-
1917
[Collection("ParallelAsync AsyncStreams Extension Methods Tests")]
2018
public class ExtensionMethodsTests_AsyncStreams
2119
{
@@ -128,7 +126,4 @@ public async Task ParallelAsync_Can_Chain_Together_AsyncStreams()
128126
}
129127
}
130128
}
131-
132-
#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
133-
134129
}

‎tests/CSRakowski.Parallel.Tests/ExtensionMethodsTests_IAsyncEnumerable.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ await parallelAsync.ForEachAsync((el) => {
8585
Interlocked.Add(ref sum, el);
8686
Interlocked.Increment(ref count);
8787

88-
return TaskHelper.CompletedTask;
88+
return Task.CompletedTask;
8989
});
9090

9191
Assert.Equal(55, sum);
@@ -108,7 +108,7 @@ await parallelAsync.ForEachAsync((el, ct) => {
108108
Interlocked.Add(ref sum, el);
109109
Interlocked.Increment(ref count);
110110

111-
return TaskHelper.CompletedTask;
111+
return Task.CompletedTask;
112112
});
113113

114114
Assert.Equal(55, sum);

‎tests/CSRakowski.Parallel.Tests/Mocks and Helpers/TaskHelper.cs‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎tests/CSRakowski.Parallel.Tests/ParallelAsyncTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public async Task ParallelAsync_Can_Batch_Basic_Work_Void()
4242

4343
await ParallelAsync.ForEachAsync(input, (el) =>
4444
{
45-
return TaskHelper.CompletedTask;
45+
return Task.CompletedTask;
4646
}, maxBatchSize: 1);
4747

4848
Assert.True(true);
@@ -105,7 +105,7 @@ public async Task ParallelAsync_Can_Handle_Misaligned_Sizing_Void()
105105

106106
await ParallelAsync.ForEachAsync(input, (el) =>
107107
{
108-
return TaskHelper.CompletedTask;
108+
return Task.CompletedTask;
109109
}, maxBatchSize: 4, cancellationToken: cancellationToken);
110110

111111
Assert.True(true);
@@ -120,7 +120,7 @@ public async Task ParallelAsync_Can_Handle_Misaligned_Sizing_Void_Without_Estima
120120

121121
await ParallelAsync.ForEachAsync(input, (el) =>
122122
{
123-
return TaskHelper.CompletedTask;
123+
return Task.CompletedTask;
124124
}, maxBatchSize: 4, cancellationToken: cancellationToken);
125125

126126
Assert.True(true);
@@ -221,8 +221,8 @@ public async Task ParallelAsync_Throws_On_Invalid_Inputs()
221221
var empty = new int[0];
222222
IEnumerable<int> nullEnumerable = null;
223223

224-
var ex1 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int>(nullEnumerable, (e) => TaskHelper.CompletedTask));
225-
var ex2 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int>(nullEnumerable, (e, ct) => TaskHelper.CompletedTask));
224+
var ex1 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int>(nullEnumerable, (e) => Task.CompletedTask));
225+
var ex2 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int>(nullEnumerable, (e, ct) => Task.CompletedTask));
226226

227227
var ex3 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int, int>(nullEnumerable, (e) => Task.FromResult(e)));
228228
var ex4 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int, int>(nullEnumerable, (e, ct) => Task.FromResult(e)));
@@ -233,7 +233,7 @@ public async Task ParallelAsync_Throws_On_Invalid_Inputs()
233233
var ex7 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int, int>(empty, (Func<int, Task<int>>)null));
234234
var ex8 = await Assert.ThrowsAsync<ArgumentNullException>(() => ParallelAsync.ForEachAsync<int, int>(empty, (Func<int, CancellationToken, Task<int>>)null));
235235

236-
var ex9 = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => ParallelAsync.ForEachAsync<int>(empty, (e) => TaskHelper.CompletedTask, -1));
236+
var ex9 = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() => ParallelAsync.ForEachAsync<int>(empty, (e) => Task.CompletedTask, -1));
237237

238238
Assert.Equal("collection", ex1.ParamName);
239239
Assert.Equal("collection", ex2.ParamName);
@@ -277,7 +277,7 @@ await ParallelAsync.ForEachAsync(input, (el) =>
277277
{
278278
var r = el + Interlocked.Increment(ref callCount);
279279

280-
return TaskHelper.CompletedTask;
280+
return Task.CompletedTask;
281281
}, maxBatchSize: 9, allowOutOfOrderProcessing: true);
282282

283283
Assert.Equal(numberOfElements, callCount);

‎tests/CSRakowski.Parallel.Tests/ParallelAsyncTests_AsyncStreams.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
namespace CSRakowski.Parallel.Tests
1515
{
16-
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
17-
1816
[Collection("ParallelAsync AsyncStreams Tests")]
1917
public class ParallelAsyncTests_AsyncStreams
2018
{
@@ -266,7 +264,4 @@ public async Task ParallelAsync_Can_Chain_Together_AsyncStreams()
266264
}
267265
}
268266
}
269-
270-
#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
271-
272267
}

0 commit comments

Comments
 (0)