Hide "ToDictionary" in .NET 8+

This is a squashed merge of PR #1040 that close #1012. --------- Co-authored-by: Atif Aziz <code@raboof.com>
morelinq · Nov 20, 2023 · c349f1d · c349f1d
1 parent 3a3c256
commit c349f1d
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 10 deletions.
diff --git a/MoreLinq.Test/ToDictionaryTest.cs b/MoreLinq.Test/ToDictionaryTest.cs
@@ -33,7 +33,7 @@ public void ToDictionaryWithKeyValuePairs()
                 KeyValuePair.Create("baz", 789),
             };
 
-            var dict = pairs.ToDictionary();
+            var dict = MoreEnumerable.ToDictionary(pairs);
 
             Assert.That(dict["foo"], Is.EqualTo(123));
             Assert.That(dict["bar"], Is.EqualTo(456));
@@ -50,7 +50,7 @@ public void ToDictionaryWithCouples()
                 ("baz", 789),
             };
 
-            var dict = pairs.ToDictionary();
+            var dict = MoreEnumerable.ToDictionary(pairs);
 
             Assert.That(dict["foo"], Is.EqualTo(123));
             Assert.That(dict["bar"], Is.EqualTo(456));
@@ -67,7 +67,7 @@ public void ToDictionaryWithKeyValuePairsWithComparer()
                 KeyValuePair.Create("baz", 789),
             };
 
-            var dict = pairs.ToDictionary(StringComparer.OrdinalIgnoreCase);
+            var dict = MoreEnumerable.ToDictionary(pairs, StringComparer.OrdinalIgnoreCase);
 
             Assert.That(dict["FOO"], Is.EqualTo(123));
             Assert.That(dict["BAR"], Is.EqualTo(456));
@@ -84,7 +84,7 @@ public void ToDictionaryWithCouplesWithComparer()
                 ("baz", 789),
             };
 
-            var dict = pairs.ToDictionary(StringComparer.OrdinalIgnoreCase);
+            var dict = MoreEnumerable.ToDictionary(pairs, StringComparer.OrdinalIgnoreCase);
 
             Assert.That(dict["FOO"], Is.EqualTo(123));
             Assert.That(dict["BAR"], Is.EqualTo(456));

diff --git a/MoreLinq/CompatibilitySuppressions.xml b/MoreLinq/CompatibilitySuppressions.xml
@@ -1,6 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{``0,``1}},System.Collections.Generic.IEqualityComparer{``0})</Target>
+    <Left>lib/net6.0/MoreLinq.dll</Left>
+    <Right>lib/net8.0/MoreLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{``0,``1}})</Target>
+    <Left>lib/net6.0/MoreLinq.dll</Left>
+    <Right>lib/net8.0/MoreLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.ValueTuple{``0,``1}},System.Collections.Generic.IEqualityComparer{``0})</Target>
+    <Left>lib/net6.0/MoreLinq.dll</Left>
+    <Right>lib/net8.0/MoreLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:MoreLinq.MoreEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.ValueTuple{``0,``1}})</Target>
+    <Left>lib/net6.0/MoreLinq.dll</Left>
+    <Right>lib/net8.0/MoreLinq.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:MoreLinq.SequenceException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)</Target>

