Merge branch 'master' into Updated_TargetFrameworks

Author: csrakowski

SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability in this project, please report it responsibly:
+
+- Create a public issue in the project's issue tracker with a basic highlevel description to notify the maintainers.
+- **Do Not** disclose any sensitive details in the issue.
+- Leave contact information in the issue so the maintainers can reach you for more details.
+- You will receive a response as soon as possible, typically within 7 days.
+- After the issue is resolved, you may be credited in the release notes if you wish.
+
+We appreciate your help in keeping this project and its users safe!

src/CSRakowski.Parallel/CSRakowski.Parallel.csproj

@@ -21,6 +21,11 @@
     <AssemblyName>CSRakowski.Parallel</AssemblyName>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Suppress "NETSDK1215: Targeting .NET Standard prior to 2.0 is no longer recommended." This is expected for legacy compatibility. -->
+    <NoWarn>$(NoWarn);NETSDK1215</NoWarn>
+  </PropertyGroup>
+
   <PropertyGroup>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSRakowski.Parallel.xml</DocumentationFile>
   </PropertyGroup>

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

@@ -28,7 +28,7 @@ public static partial class ParallelAsyncEx
         /// <returns>The results of the operations</returns>
         /// <exception cref="ArgumentNullException">Thrown when either <paramref name="parallelAsync"/> or <paramref name="func"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when the configured maximum batch size is a negative number.</exception>
-        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TInput, TResult>(this IParallelAsyncEnumerable<TInput> parallelAsync, Func<TInput, Task<TResult>> func, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TInput, TResult>(this IParallelAsyncEnumerable<TInput> parallelAsync, Func<TInput, Task<TResult>> func, CancellationToken cancellationToken = default)
         {
             var obj = EnsureValidEnumerable(parallelAsync);
 
@@ -53,7 +53,7 @@ public static IAsyncEnumerable<TResult> ForEachAsyncStream<TInput, TResult>(this
         /// <returns>The results of the operations</returns>
         /// <exception cref="ArgumentNullException">Thrown when either <paramref name="parallelAsync"/> or <paramref name="func"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when the configured maximum batch size is a negative number.</exception>
-        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TInput, TResult>(this IParallelAsyncEnumerable<TInput> parallelAsync, Func<TInput, CancellationToken, Task<TResult>> func, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TInput, TResult>(this IParallelAsyncEnumerable<TInput> parallelAsync, Func<TInput, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default)
         {
             var obj = EnsureValidEnumerable(parallelAsync);
 
@@ -71,5 +71,4 @@ public static IAsyncEnumerable<TResult> ForEachAsyncStream<TInput, TResult>(this
     }
 
     #endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
-
 }

src/CSRakowski.Parallel/ParallelAsync.AsyncStreams.cs

@@ -41,12 +41,16 @@ public static partial class ParallelAsync
         /// Setting this value to low, will mean a too small list will be allocated and you will have to pay a small performance hit for the resizing of the list during execution.
         /// </para>
         /// </remarks>
-        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IEnumerable<TIn> collection, Func<TIn, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IEnumerable<TIn> collection, Func<TIn, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(func);
+#else
             if (func == null)
             {
                 throw new ArgumentNullException(nameof(func));
             }
+#endif //NET8_0_OR_GREATER
 
             var funcWithCancellationToken = WrapFunc(func);
             return ForEachAsyncStream<TResult, TIn>(collection, funcWithCancellationToken, maxBatchSize, allowOutOfOrderProcessing, estimatedResultSize, cancellationToken);
@@ -80,8 +84,12 @@ public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IEnumer
         /// Setting this value to low, will mean a too small list will be allocated and you will have to pay a small performance hit for the resizing of the list during execution.
         /// </para>
         /// </remarks>
-        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IEnumerable<TIn> collection, Func<TIn, CancellationToken, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IEnumerable<TIn> collection, Func<TIn, CancellationToken, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(collection);
+            ArgumentNullException.ThrowIfNull(func);
+#else
             if (collection == null)
             {
                 throw new ArgumentNullException(nameof(collection));
@@ -91,6 +99,7 @@ public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IEnumer
             {
                 throw new ArgumentNullException(nameof(func));
             }
+#endif //NET8_0_OR_GREATER
 
             var maxBatchSizeToUse = DetermineBatchSizeToUse(maxBatchSize);
 
@@ -319,12 +328,16 @@ private static async IAsyncEnumerable<TResult> ForEachAsyncStreamImplUnordered<T
         /// Setting this value to low, will mean a too small list will be allocated and you will have to pay a small performance hit for the resizing of the list during execution.
         /// </para>
         /// </remarks>
-        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IAsyncEnumerable<TIn> collection, Func<TIn, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IAsyncEnumerable<TIn> collection, Func<TIn, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(func);
+#else
             if (func == null)
             {
                 throw new ArgumentNullException(nameof(func));
             }
+#endif //NET8_0_OR_GREATER
 
             var funcWithCancellationToken = WrapFunc(func);
             return ForEachAsyncStream<TResult, TIn>(collection, funcWithCancellationToken, maxBatchSize, allowOutOfOrderProcessing, estimatedResultSize, cancellationToken);
@@ -358,8 +371,12 @@ public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IAsyncE
         /// Setting this value to low, will mean a too small list will be allocated and you will have to pay a small performance hit for the resizing of the list during execution.
         /// </para>
         /// </remarks>
-        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IAsyncEnumerable<TIn> collection, Func<TIn, CancellationToken, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IAsyncEnumerable<TIn> collection, Func<TIn, CancellationToken, Task<TResult>> func, int maxBatchSize = 0, bool allowOutOfOrderProcessing = false, int estimatedResultSize = 0, CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(collection);
+            ArgumentNullException.ThrowIfNull(func);
+#else
             if (collection == null)
             {
                 throw new ArgumentNullException(nameof(collection));
@@ -369,6 +386,7 @@ public static IAsyncEnumerable<TResult> ForEachAsyncStream<TResult, TIn>(IAsyncE
             {
                 throw new ArgumentNullException(nameof(func));
             }
+#endif //NET8_0_OR_GREATER
 
             int maxBatchSizeToUse = DetermineBatchSizeToUse(maxBatchSize);
 
@@ -555,8 +573,8 @@ private static async IAsyncEnumerable<TResult> ForEachAsyncStreamImplUnorderedAs
             ParallelAsyncEventSource.Log.RunStop(runId);
         }
 
-        #endregion IAsyncEnumerable<T>
+#endregion IAsyncEnumerable<T>
     }
 
 #endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
-}
+        }

tests/Profiling/Profiling.csproj

@@ -72,4 +72,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>