Merge pull request #23 from thomaslevesque/remove-compat-methods

thomaslevesque · web-flow · commit 6d4f81a20df4 · 2021-06-23T23:40:23.000+02:00
Remove compat methods
diff --git a/Linq.Extras.ndproj b/Linq.Extras.ndproj
diff --git a/Linq.Extras.sln b/Linq.Extras.sln
@@ -57,7 +57,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1AC5F1E6-BC9A-4EB9-BFD3-7F548BC6F652}
 	EndGlobalSection
-	GlobalSection(NDepend) = preSolution
-		Project = ".\Linq.Extras.ndproj"
-	EndGlobalSection
 EndGlobal
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 A set of extension and helper methods to complement the ones from `System.Linq.Enumerable`.
 
-Some of these methods are just shortcuts for common Linq operations (e.g. `Append`, `IsNullOrEmpty`), or improvements to
+Some of these methods are just shortcuts for common Linq operations (e.g. `IsNullOrEmpty`), or improvements to
 existing Linq methods (e.g. specify default value for `FirstOrDefault`, specify comparer for `Max`). Others do more
 complex things that have no equivalent in standard Linq (`RankBy`, `DistinctUntilChanged`).
 
diff --git a/src/Linq.Extras/AppendPrepend.cs b/src/Linq.Extras/AppendPrepend.cs
diff --git a/src/Linq.Extras/Flatten.cs b/src/Linq.Extras/Flatten.cs
@@ -102,7 +102,7 @@ private static IEnumerable<TResult> DepthFirstFlattenIterator<TNode, TResult>(th
             var list = source.Select(n => new NodeWithLevel<TNode>(n, 0)).ToLinkedList();
             while (list.Count > 0)
             {
-                var current = list.First.Value;
+                var current = list.First!.Value;
                 list.RemoveFirst();
                 yield return resultSelector(current.Node, current.Level);
                 var llNode = list.First;
diff --git a/src/Linq.Extras/Internal/ExcludeFromCodeCoverageAttribute.cs b/src/Linq.Extras/Internal/ExcludeFromCodeCoverageAttribute.cs
diff --git a/src/Linq.Extras/Linq.Extras.csproj b/src/Linq.Extras/Linq.Extras.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.0;netstandard1.6;netstandard2.0;netstandard2.1;net45;net471;net472;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net45;netcoreapp3.1;net5.0</TargetFrameworks>
     <Description>A set of helper and extension methods to complement the System.Linq namespace.</Description>
     <Authors>Thomas Levesque</Authors>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -15,7 +15,7 @@
     <AssemblyOriginatorKeyFile>..\..\Linq.Extras.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <MinVerVerbosity>quiet</MinVerVerbosity>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -24,35 +24,16 @@
     <PackageReference Include="MinVer" Version="2.3.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND;FEATURE_ExcludeFromCodeCoverageAttribute</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND;FEATURE_TO_HASHSET;FEATURE_NULLABILITY_ATTRIBUTES;FEATURE_ExcludeFromCodeCoverageAttribute</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-    <DefineConstants>$(DefineConstants);FEATURE_ExcludeFromCodeCoverageAttribute</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND;FEATURE_ExcludeFromCodeCoverageAttribute</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_NULLABILITY_ATTRIBUTES</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND;FEATURE_TO_HASHSET;FEATURE_ExcludeFromCodeCoverageAttribute</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);FEATURE_NULLABILITY_ATTRIBUTES;FEATURE_COMPARER_NULLABILITY</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND;FEATURE_TO_HASHSET;FEATURE_ExcludeFromCodeCoverageAttribute</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <DefineConstants>$(DefineConstants);FEATURE_NULLABILITY_ATTRIBUTES;FEATURE_COMPARER_NULLABILITY</DefineConstants>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Linq.Extras/OuterJoin.cs b/src/Linq.Extras/OuterJoin.cs
@@ -32,7 +32,7 @@ public static IEnumerable<TResult> LeftOuterJoin<TLeft, TRight, TKey, TResult>(
             [NotNull] Func<TLeft, TKey> leftKeySelector,
             [NotNull] Func<TRight, TKey> rightKeySelector,
             [NotNull] Func<TLeft, TRight, TResult> resultSelector,
-            TRight defaultRight = default,
+            TRight defaultRight = default!,
             IEqualityComparer<TKey>? keyComparer = null)
         {
             left.CheckArgumentNull(nameof(left));
@@ -72,7 +72,7 @@ public static IEnumerable<TResult> RightOuterJoin<TLeft, TRight, TKey, TResult>(
             [NotNull] Func<TLeft, TKey> leftKeySelector,
             [NotNull] Func<TRight, TKey> rightKeySelector,
             [NotNull] Func<TLeft, TRight, TResult> resultSelector,
-            TLeft defaultLeft = default,
+            TLeft defaultLeft = default!,
             IEqualityComparer<TKey>? keyComparer = null)
         {
             left.CheckArgumentNull(nameof(left));
@@ -112,8 +112,8 @@ public static IEnumerable<TResult> FullOuterJoin<TLeft, TRight, TKey, TResult>(
             [NotNull] Func<TLeft, TKey> leftKeySelector,
             [NotNull] Func<TRight, TKey> rightKeySelector,
             [NotNull] Func<TKey, TLeft, TRight, TResult> resultSelector,
-            TLeft defaultLeft = default,
-            TRight defaultRight = default,
+            TLeft defaultLeft = default!,
+            TRight defaultRight = default!,
             IEqualityComparer<TKey>? keyComparer = null)
         {
             left.CheckArgumentNull(nameof(left));
diff --git a/src/Linq.Extras/ToCollections.cs b/src/Linq.Extras/ToCollections.cs
@@ -34,23 +34,6 @@ public static Stack<TSource> ToStack<TSource>([NotNull] this IEnumerable<TSource
             return new Stack<TSource>(source);
         }
 
-#if !FEATURE_TO_HASHSET
-        /// <summary>
-        /// Creates a hash set from the elements in the source sequence.
-        /// </summary>
-        /// <typeparam name="TSource">The type of the elements of <c>source</c>.</typeparam>
-        /// <param name="source">The sequence containing the elements to put in the hash set.</param>
-        /// <param name="comparer">A comparer to test for equality between elements.</param>
-        /// <returns>A hash set containing the same elements as the <c>source</c> sequence.</returns>
-        /// <remarks>Since a hash set cannot contain duplicates, duplicate elements from the <c>source</c> sequence will not be included in the hash set.</remarks>
-        [Pure]
-        public static HashSet<TSource> ToHashSet<TSource>([NotNull] this IEnumerable<TSource> source, IEqualityComparer<TSource>? comparer = null)
-        {
-            source.CheckArgumentNull(nameof(source));
-            return new HashSet<TSource>(source, comparer);
-        }
-#endif
-
         /// <summary>
         /// Creates a linked list from the elements in the source sequence.
         /// </summary>
diff --git a/src/Linq.Extras/ToHierarchy.cs b/src/Linq.Extras/ToHierarchy.cs
@@ -23,7 +23,7 @@ public static IEnumerable<INode<TSource>> ToHierarchy<TSource, TId>(
             [NotNull] this IEnumerable<TSource> source,
             [NotNull] Func<TSource, TId> idSelector,
             [NotNull] Func<TSource, TId> parentIdSelector,
-            TId rootParentId = default)
+            TId rootParentId = default!)
         {
             source.CheckArgumentNull(nameof(source));
             idSelector.CheckArgumentNull(nameof(idSelector));
diff --git a/src/Linq.Extras/XComparer.cs b/src/Linq.Extras/XComparer.cs
@@ -182,9 +182,15 @@ public ByKeyComparer(Func<T, TKey> keySelector, IComparer<TKey>? keyComparer)
                 _keyComparer = keyComparer ?? Comparer<TKey>.Default;
             }
 
+#if FEATURE_COMPARER_NULLABILITY
+            public int Compare(T? x, T? y)
+#else
             public int Compare(T x, T y)
+#endif
             {
-                return _keyComparer.Compare(_keySelector(x), _keySelector(y));
+                return _keyComparer.Compare(
+                    x is null ? default! : _keySelector(x),
+                    y is null ? default! : _keySelector(y));
             }
         }
 
@@ -197,7 +203,11 @@ public ReverseComparer(IComparer<T> baseComparer)
                 _baseComparer = baseComparer;
             }
 
+#if FEATURE_COMPARER_NULLABILITY
+            public int Compare(T? x, T? y)
+#else
             public int Compare(T x, T y)
+#endif
             {
                 return _baseComparer.Compare(y, x);
             }
@@ -217,7 +227,11 @@ public ChainedComparer(IEnumerable<IComparer<T>> comparers)
                 Comparers = comparers.ToArray();
             }
 
+#if FEATURE_COMPARER_NULLABILITY
+            public int Compare(T? x, T? y)
+#else
             public int Compare(T x, T y)
+#endif
             {
                 return Comparers.Select(comparer => comparer.Compare(x, y)).FirstOrDefault(cmp => cmp != 0);
             }
@@ -232,10 +246,14 @@ public DelegateComparer(Comparison<T> comparison)
                 _comparison = comparison;
             }
 
