Compile Funcky in .NET10

FreeApophis · FreeApophis · commit 022149fd084b · 2026-02-12T10:04:09.000+01:00
* prepare Framework Feature Constants * Fixes #867 (System.Linq.Shuffle) * Fixes duplicate import of System.Linq.Async
diff --git a/FrameworkFeatureConstants.props b/FrameworkFeatureConstants.props
@@ -21,4 +21,7 @@
 	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
 		<DefineConstants>$(DefineConstants);REFLECTION_ASSEMBLY_NAME_INFO;REFLECTION_TYPE_NAME;ORDERED_DICTIONARY</DefineConstants>
 	</PropertyGroup>
+	<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+		<DefineConstants>$(DefineConstants);SHUFFLE_EXTENSION</DefineConstants>
+	</PropertyGroup>
 </Project>
diff --git a/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj b/Funcky.Analyzers/Funcky.Analyzers.Test/Funcky.Analyzers.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
 
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
         <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
diff --git a/Funcky.Async.Test/Funcky.Async.Test.csproj b/Funcky.Async.Test/Funcky.Async.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net9.0;net8.0;net7.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
diff --git a/Funcky.Async/Extensions/AsyncEnumerableExtensions/Shuffle.cs b/Funcky.Async/Extensions/AsyncEnumerableExtensions/Shuffle.cs
@@ -1,3 +1,4 @@
+#if SHUFFLE_EXTENSION
 #if !RANDOM_SHUFFLE
 using Funcky.Internal;
 #endif
@@ -27,3 +28,4 @@ public static async ValueTask<IReadOnlyList<TSource>> ShuffleAsync<TSource>(this
         => (await source.ToListAsync(cancellationToken).ConfigureAwait(false)).ToRandomList(random);
 #endif
 }
+#endif
diff --git a/Funcky.Async/Funcky.Async.csproj b/Funcky.Async/Funcky.Async.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <FunckyNewestTargetFramework>net9.0</FunckyNewestTargetFramework>
-        <TargetFrameworks>$(FunckyNewestTargetFramework);net8.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+        <FunckyNewestTargetFramework>net10.0</FunckyNewestTargetFramework>
+        <TargetFrameworks>$(FunckyNewestTargetFramework);net9.0;net8.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
         <Description>Extends Funcky with support for IAsyncEnumerable and Tasks.</Description>
@@ -46,7 +46,7 @@
     <ItemGroup>
         <PackageReference Include="PolySharp" PrivateAssets="all" />
         <PackageReference Include="Polyadic.Build.SemanticVersioning" PrivateAssets="all" />
-        <PackageReference Include="System.Linq.Async" />
+        <PackageReference Include="System.Linq.Async" Condition="'$(TargetFramework)' != 'net10.0'" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Funcky\Funcky.csproj" />
diff --git a/Funcky.SourceGenerator.Test/Funcky.SourceGenerator.Test.csproj b/Funcky.SourceGenerator.Test/Funcky.SourceGenerator.Test.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <AssemblyName>Funcky.SourceGenerator.Test</AssemblyName>
         <RootNamespace>Funcky.SourceGenerator.Test</RootNamespace>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <LangVersion>preview</LangVersion>
diff --git a/Funcky.Test/Extensions/EnumerableExtensions/ShuffleTest.cs b/Funcky.Test/Extensions/EnumerableExtensions/ShuffleTest.cs
@@ -33,6 +33,6 @@ public Property AShuffleHasTheSameElementsAsTheSource(List<int> source)
 
     [Property]
     public Property AShuffleHasTheSameLengthAsTheSource(List<int> source)
-        => (source.Shuffle().Count == source.Count)
+        => (source.Shuffle().Count() == source.Count)
             .ToProperty();
 }
diff --git a/Funcky.Test/Funcky.Test.csproj b/Funcky.Test/Funcky.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net4.8</TargetFrameworks>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
diff --git a/Funcky.Xunit.Test/Funcky.Xunit.Test.csproj b/Funcky.Xunit.Test/Funcky.Xunit.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
diff --git a/Funcky.Xunit.v3.Test/Funcky.Xunit.v3.Test.csproj b/Funcky.Xunit.v3.Test/Funcky.Xunit.v3.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
diff --git a/Funcky/Extensions/EnumerableExtensions/Shuffle.cs b/Funcky/Extensions/EnumerableExtensions/Shuffle.cs
@@ -6,6 +6,7 @@ namespace Funcky.Extensions;
 
 public static partial class EnumerableExtensions
 {
+#if !SHUFFLE_EXTENSION
     /// <summary>
     /// Returns the given sequence eagerly in random Order in O(n).
     /// </summary>
@@ -14,6 +15,7 @@ public static partial class EnumerableExtensions
     [Pure]
     public static IReadOnlyList<TSource> Shuffle<TSource>(this IEnumerable<TSource> source)
         => source.Shuffle(new Random());
+#endif
 
     /// <summary>
     /// Returns the given sequence eagerly in random Order in O(n).
@@ -32,5 +34,5 @@ public static IReadOnlyList<TSource> Shuffle<TSource>(this IEnumerable<TSource>
         => source
             .ToList()
             .ToRandomList(random);
-    #endif
+#endif
 }
diff --git a/Funcky/Funcky.csproj b/Funcky/Funcky.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <FunckyNewestTargetFramework>net9.0</FunckyNewestTargetFramework>
-        <TargetFrameworks>$(FunckyNewestTargetFramework);net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <FunckyNewestTargetFramework>net10.0</FunckyNewestTargetFramework>
+        <TargetFrameworks>$(FunckyNewestTargetFramework);net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>preview</LangVersion>
         <Nullable>enable</Nullable>
         <Product>Funcky</Product>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.200",
+    "version": "10.0.103",
     "rollForward": "feature"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if SHUFFLE_EXTENSION`
`1`	`2`	`#if !RANDOM_SHUFFLE`
`2`	`3`	`using Funcky.Internal;`
`3`	`4`	`#endif`
`@@ -27,3 +28,4 @@ public static async ValueTask<IReadOnlyList<TSource>> ShuffleAsync<TSource>(this`
`27`	`28`	`=> (await source.ToListAsync(cancellationToken).ConfigureAwait(false)).ToRandomList(random);`
`28`	`29`	`#endif`
`29`	`30`	`}`
	`31`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ public Property AShuffleHasTheSameElementsAsTheSource(List<int> source)`
`33`	`33`
`34`	`34`	`[Property]`
`35`	`35`	`public Property AShuffleHasTheSameLengthAsTheSource(List<int> source)`
`36`		`- => (source.Shuffle().Count == source.Count)`
	`36`	`+ => (source.Shuffle().Count() == source.Count)`
`37`	`37`	`.ToProperty();`
`38`	`38`	`}`