diff --git a/MoreLinq/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/MoreLinq/PublicAPI/net8.0/PublicAPI.Unshipped.txt
@@ -661,10 +661,10 @@ static MoreLinq.MoreEnumerable.ToDelimitedString(this System.Collections.Generic
 static MoreLinq.MoreEnumerable.ToDelimitedString(this System.Collections.Generic.IEnumerable<ulong>! source, string! delimiter) -> string!
 static MoreLinq.MoreEnumerable.ToDelimitedString(this System.Collections.Generic.IEnumerable<ushort>! source, string! delimiter) -> string!
 static MoreLinq.MoreEnumerable.ToDelimitedString<TSource>(this System.Collections.Generic.IEnumerable<TSource>! source, string! delimiter) -> string!
-static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(this System.Collections.Generic.IEnumerable<(TKey Key, TValue Value)>! source) -> System.Collections.Generic.Dictionary<TKey, TValue>!
-static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(this System.Collections.Generic.IEnumerable<(TKey Key, TValue Value)>! source, System.Collections.Generic.IEqualityComparer<TKey>? comparer) -> System.Collections.Generic.Dictionary<TKey, TValue>!
-static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(this System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey, TValue>>! source) -> System.Collections.Generic.Dictionary<TKey, TValue>!
-static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(this System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey, TValue>>! source, System.Collections.Generic.IEqualityComparer<TKey>? comparer) -> System.Collections.Generic.Dictionary<TKey, TValue>!
+static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(System.Collections.Generic.IEnumerable<(TKey Key, TValue Value)>! source) -> System.Collections.Generic.Dictionary<TKey, TValue>!
+static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(System.Collections.Generic.IEnumerable<(TKey Key, TValue Value)>! source, System.Collections.Generic.IEqualityComparer<TKey>? comparer) -> System.Collections.Generic.Dictionary<TKey, TValue>!
+static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey, TValue>>! source) -> System.Collections.Generic.Dictionary<TKey, TValue>!
+static MoreLinq.MoreEnumerable.ToDictionary<TKey, TValue>(System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<TKey, TValue>>! source, System.Collections.Generic.IEqualityComparer<TKey>? comparer) -> System.Collections.Generic.Dictionary<TKey, TValue>!
 static MoreLinq.MoreEnumerable.ToHashSet<TSource>(System.Collections.Generic.IEnumerable<TSource>! source) -> System.Collections.Generic.HashSet<TSource>!
 static MoreLinq.MoreEnumerable.ToHashSet<TSource>(System.Collections.Generic.IEnumerable<TSource>! source, System.Collections.Generic.IEqualityComparer<TSource>? comparer) -> System.Collections.Generic.HashSet<TSource>!
 static MoreLinq.MoreEnumerable.ToLookup<TKey, TValue>(this System.Collections.Generic.IEnumerable<(TKey Key, TValue Value)>! source) -> System.Linq.ILookup<TKey, TValue>!

diff --git a/MoreLinq/ToDictionary.cs b/MoreLinq/ToDictionary.cs
@@ -35,9 +35,14 @@ static partial class MoreEnumerable
         /// mapped to their keys.
         /// </returns>
 
+#if !NET8_0_OR_GREATER
         public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source)
             where TKey : notnull =>
-            source.ToDictionary(null);
+#else
+        public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(IEnumerable<KeyValuePair<TKey, TValue>> source)
+            where TKey : notnull =>
+#endif
+            ToDictionary(source, null);
 
         /// <summary>
         /// Creates a <see cref="Dictionary{TKey,TValue}" /> from a sequence of
@@ -53,9 +58,15 @@ public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerab
         /// mapped to their keys.
         /// </returns>
 
+#if !NET8_0_OR_GREATER
         public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<KeyValuePair<TKey, TValue>> source,
             IEqualityComparer<TKey>? comparer)
             where TKey : notnull
+#else
+        public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(IEnumerable<KeyValuePair<TKey, TValue>> source,
+            IEqualityComparer<TKey>? comparer)
+            where TKey : notnull
+#endif
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
             return source.ToDictionary(e => e.Key, e => e.Value, comparer);
@@ -74,9 +85,14 @@ public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerab
         /// mapped to their keys.
         /// </returns>
 
+#if !NET8_0_OR_GREATER
         public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<(TKey Key, TValue Value)> source)
             where TKey : notnull =>
-            source.ToDictionary(null);
+#else
+        public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(IEnumerable<(TKey Key, TValue Value)> source)
+            where TKey : notnull =>
+#endif
+            ToDictionary(source, null);
 
         /// <summary>
         /// Creates a <see cref="Dictionary{TKey,TValue}" /> from a sequence of
@@ -92,9 +108,15 @@ public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerab
         /// mapped to their keys.
         /// </returns>
 
+#if !NET8_0_OR_GREATER
         public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(this IEnumerable<(TKey Key, TValue Value)> source,
             IEqualityComparer<TKey>? comparer)
             where TKey : notnull
+#else
+        public static Dictionary<TKey, TValue> ToDictionary<TKey, TValue>(IEnumerable<(TKey Key, TValue Value)> source,
+            IEqualityComparer<TKey>? comparer)
+            where TKey : notnull
+#endif
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
             return source.ToDictionary(e => e.Key, e => e.Value, comparer);