viceroypenguin · viceroypenguin · Dec 27, 2024 · Dec 27, 2024 · Dec 27, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,6 +35,6 @@ jobs:
       run: dotnet test -c Release --no-build --logger GitHubActions
 
     - name: Upload coverage reports to Codecov with GitHub Action
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,22 +1,25 @@
 <Project>
   <PropertyGroup>
 	<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.3.0" />
 	<PackageVersion Include="coverlet.collector" Version="6.0.2" />
 	<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
-	<PackageVersion Include="DocFx.App" Version="2.77.0" />
+	<PackageVersion Include="DocFx.App" Version="2.78.2" />
+	<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
 	<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
 	<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
 	<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.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" />
-	<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
 	<PackageVersion Include="MinVer" Version="6.0.0" />
-	<PackageVersion Include="Scriban" Version="5.10.0" />
+	<PackageVersion Include="Scriban" Version="5.12.1" />
 	<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
 	<PackageVersion Include="System.Memory" Version="4.5.5" />
 	<PackageVersion Include="ThisAssembly.Resources" Version="1.4.3" />
@@ -32,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.169" />
-	<GlobalPackageReference Include="PolySharp" Version="1.14.1" />
+	<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.184" />
+	<GlobalPackageReference Include="PolySharp" Version="1.15.0" />
   </ItemGroup>
 </Project>
diff --git a/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj b/Docs/SuperLinq.Docs/SuperLinq.Docs.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1852;NU1701;NU1902;NU1903</NoWarn>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/...rs/SuperLinq.Async.Generator/Generator.cs → ...q.Async.Generator/IncrementalGenerator.cs b/...rs/SuperLinq.Async.Generator/Generator.cs → ...q.Async.Generator/IncrementalGenerator.cs
@@ -10,7 +10,7 @@ namespace SuperLinq.Async.Generator;
 /// Uses source generation tools to automate the building of some operators
 /// </summary>
 [Generator]