+#if FEATURE_COMPARER_NULLABILITY
+            public int Compare(T? x, T? y) => _comparison(x!, y!);
+#else
             public int Compare(T x, T y) => _comparison(x, y);
+#endif
         }
 
-        #endregion
+#endregion
 
     }
 
diff --git a/src/Linq.Extras/XEqualityComparer.cs b/src/Linq.Extras/XEqualityComparer.cs
@@ -43,18 +43,25 @@ public ByKeyEqualityComparer(Func<TSource, TKey> keySelector, IEqualityComparer<
                 _keyComparer = keyComparer ?? EqualityComparer<TKey>.Default;
             }
 
+#if FEATURE_COMPARER_NULLABILITY
+            public bool Equals(TSource? x, TSource? y)
+#else
             public bool Equals(TSource x, TSource y)
+#endif
             {
-                return _keyComparer.Equals(_keySelector(x), _keySelector(y));
+                return _keyComparer.Equals(
+                    x is null ? default! : _keySelector(x),
+                    y is null ? default! : _keySelector(y));
             }
 
             public int GetHashCode(TSource obj)
             {
-                return _keyComparer.GetHashCode(_keySelector(obj));
+                var key = _keySelector(obj);
+                return key is null ? 0 : _keyComparer.GetHashCode(key);
             }
         }
 
