Switch to automated compatibility testing (#716)

viceroypenguin · Jan 11, 2025 · 7971869 · 7971869
1 parent b46fb64
commit 7971869
Show file tree

Hide file tree

Showing 34 changed files with 134 additions and 5,054 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -14,7 +14,6 @@
 	<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.12.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.12.0" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0" />
 	<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />

diff --git a/Source/SuperLinq.Async/Join.MergeJoin.cs b/Source/SuperLinq.Async/Join.MergeJoin.cs
@@ -723,9 +723,10 @@ IComparer<TKey> comparer
 ) : IEqualityComparer<TKey>
 {
 	public bool Equals([AllowNull] TKey x, [AllowNull] TKey y) => comparer.Compare(x!, y!) == 0;
+	public int GetHashCode(
 #if NETCOREAPP
-	public int GetHashCode([DisallowNull] TKey obj) => ThrowHelper.ThrowNotSupportedException<int>();
-#else
-	public int GetHashCode(TKey obj) => ThrowHelper.ThrowNotSupportedException<int>();
+		[DisallowNull]
 #endif
+		TKey obj
+	) => ThrowHelper.ThrowNotSupportedException<int>();
 }
diff --git a/Source/SuperLinq.Async/PublicAPI/net6.0/PublicAPI.Shipped.txt b/Source/SuperLinq.Async/PublicAPI/net6.0/PublicAPI.Shipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/net6.0/PublicAPI.Unshipped.txt b/Source/SuperLinq.Async/PublicAPI/net6.0/PublicAPI.Unshipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/net7.0/PublicAPI.Shipped.txt b/Source/SuperLinq.Async/PublicAPI/net7.0/PublicAPI.Shipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/net7.0/PublicAPI.Unshipped.txt b/Source/SuperLinq.Async/PublicAPI/net7.0/PublicAPI.Unshipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/net8.0/PublicAPI.Shipped.txt b/Source/SuperLinq.Async/PublicAPI/net8.0/PublicAPI.Shipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/Source/SuperLinq.Async/PublicAPI/net8.0/PublicAPI.Unshipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/net9.0/PublicAPI.Shipped.txt b/Source/SuperLinq.Async/PublicAPI/net9.0/PublicAPI.Shipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/Source/SuperLinq.Async/PublicAPI/net9.0/PublicAPI.Unshipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt b/Source/SuperLinq.Async/PublicAPI/netcoreapp3.1/PublicAPI.Shipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt b/Source/SuperLinq.Async/PublicAPI/netcoreapp3.1/PublicAPI.Unshipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt b/Source/SuperLinq.Async/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
diff --git a/Source/SuperLinq.Async/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/Source/SuperLinq.Async/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
diff --git a/Source/SuperLinq.Async/SortedMerge.cs b/Source/SuperLinq.Async/SortedMerge.cs
@@ -372,15 +372,15 @@ static async IAsyncEnumerable<TSource> Impl(
 			}
 		}
 	}
+}
 
 #if !NET6_0_OR_GREATER
-	internal sealed class SourceComparer<TItem, TKey>(
-		IComparer<TKey> keyComparer,
-		Func<TItem, TKey> keySelector
-	) : IComparer<IAsyncEnumerator<TItem>>
-	{
-		public int Compare(IAsyncEnumerator<TItem>? x, IAsyncEnumerator<TItem>? y) =>
-			keyComparer.Compare(keySelector(x!.Current), keySelector(y!.Current));
-	}
-#endif
+file sealed class SourceComparer<TItem, TKey>(
+	IComparer<TKey> keyComparer,
+	Func<TItem, TKey> keySelector
+) : IComparer<IAsyncEnumerator<TItem>>
+{
+	public int Compare(IAsyncEnumerator<TItem>? x, IAsyncEnumerator<TItem>? y) =>
+		keyComparer.Compare(keySelector(x!.Current), keySelector(y!.Current));
 }
+#endif
diff --git a/Source/SuperLinq.Async/SuperLinq.Async.csproj b/Source/SuperLinq.Async/SuperLinq.Async.csproj
@@ -7,6 +7,9 @@
 	<RootNamespace>SuperLinq.Async</RootNamespace>
 
 	<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
+
+	<EnablePackageValidation>true</EnablePackageValidation>
+	<PackageValidationBaselineVersion>6.0.0</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
@@ -104,8 +107,6 @@
 
   <ItemGroup>
 	<None Include="readme.md" Pack="true" PackagePath="\" />
-	<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
-	<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
   </ItemGroup>
 
   <ItemGroup>
@@ -116,7 +117,6 @@
   <ItemGroup>
 	<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
 	<PackageReference Include="Microsoft.Bcl.HashCode" />
-	<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
 	<PackageReference Include="MinVer" PrivateAssets="All" />
 	<PackageReference Include="System.Linq.Async" />
 	<PackageReference Include="System.Memory" />

