From f7d94891c4280b5fd9eac4c1be20d4609fdcda0c Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Tue, 12 Nov 2019 18:35:32 +0300 Subject: [PATCH 1/2] Replace IEnumerable.Count() with .Any(). Remove unnecessary #if directive. --- src/projects/EnsureThat/Enforcers/EnumerableArg.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/projects/EnsureThat/Enforcers/EnumerableArg.cs b/src/projects/EnsureThat/Enforcers/EnumerableArg.cs index 1cbe1d5..6af5100 100644 --- a/src/projects/EnsureThat/Enforcers/EnumerableArg.cs +++ b/src/projects/EnsureThat/Enforcers/EnumerableArg.cs @@ -20,7 +20,7 @@ public IEnumerable HasItems([ValidatedNotNull, InstantHandle]IEnumerable SizeIs([ValidatedNotNull, InstantHandle]IEnumerable { Ensure.Any.IsNotNull(value, paramName); -#if NETSTANDARD1_1 var count = value.LongCount(); if (count != expected) -#else - var count = value.LongCount(); - - if (count != expected) -#endif throw Ensure.ExceptionFactory.ArgumentException( string.Format(ExceptionMessages.Collections_SizeIs_Failed, expected, count), paramName, From 1bcca0745a97f98576cf003b65c497dd2e88030f Mon Sep 17 00:00:00 2001 From: Vladimir Ermakov Date: Wed, 13 Nov 2019 10:58:43 +0300 Subject: [PATCH 2/2] Partial revert --- src/projects/EnsureThat/Enforcers/EnumerableArg.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/projects/EnsureThat/Enforcers/EnumerableArg.cs b/src/projects/EnsureThat/Enforcers/EnumerableArg.cs index 6af5100..7c83be7 100644 --- a/src/projects/EnsureThat/Enforcers/EnumerableArg.cs +++ b/src/projects/EnsureThat/Enforcers/EnumerableArg.cs @@ -52,9 +52,15 @@ public IEnumerable SizeIs([ValidatedNotNull, InstantHandle]IEnumerable { Ensure.Any.IsNotNull(value, paramName); +#if NETSTANDARD1_1 var count = value.LongCount(); if (count != expected) +#else + var count = value.LongCount(); + + if (count != expected) +#endif throw Ensure.ExceptionFactory.ArgumentException( string.Format(ExceptionMessages.Collections_SizeIs_Failed, expected, count), paramName,