-        #endregion
+#endregion
     }
 
     /// <summary>
diff --git a/tests/Linq.Extras.Tests/Linq.Extras.Tests.csproj b/tests/Linq.Extras.Tests/Linq.Extras.Tests.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;netcoreapp2.1;netcoreapp3.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net461;net5.0</TargetFrameworks>
     <DebugType Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netcoreapp1.0'">Full</DebugType>
     <AssemblyOriginatorKeyFile>..\..\Linq.Extras.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -21,16 +21,15 @@
     <ProjectReference Include="../../src/Linq.Extras/Linq.Extras.csproj" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND;FEATURE_TO_HASHSET</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <DefineConstants>$(DefineConstants);FEATURE_APPEND_PREPEND;FEATURE_TO_HASHSET;FEATURE_ICOMPARER_NULLABILITY</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_ICOMPARER_NULLABILITY</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
+    <DefineConstants>$(DefineConstants);FEATURE_ICOMPARER_NULLABILITY</DefineConstants>
   </PropertyGroup>
 
 </Project>
diff --git a/tests/Linq.Extras.Tests/TestHelper.cs b/tests/Linq.Extras.Tests/TestHelper.cs
@@ -32,16 +32,16 @@ public static void AssertThrowsWhenArgumentNull(Expression<Action> expr)
             var parameters = method.GetParameters();
             var paramIndexes = parameters
                 .Select((p, i) => new { p, i })
-                .ToDictionary(x => x.p.Name, x => x.i);
+                .ToDictionary(x => x.p.Name!, x => x.i);
             var paramTypes = parameters
-                .ToDictionary(p => p.Name, p => p.ParameterType);
+                .ToDictionary(p => p.Name!, p => p.ParameterType);
 
             var nonNullableRefParams = parameters
                 .Where(p => !p.ParameterType.GetTypeInfo().IsValueType && GetNullability(p, defaultNullability) == Nullability.NotNull);
 
             foreach (var param in nonNullableRefParams)
             {
-                var paramName = param.Name;
+                var paramName = param.Name!;
                 var args = realArgs.ToArray();
                 args[paramIndexes[paramName]] = Expression.Constant(null, paramTypes[paramName]);
                 var call = Expression.Call(realCall.Object, method, args);
diff --git a/tests/Linq.Extras.Tests/XEnumerableTests/AppendPrependTests.cs b/tests/Linq.Extras.Tests/XEnumerableTests/AppendPrependTests.cs
diff --git a/tests/Linq.Extras.Tests/XEnumerableTests/ToCollectionsTests.cs b/tests/Linq.Extras.Tests/XEnumerableTests/ToCollectionsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private static IEnumerable<TResult> DepthFirstFlattenIterator<TNode, TResult>(th`
`102`	`102`	`var list = source.Select(n => new NodeWithLevel<TNode>(n, 0)).ToLinkedList();`
`103`	`103`	`while (list.Count > 0)`
`104`	`104`	`{`
`105`		`- var current = list.First.Value;`
	`105`	`+ var current = list.First!.Value;`
`106`	`106`	`list.RemoveFirst();`
`107`	`107`	`yield return resultSelector(current.Node, current.Level);`
`108`	`108`	`var llNode = list.First;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static IEnumerable<INode<TSource>> ToHierarchy<TSource, TId>(`
`23`	`23`	`[NotNull] this IEnumerable<TSource> source,`
`24`	`24`	`[NotNull] Func<TSource, TId> idSelector,`
`25`	`25`	`[NotNull] Func<TSource, TId> parentIdSelector,`
`26`		`- TId rootParentId = default)`
	`26`	`+ TId rootParentId = default!)`
`27`	`27`	`{`
`28`	`28`	`source.CheckArgumentNull(nameof(source));`
`29`	`29`	`idSelector.CheckArgumentNull(nameof(idSelector));`