Merge pull request #871 from polyadic/add-dotnet10

FreeApophis · web-flow · commit bcf47409f071 · 2026-02-25T14:24:33.000+01:00
Compile Funcky in .NET10
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;INTEGRATED_ASYNC</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,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
diff --git a/Funcky.Async/Funcky.Async.csproj b/Funcky.Async/Funcky.Async.csproj
@@ -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
@@ -1,27 +1,31 @@
 using FsCheck;
 using FsCheck.Fluent;
 using FsCheck.Xunit;
+#if !SHUFFLE_EXTENSION
 using Funcky.Test.TestUtils;
 using Xunit.Sdk;
+#endif
 
 namespace Funcky.Test.Extensions.EnumerableExtensions;
 
 public sealed class ShuffleTest
 {
+#if !SHUFFLE_EXTENSION
     [Fact]
     public void AShuffleIsEnumeratedEagerly()
     {
         var doNotEnumerate = new FailOnEnumerationSequence<object>();
 
         Assert.Throws<XunitException>(() => doNotEnumerate.Shuffle());
     }
+#endif
 
     [Fact]
     public void AShuffleWithASpecificRandomDistributionAlwaysReturnsTheSameShuffle()
     {
         var source = Enumerable.Range(0, 16);
 
-        Assert.Equal(Sequence.Return(3, 2, 6, 15, 14, 0, 5, 8, 11, 7, 9, 12, 1, 13, 10, 4), source.Shuffle(new System.Random(1337)));
+        Assert.Equal(Sequence.Return(3, 2, 6, 15, 14, 0, 5, 8, 11, 7, 9, 12, 1, 13, 10, 4), source.Shuffle(new Random(1337)));
     }
 
     [Property]
@@ -33,6 +37,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/CompatibilitySuppressions.xml b/Funcky/CompatibilitySuppressions.xml
@@ -7,6 +7,12 @@
     <Left>lib/net5.0/Funcky.dll</Left>
     <Right>lib/net6.0/Funcky.dll</Right>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Funcky.Extensions.EnumerableExtensions.Shuffle``1(System.Collections.Generic.IEnumerable{``0})</Target>
+    <Left>lib/net9.0/Funcky.dll</Left>
+    <Right>lib/net10.0/Funcky.dll</Right>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0021</DiagnosticId>
     <Target>M:Funcky.Extensions.DictionaryExtensions.GetValueOrNone``2(System.Collections.Generic.IDictionary{``0,``1},``0)``0:notnull</Target>
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/Funcky/PublicAPI.Shipped.txt b/Funcky/PublicAPI.Shipped.txt
@@ -314,7 +314,6 @@ static Funcky.Extensions.EnumerableExtensions.Sequence<TLeft, TSource>(this Syst
 static Funcky.Extensions.EnumerableExtensions.Sequence<TSource>(this System.Collections.Generic.IEnumerable<Funcky.Monads.Option<TSource>>! source) -> Funcky.Monads.Option<System.Collections.Generic.IReadOnlyList<TSource>!>
 static Funcky.Extensions.EnumerableExtensions.Sequence<TSource>(this System.Collections.Generic.IEnumerable<Funcky.Monads.Result<TSource>>! source) -> Funcky.Monads.Result<System.Collections.Generic.IReadOnlyList<TSource>!>
 static Funcky.Extensions.EnumerableExtensions.Sequence<TSource>(this System.Collections.Generic.IEnumerable<System.Lazy<TSource>!>! sequence) -> System.Lazy<System.Collections.Generic.IEnumerable<TSource>!>!
-static Funcky.Extensions.EnumerableExtensions.Shuffle<TSource>(this System.Collections.Generic.IEnumerable<TSource>! source) -> System.Collections.Generic.IReadOnlyList<TSource>!
 static Funcky.Extensions.EnumerableExtensions.Shuffle<TSource>(this System.Collections.Generic.IEnumerable<TSource>! source, System.Random! random) -> System.Collections.Generic.IReadOnlyList<TSource>!
 static Funcky.Extensions.EnumerableExtensions.SingleOrNone<TSource>(this System.Collections.Generic.IEnumerable<TSource>! source) -> Funcky.Monads.Option<TSource>
 static Funcky.Extensions.EnumerableExtensions.SingleOrNone<TSource>(this System.Collections.Generic.IEnumerable<TSource>! source, System.Func<TSource, bool>! predicate) -> Funcky.Monads.Option<TSource>
diff --git a/Funcky/PublicAPI.Unshipped.txt b/Funcky/PublicAPI.Unshipped.txt
@@ -70,8 +70,13 @@ static Funcky.Extensions.ListExtensions.LastIndexOfOrNone<TItem>(this System.Col
 static Funcky.Extensions.ListExtensions.LastIndexOfOrNone<TItem>(this System.Collections.Immutable.IImmutableList<TItem>! list, TItem item, int startIndex, int count, System.Collections.Generic.IEqualityComparer<TItem>? equalityComparer) -> Funcky.Monads.Option<int>
 static Funcky.Extensions.ListExtensions.LastIndexOfOrNone<TItem>(this System.Collections.Immutable.IImmutableList<TItem>! list, TItem item, System.Collections.Generic.IEqualityComparer<TItem>? equalityComparer) -> Funcky.Monads.Option<int>
 static Funcky.Extensions.OrderedDictionaryExtensions.IndexOfOrNone<TKey, TValue>(this System.Collections.Generic.OrderedDictionary<TKey, TValue>! dictionary, TKey key) -> Funcky.Monads.Option<int>
+static Funcky.Extensions.ParseExtensions.ParseGuidOrNone(this System.ReadOnlySpan<byte> candidate) -> Funcky.Monads.Option<System.Guid>
+static Funcky.Extensions.ParseExtensions.ParseGuidOrNone(this System.ReadOnlySpan<byte> candidate, System.IFormatProvider? provider) -> Funcky.Monads.Option<System.Guid>
+static Funcky.Extensions.ParseExtensions.ParseIPAddressOrNone(this System.ReadOnlySpan<byte> candidate) -> Funcky.Monads.Option<System.Net.IPAddress!>
 static Funcky.Extensions.ParseExtensions.ParseIPNetworkOrNone(this string? candidate) -> Funcky.Monads.Option<System.Net.IPNetwork>
+static Funcky.Extensions.ParseExtensions.ParseIPNetworkOrNone(this System.ReadOnlySpan<byte> candidate) -> Funcky.Monads.Option<System.Net.IPNetwork>
 static Funcky.Extensions.ParseExtensions.ParseIPNetworkOrNone(this System.ReadOnlySpan<char> candidate) -> Funcky.Monads.Option<System.Net.IPNetwork>
+static Funcky.Extensions.ParseExtensions.ParseVersionOrNone(this System.ReadOnlySpan<byte> candidate) -> Funcky.Monads.Option<System.Version!>
 static Funcky.Functional.Apply<T1, T2, T3, T4, T5, TResult>(System.Func<T1, T2, T3, T4, T5, TResult>! func, Funcky.Unit p1, Funcky.Unit p2, Funcky.Unit p3, Funcky.Unit p4, T5 p5) -> System.Func<T1, T2, T3, T4, TResult>!
 static Funcky.Functional.Apply<T1, T2, T3, T4, T5, TResult>(System.Func<T1, T2, T3, T4, T5, TResult>! func, Funcky.Unit p1, Funcky.Unit p2, Funcky.Unit p3, T4 p4, Funcky.Unit p5) -> System.Func<T1, T2, T3, T5, TResult>!
 static Funcky.Functional.Apply<T1, T2, T3, T4, T5, TResult>(System.Func<T1, T2, T3, T4, T5, TResult>! func, Funcky.Unit p1, Funcky.Unit p2, Funcky.Unit p3, T4 p4, T5 p5) -> System.Func<T1, T2, T3, TResult>!
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,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<TargetFrameworks>net9.0;net8.0;net7.0</TargetFrameworks>`
`4`	`4`	`<LangVersion>preview</LangVersion>`
Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,31 @@`
`1`	`1`	`using FsCheck;`
`2`	`2`	`using FsCheck.Fluent;`
`3`	`3`	`using FsCheck.Xunit;`
	`4`	`+#if !SHUFFLE_EXTENSION`
`4`	`5`	`using Funcky.Test.TestUtils;`
`5`	`6`	`using Xunit.Sdk;`
	`7`	`+#endif`
`6`	`8`
`7`	`9`	`namespace Funcky.Test.Extensions.EnumerableExtensions;`
`8`	`10`
`9`	`11`	`public sealed class ShuffleTest`
`10`	`12`	`{`
	`13`	`+#if !SHUFFLE_EXTENSION`
`11`	`14`	`[Fact]`
`12`	`15`	`public void AShuffleIsEnumeratedEagerly()`
`13`	`16`	`{`
`14`	`17`	`var doNotEnumerate = new FailOnEnumerationSequence<object>();`
`15`	`18`
`16`	`19`	`Assert.Throws<XunitException>(() => doNotEnumerate.Shuffle());`
`17`	`20`	`}`
	`21`	`+#endif`
`18`	`22`
`19`	`23`	`[Fact]`
`20`	`24`	`public void AShuffleWithASpecificRandomDistributionAlwaysReturnsTheSameShuffle()`
`21`	`25`	`{`
`22`	`26`	`var source = Enumerable.Range(0, 16);`
`23`	`27`
`24`		`- Assert.Equal(Sequence.Return(3, 2, 6, 15, 14, 0, 5, 8, 11, 7, 9, 12, 1, 13, 10, 4), source.Shuffle(new System.Random(1337)));`
	`28`	`+ Assert.Equal(Sequence.Return(3, 2, 6, 15, 14, 0, 5, 8, 11, 7, 9, 12, 1, 13, 10, 4), source.Shuffle(new Random(1337)));`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`[Property]`
`@@ -33,6 +37,6 @@ public Property AShuffleHasTheSameElementsAsTheSource(List<int> source)`
`33`	`37`
`34`	`38`	`[Property]`
`35`	`39`	`public Property AShuffleHasTheSameLengthAsTheSource(List<int> source)`
`36`		`- => (source.Shuffle().Count == source.Count)`
	`40`	`+ => (source.Shuffle().Count() == source.Count)`
`37`	`41`	`.ToProperty();`
`38`	`42`	`}`