diff --git a/Source/SuperLinq/CompatibilitySuppressions.xml b/Source/SuperLinq/CompatibilitySuppressions.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/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:SuperLinq.SuperEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{``0,``1}},System.Collections.Generic.IEqualityComparer{``0})</Target>
+    <Left>lib/net6.0/SuperLinq.dll</Left>
+    <Right>lib/net8.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{``0,``1}})</Target>
+    <Left>lib/net6.0/SuperLinq.dll</Left>
+    <Right>lib/net8.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.ValueTuple{``0,``1}},System.Collections.Generic.IEqualityComparer{``0})</Target>
+    <Left>lib/net6.0/SuperLinq.dll</Left>
+    <Right>lib/net8.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.ToDictionary``2(System.Collections.Generic.IEnumerable{System.ValueTuple{``0,``1}})</Target>
+    <Left>lib/net6.0/SuperLinq.dll</Left>
+    <Right>lib/net8.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.AggregateBy``3(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},``2,System.Func{``2,``0,``2},System.Collections.Generic.IEqualityComparer{``1})</Target>
+    <Left>lib/net8.0/SuperLinq.dll</Left>
+    <Right>lib/net9.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.AggregateBy``3(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Func{``1,``2},System.Func{``2,``0,``2},System.Collections.Generic.IEqualityComparer{``1})</Target>
+    <Left>lib/net8.0/SuperLinq.dll</Left>
+    <Right>lib/net9.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.CountBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IEqualityComparer{``1})</Target>
+    <Left>lib/net8.0/SuperLinq.dll</Left>
+    <Right>lib/net9.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.CountBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
+    <Left>lib/net8.0/SuperLinq.dll</Left>
+    <Right>lib/net9.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.Index``1(System.Collections.Generic.IEnumerable{``0})</Target>
+    <Left>lib/net8.0/SuperLinq.dll</Left>
+    <Right>lib/net9.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IEqualityComparer{``1})</Target>
+    <Left>lib/netcoreapp3.1/SuperLinq.dll</Left>
+    <Right>lib/net6.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.DistinctBy``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1})</Target>
+    <Left>lib/netcoreapp3.1/SuperLinq.dll</Left>
+    <Right>lib/net6.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.ElementAt``1(System.Collections.Generic.IEnumerable{``0},System.Index)</Target>
+    <Left>lib/netcoreapp3.1/SuperLinq.dll</Left>
+    <Right>lib/net6.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.ElementAtOrDefault``1(System.Collections.Generic.IEnumerable{``0},System.Index)</Target>
+    <Left>lib/netcoreapp3.1/SuperLinq.dll</Left>
+    <Right>lib/net6.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:SuperLinq.SuperEnumerable.Take``1(System.Collections.Generic.IEnumerable{``0},System.Range)</Target>
+    <Left>lib/netcoreapp3.1/SuperLinq.dll</Left>
+    <Right>lib/net6.0/SuperLinq.dll</Right>
+  </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0008</DiagnosticId>
+    <Target>T:SuperLinq.OrderByDirection</Target>
+    <Left>lib/net7.0/SuperLinq.dll</Left>
+    <Right>lib/net6.0/SuperLinq.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+</Suppressions>
diff --git a/Source/SuperLinq/UnreachableException.cs → ...erLinq/Exceptions/UnreachableException.cs b/Source/SuperLinq/UnreachableException.cs → ...erLinq/Exceptions/UnreachableException.cs
@@ -5,11 +5,9 @@
 
 #if !NET7_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
-#endif
 
 namespace System.Diagnostics;
 
-#if !NET7_0_OR_GREATER
 /// <summary>
 /// Exception thrown when the program executes an instruction that was thought to be unreachable.
 /// </summary>
@@ -43,4 +41,8 @@ public UnreachableException(string? message, Exception? innerException)
 		: base(message, innerException)
 	{ }
 }
+#else
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(System.Diagnostics.UnreachableException))]
 #endif
diff --git a/Source/SuperLinq/Join.MergeJoin.cs b/Source/SuperLinq/Join.MergeJoin.cs
@@ -726,9 +726,10 @@ IComparer<TKey> comparer
 ) : IEqualityComparer<TKey>
 {
 	public bool Equals([AllowNull] TKey x, [AllowNull] TKey y) => comparer.Compare(x!, y!) == 0;
+	public int GetHashCode(
 #if NETCOREAPP
-	public int GetHashCode([DisallowNull] TKey obj) => ThrowHelper.ThrowNotSupportedException<int>();
-#else
-	public int GetHashCode(TKey obj) => ThrowHelper.ThrowNotSupportedException<int>();
+		[DisallowNull]
 #endif
+		TKey obj
+	) => ThrowHelper.ThrowNotSupportedException<int>();
 }