-public sealed class Generator : IIncrementalGenerator
+public sealed class IncrementalGenerator : IIncrementalGenerator
 {
 	/// <inheritdoc />
 	public void Initialize(IncrementalGeneratorInitializationContext context)

diff --git a/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj b/Generators/SuperLinq.Async.Generator/SuperLinq.Async.Generator.csproj
@@ -1,44 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IsPackable>false</IsPackable>
-    <IsRoslynComponent>true</IsRoslynComponent>
+	<TargetFrameworks>netstandard2.0</TargetFrameworks>
+	<IncludeBuildOutput>false</IncludeBuildOutput>
+	<IsPackable>false</IsPackable>
+	<IsRoslynComponent>true</IsRoslynComponent>
 
-    <!-- Avoid figuring out an actual dependency on Scriban -->
-    <PackageScribanIncludeSource>true</PackageScribanIncludeSource>
+	<!-- Analyzer checks-->
+	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 
-    <!-- Scriban fails a lot of things in latest-all... -->
-    <AnalysisLevel>latest-default</AnalysisLevel>
-
-    <!-- Analyzer checks-->
-    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-
-    <!-- Other things to turn off -->
-    <NoWarn>$(NoWarn);RS1035;SL03</NoWarn>
+	<!-- Other things to turn off -->
+	<NoWarn>$(NoWarn);RS1035</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
-    <PackageReference Include="Scriban" IncludeAssets="build" />
-    <PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
+	<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+	<PackageReference Include="Scriban" PrivateAssets="all" GeneratePathProperty="true" />
+	<PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="*.sbntxt" />
-    <EmbeddedResource Include="*.sbntxt" Kind="Text" />
-  </ItemGroup>
+  <PropertyGroup>
+	<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
+  </PropertyGroup>
+
+  <Target Name="GetDependencyTargetPaths">
+	<ItemGroup>
+	  <TargetPathWithTargetPlatformMoniker Include="$(PkgScriban)/lib/netstandard2.0/Scriban.dll" IncludeRuntimeDependency="false" />
+	</ItemGroup>
+  </Target>
 
   <ItemGroup>
-    <Compile Include="../SuperLinq.Generator/ArgumentNames.cs" />
+	<None Remove="*.sbntxt" />
+	<EmbeddedResource Include="*.sbntxt" Kind="Text" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="ZipLongest.sbntxt">
-      <Kind>Text</Kind>
-    </EmbeddedResource>
+	<Compile Include="../SuperLinq.Generator/ArgumentNames.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/Generators/SuperLinq.Generator/ArgumentNames.cs b/Generators/SuperLinq.Generator/ArgumentNames.cs
@@ -1,9 +1,9 @@
-namespace SuperLinq.Generator;
+namespace SuperLinq.Generator;
 
 /// <summary>
 /// int->string translations of different types.
 /// </summary>
-public record ArgumentNames(string[] Arity, string[] Ordinals, string[] Cardinals)
+public record ArgumentNames(IReadOnlyList<string> Arity, IReadOnlyList<string> Ordinals, IReadOnlyList<string> Cardinals)
 {
 	/// <summary>
 	/// int->string translations of different types.

diff --git a/Generators/SuperLinq.Generator/Generator.cs → ...perLinq.Generator/IncrementalGenerator.cs b/Generators/SuperLinq.Generator/Generator.cs → ...perLinq.Generator/IncrementalGenerator.cs
@@ -9,7 +9,7 @@ namespace SuperLinq.Generator;
 /// Uses source generation tools to automate the building of some operators
 /// </summary>
 [Generator]
-public sealed class Generator : IIncrementalGenerator
+public sealed class IncrementalGenerator : IIncrementalGenerator
 {
 	/// <inheritdoc />
 	public void Initialize(IncrementalGeneratorInitializationContext context)

diff --git a/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj b/Generators/SuperLinq.Generator/SuperLinq.Generator.csproj
@@ -1,34 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IsPackable>false</IsPackable>
-    <IsRoslynComponent>true</IsRoslynComponent>
+	<TargetFrameworks>netstandard2.0</TargetFrameworks>
+	<IncludeBuildOutput>false</IncludeBuildOutput>
+	<IsPackable>false</IsPackable>
+	<IsRoslynComponent>true</IsRoslynComponent>
 
-    <!-- Avoid figuring out an actual dependency on Scriban -->
-    <PackageScribanIncludeSource>true</PackageScribanIncludeSource>
+	<!-- Analyzer checks-->
+	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
 
-    <!-- Scriban fails a lot of things in latest-all... -->
-    <AnalysisLevel>latest-default</AnalysisLevel>
-
-    <!-- Analyzer checks-->
-    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-
-    <!-- Other things to turn off -->
-    <NoWarn>$(NoWarn);RS1035;SL03</NoWarn>
+	<!-- Other things to turn off -->
+	<NoWarn>$(NoWarn);RS1035</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
-    <PackageReference Include="Scriban" IncludeAssets="build" />
-    <PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
+	<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+	<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+	<PackageReference Include="Scriban" PrivateAssets="all" GeneratePathProperty="true" />
+	<PackageReference Include="ThisAssembly.Resources" PrivateAssets="all" />
   </ItemGroup>
 
+  <PropertyGroup>
+	<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
+  </PropertyGroup>
+
+  <Target Name="GetDependencyTargetPaths">
+	<ItemGroup>
+	  <TargetPathWithTargetPlatformMoniker Include="$(PkgScriban)/lib/netstandard2.0/Scriban.dll" IncludeRuntimeDependency="false" />
+	</ItemGroup>
+  </Target>
+
   <ItemGroup>
-    <None Remove="*.sbntxt" />
-    <EmbeddedResource Include="*.sbntxt" Kind="Text" />
+	<None Remove="*.sbntxt" />
+	<EmbeddedResource Include="*.sbntxt" Kind="Text" />
   </ItemGroup>
 
 </Project>
diff --git a/...nq.Async.Generator.Generator/EquiZip.g.cs → ...nerator.IncrementalGenerator/EquiZip.g.cs b/...nq.Async.Generator.Generator/EquiZip.g.cs → ...nerator.IncrementalGenerator/EquiZip.g.cs
diff --git a/...rLinq.Async.Generator.Generator/Fold.g.cs → ....Generator.IncrementalGenerator/Fold.g.cs b/...rLinq.Async.Generator.Generator/Fold.g.cs → ....Generator.IncrementalGenerator/Fold.g.cs
diff --git a/...Async.Generator.Generator/ZipLongest.g.cs → ...ator.IncrementalGenerator/ZipLongest.g.cs b/...Async.Generator.Generator/ZipLongest.g.cs → ...ator.IncrementalGenerator/ZipLongest.g.cs
diff --git a/...sync.Generator.Generator/ZipShortest.g.cs → ...tor.IncrementalGenerator/ZipShortest.g.cs b/...sync.Generator.Generator/ZipShortest.g.cs → ...tor.IncrementalGenerator/ZipShortest.g.cs
diff --git a/Source/SuperLinq.Async/Random.cs b/Source/SuperLinq.Async/Random.cs
@@ -218,9 +218,8 @@ private sealed class GlobalRandom : Random
 	{
 		private static int s_seed = Environment.TickCount;
 
-		[ThreadStatic] private static Random? s_threadRandom;
-
-		private static Random ThreadRandom => s_threadRandom ??= new Random(Interlocked.Increment(ref s_seed));
+		[field: ThreadStatic, System.Diagnostics.CodeAnalysis.MaybeNull]
+		private static Random ThreadRandom => field ??= new Random(Interlocked.Increment(ref s_seed));
 
 		public override int Next() => ThreadRandom.Next();
 		public override int Next(int minValue, int maxValue) => ThreadRandom.Next(minValue, maxValue);

diff --git a/Source/SuperLinq.Async/SuperLinq.Async.csproj b/Source/SuperLinq.Async/SuperLinq.Async.csproj
@@ -118,9 +118,9 @@
   </ItemGroup>
 
   <ItemGroup>
+	<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
 	<PackageReference Include="Microsoft.Bcl.HashCode" />
 	<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
-	<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
 	<PackageReference Include="MinVer" PrivateAssets="All" />
 	<PackageReference Include="System.Linq.Async" />
 	<PackageReference Include="System.Memory" />

diff --git a/...erLinq.Generator.Generator/Aggregate.g.cs → ...rator.IncrementalGenerator/Aggregate.g.cs b/...erLinq.Generator.Generator/Aggregate.g.cs → ...rator.IncrementalGenerator/Aggregate.g.cs
diff --git a/...erLinq.Generator.Generator/Cartesian.g.cs → ...rator.IncrementalGenerator/Cartesian.g.cs b/...erLinq.Generator.Generator/Cartesian.g.cs → ...rator.IncrementalGenerator/Cartesian.g.cs
diff --git a/...uperLinq.Generator.Generator/EquiZip.g.cs → ...nerator.IncrementalGenerator/EquiZip.g.cs b/...uperLinq.Generator.Generator/EquiZip.g.cs → ...nerator.IncrementalGenerator/EquiZip.g.cs
diff --git a/...r/SuperLinq.Generator.Generator/Fold.g.cs → ....Generator.IncrementalGenerator/Fold.g.cs b/...r/SuperLinq.Generator.Generator/Fold.g.cs → ....Generator.IncrementalGenerator/Fold.g.cs
diff --git a/...enerator.Generator/ToDelimitedString.g.cs → ...crementalGenerator/ToDelimitedString.g.cs b/...enerator.Generator/ToDelimitedString.g.cs → ...crementalGenerator/ToDelimitedString.g.cs
diff --git a/...rLinq.Generator.Generator/ZipLongest.g.cs → ...ator.IncrementalGenerator/ZipLongest.g.cs b/...rLinq.Generator.Generator/ZipLongest.g.cs → ...ator.IncrementalGenerator/ZipLongest.g.cs
diff --git a/...Linq.Generator.Generator/ZipShortest.g.cs → ...tor.IncrementalGenerator/ZipShortest.g.cs b/...Linq.Generator.Generator/ZipShortest.g.cs → ...tor.IncrementalGenerator/ZipShortest.g.cs
diff --git a/Source/SuperLinq/Random.cs b/Source/SuperLinq/Random.cs
@@ -1,4 +1,4 @@
-namespace SuperLinq;
+namespace SuperLinq;
 
 public static partial class SuperEnumerable
 {
@@ -215,9 +215,8 @@ private sealed class GlobalRandom : Random
 	{
 		private static int s_seed = Environment.TickCount;
 
-		[ThreadStatic] private static Random? s_threadRandom;
-
-		private static Random ThreadRandom => s_threadRandom ??= new Random(Interlocked.Increment(ref s_seed));
+		[field: ThreadStatic, System.Diagnostics.CodeAnalysis.MaybeNull]
+		private static Random ThreadRandom => field ??= new Random(Interlocked.Increment(ref s_seed));
 
 		public override int Next() => ThreadRandom.Next();
 		public override int Next(int minValue, int maxValue) => ThreadRandom.Next(minValue, maxValue);

diff --git a/Source/SuperLinq/SuperLinq.csproj b/Source/SuperLinq/SuperLinq.csproj
@@ -163,10 +163,10 @@
   </ItemGroup>
 
   <ItemGroup>
+	<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Bcl.HashCode" />
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="MinVer" PrivateAssets="All" />
+	<PackageReference Include="MinVer" PrivateAssets="All" />
     <PackageReference Include="System.Memory" />
   </ItemGroup>
 

diff --git a/Tests/SuperLinq.Async.Test/MemoizeTest.cs b/Tests/SuperLinq.Async.Test/MemoizeTest.cs
@@ -1,5 +1,4 @@
 using System.Collections;
-using CommunityToolkit.Diagnostics;
 
 namespace Test.Async;
 
@@ -230,10 +229,10 @@ public async Task MemoizeRethrowsErrorDuringIterationToAllsUntilReset()
 		await using (var r1 = memoized.Read())
 		await using (var r2 = memoized.Read())
 		{
-			Guard.IsTrue(await r1.Read() == await r2.Read());
+			Assert.True(await r1.Read() == await r2.Read());
 			_ = await Assert.ThrowsAsync<TestException>(async () => await r1.Read());
 
-			Guard.IsTrue(xs.IsDisposed);
+			Assert.True(xs.IsDisposed);
 
 			_ = await Assert.ThrowsAsync<TestException>(async () => await r2.Read());
 		}
@@ -259,7 +258,7 @@ public async Task MemoizeRethrowsErrorDuringIterationStartToAllsUntilReset()
 		await using (var r2 = buffer.Read())
 		{
 			_ = await Assert.ThrowsAsync<TestException>(async () => await r1.Read());
-			Guard.IsTrue(xs.IsDisposed);
+			Assert.True(xs.IsDisposed);
 			_ = await Assert.ThrowsAsync<TestException>(async () => await r2.Read());
 		}
 
@@ -269,7 +268,7 @@ public async Task MemoizeRethrowsErrorDuringIterationStartToAllsUntilReset()
 		Assert.Equal(0, buffer.Count);
 		await using (var r1 = buffer.Read())
 		await using (var r2 = buffer.Read())
-			Guard.IsTrue(await r1.Read() == await r2.Read());
+			Assert.True(await r1.Read() == await r2.Read());
 
 		Assert.Equal(1, buffer.Count);
 	}

diff --git a/Tests/SuperLinq.Async.Test/NullArgumentTest.cs b/Tests/SuperLinq.Async.Test/NullArgumentTest.cs
@@ -5,7 +5,6 @@
 #endif
 using System.Linq.Expressions;
 using System.Reflection;
-using CommunityToolkit.Diagnostics;
 using Debug = System.Diagnostics.Debug;
 
 namespace Test.Async;
@@ -241,7 +240,7 @@ public sealed class OrderedEnumerable<T> : Enumerable<T>, IOrderedEnumerable<T>
 		{
 			public IOrderedEnumerable<T> CreateOrderedEnumerable<TKey>(Func<T, TKey> keySelector, IComparer<TKey>? comparer, bool descending)
 			{
-				Guard.IsNotNull(keySelector);
+				Assert.NotNull(keySelector);
 				return this;
 			}
 		}
@@ -262,19 +261,19 @@ public sealed class OrderedAsyncEnumerable<T> : AsyncEnumerable<T>, IOrderedAsyn
 		{
 			public IOrderedAsyncEnumerable<T> CreateOrderedEnumerable<TKey>(Func<T, TKey> keySelector, IComparer<TKey>? comparer, bool descending)
 			{
-				Guard.IsNotNull(keySelector);
+				Assert.NotNull(keySelector);
 				return this;
 			}
 
 			public IOrderedAsyncEnumerable<T> CreateOrderedEnumerable<TKey>(Func<T, ValueTask<TKey>> keySelector, IComparer<TKey>? comparer, bool descending)
 			{
-				Guard.IsNotNull(keySelector);
+				Assert.NotNull(keySelector);
 				return this;
 			}
 
 			public IOrderedAsyncEnumerable<T> CreateOrderedEnumerable<TKey>(Func<T, CancellationToken, ValueTask<TKey>> keySelector, IComparer<TKey>? comparer, bool descending)
 			{
-				Guard.IsNotNull(keySelector);
+				Assert.NotNull(keySelector);
 				return this;
 			}
 		}

diff --git a/Tests/SuperLinq.Async.Test/PublishTest.cs b/Tests/SuperLinq.Async.Test/PublishTest.cs
@@ -1,6 +1,4 @@
-using CommunityToolkit.Diagnostics;
-
-namespace Test.Async;
+namespace Test.Async;
 
 public sealed class PublishTest
 {
@@ -246,7 +244,7 @@ public async Task PublishRethrowsErrorDuringIterationToAllIteratorsUntilReset()
 
 			_ = await Assert.ThrowsAsync<TestException>(async () => await r1.Read());
 			_ = await Assert.ThrowsAsync<TestException>(async () => await r2.Read());
-			Guard.IsTrue(xs.IsDisposed);
+			Assert.True(xs.IsDisposed);
 		}
 
 		await using (var r3 = buffer.Read())

diff --git a/Tests/SuperLinq.Async.Test/SequenceReader.cs b/Tests/SuperLinq.Async.Test/SequenceReader.cs
@@ -1,13 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
-using CommunityToolkit.Diagnostics;
 
 namespace Test.Async;
 
 internal static class SequenceReader
 {
 	public static SequenceReader<T> Read<T>(this IAsyncEnumerable<T> source)
 	{
-		Guard.IsNotNull(source);
+		Assert.NotNull(source);
 		return new SequenceReader<T>(source);
 	}
 }
@@ -40,13 +39,13 @@ public SequenceReader(IAsyncEnumerable<T> source) :
 
 	public SequenceReader(IAsyncEnumerator<T> enumerator)
 	{
-		Guard.IsNotNull(enumerator);
+		Assert.NotNull(enumerator);
 		_enumerator = enumerator;
 	}
 
 	private static IAsyncEnumerator<T> GetEnumerator(IAsyncEnumerable<T> source)
 	{
-		Guard.IsNotNull(source);
+		Assert.NotNull(source);
 		return source.GetAsyncEnumerator();
 	}