From fac46f6f5c07b64d2983fd2e47b8dcc03ecc1b07 Mon Sep 17 00:00:00 2001 From: martincostello Date: Tue, 16 Dec 2025 13:49:58 +0000 Subject: [PATCH 19/32] Embed Untracked Sources Set `EmbedUntrackedSources=true` so that compiler-generated files are included. --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index 837c0560..8d9f9332 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,6 +7,7 @@ true + true Copyright 2008-2024 Kurt Schelfthout and contributors F# fsharp test random From 1ab6b6521df5d8b0fe7b362c3a91497c567b1a53 Mon Sep 17 00:00:00 2001 From: Sven van Heugten Date: Mon, 26 Jan 2026 21:38:58 +0100 Subject: [PATCH 20/32] Fix the "Useful methods" section in the TestData docs (#727) * Fix documentation about functions that have been moved to ArbMap * Remove reference to Arb.shrink function that no longer exists * Re-arrange bullet points in the 'Useful methods' section --- docs/TestData.fsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/TestData.fsx b/docs/TestData.fsx index f19fd591..be7c9423 100644 --- a/docs/TestData.fsx +++ b/docs/TestData.fsx @@ -632,14 +632,13 @@ However, there are some important things to notice that are listed here to avoid - The same thing with the default DoNotSize generators of the number-like types except Decimal. - Most of the default generators of the collection types are just "wrappers" around the F# list. Thus, you can assume that they are generated and shrinked the same way. -## Useful methods on the Arb module +## Useful methods on the Arb and ArbMap module -- `Arb.from<'a>` returns the registered Arbitrary instance for the given type 'a - `Arb.fromGen` makes a new Arbitrary instance from just a given generator - the shrinker return the empty sequence - `Arb.fromGenShrink` make a new Arbitrary instance from a given generator and shrinker. This is equivalent to implementing Arbitrary yourself, but may be shorter. -- `Arb.generate<'a>` returns the generator of the registered Arbitrary instance for the given type 'a -- `Arb.shrink` return the immediate shrinks of the registered Arbitrary instance for the given value - `Arb.convert` given conversion functions to ('a ->'b) and from ('b ->'a), converts an Arbitrary<'a> instance to an Arbitrary<'b> - `Arb.filter` filters the generator and shrinker for a given Arbitrary instance to contain only those values that match with the given filter function - `Arb.mapFilter` maps the generator and filter the shrinkers for a given Arbitrary instance. Mapping the generator is sometimes faster, e.g. for a PositiveInt it is faster to take the absolute value than to filter the negative values. -- `Arb.Default` is a type that contains all the default Arbitrary instances as they are shipped and registerd by FsCheck by default. This is useful when you override a default generator - typically this is because you want to filter certain values from it, and then you need to be able to refer to the default generator in your overriding generator.*) +- `ArbMap.arbitrary<'a> arbMap` returns the Arbitrary instance in `arbMap` for the given type 'a +- `ArbMap.generate<'a> arbMap` returns the generator of the Arbitrary instance in `arbMap` for the given type 'a +- `ArbMap.defaults` is a map that provides access to all the default Arbitrary instances as they are shipped by FsCheck by default. This is useful when you override a default generator - typically this is because you want to filter certain values from it, and then you need to be able to refer to the default generator in your overriding generator.*) From 7220fbe110c4d9b8a93048efbeefc88b6b67268a Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 Jan 2026 22:09:18 +0000 Subject: [PATCH 21/32] Add Gen.pick and Gen.tryPick functions (#730) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: kurtschelfthout <164917+kurtschelfthout@users.noreply.github.com> --- src/FsCheck/FSharp.Gen.fs | 29 +++++++++++++++++++++++++++++ tests/FsCheck.Test/Gen.fs | 14 ++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/src/FsCheck/FSharp.Gen.fs b/src/FsCheck/FSharp.Gen.fs index 3df825c4..d8419ed9 100644 --- a/src/FsCheck/FSharp.Gen.fs +++ b/src/FsCheck/FSharp.Gen.fs @@ -400,6 +400,35 @@ module Gen = [] let filter (predicate:'T->bool) generator = where predicate generator + ///Tries to apply the given chooser function to successive values generated by the given generator, + ///returning the first result where the function returns Some(x). This function 'gives up' by generating None + ///if the given original generator did not generate any values for which the chooser function returned Some(x), + ///after trying to get values by increasing its size. + //[category: Creating generators from generators] + [] + let tryPick (chooser:'T->option<'U>) generator = + let rec tryValue k s = + match (k,s) with + | (_,0) -> constant None + // Resize with 2*k+s to progressively increase size with each retry attempt + | (k,s) -> (resize (2*k+s) generator) |> bind (fun x -> + match chooser x with + | Some v -> constant (Some v) + | None -> tryValue (k+1) (s-1)) + sized (max 1 >> tryValue 0) + + ///Applies the given chooser function to successive values generated by the given generator, + ///returning the first result where the function returns Some(x). Contrary to tryPick, this function + ///keeps re-trying by increasing the size of the original generator ad infinitum. Make sure there is + ///a high probability that the chooser function returns Some for some values. + //[category: Creating generators from generators] + [] + let rec pick (chooser:'T->option<'U>) generator = + tryPick chooser generator |> bind (fun mx -> + match mx with + | Some x -> constant x + | None -> sized (fun n -> resize (n+1) (pick chooser generator))) + let inline private shuffleInPlace (arr: array<_>) = // https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle let inline swap (arr : array<_>) i j = diff --git a/tests/FsCheck.Test/Gen.fs b/tests/FsCheck.Test/Gen.fs index 36670fcd..c3833c57 100644 --- a/tests/FsCheck.Test/Gen.fs +++ b/tests/FsCheck.Test/Gen.fs @@ -241,6 +241,20 @@ module Gen = |> sample1 |> ((=) (abs v)) ) + [] + let TryPick (v:int) (chooser:int -> option) = + let expected = chooser v + assertTrue ( Gen.tryPick chooser (Gen.constant v) + |> sample1 + |> ((=) expected) ) + + [] + let Pick (v:int) = + let chooser x = if x >= 0 then Some (string x) else None + assertTrue ( Gen.pick chooser (Gen.elements [v;abs v]) + |> sample1 + |> ((=) (string (abs v))) ) + [] let ListOf (NonNegativeInt size) (v:char) = assertTrue ( Gen.resize size (Gen.listOf <| Gen.constant v) From c3e0144e4fb09ba73ec998fff72e0e814c08748c Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 Jan 2026 22:11:29 +0000 Subject: [PATCH 22/32] Fix NullReferenceException in takeWhilePlusLast with single-element sequences (#728) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: kurtschelfthout <164917+kurtschelfthout@users.noreply.github.com> --- .../FsCheck.NUnit.Examples/PropertyExamples.fs | 18 +++++++++++++++++- src/FsCheck/Internals.Common.fs | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/examples/FsCheck.NUnit.Examples/PropertyExamples.fs b/examples/FsCheck.NUnit.Examples/PropertyExamples.fs index 34c67014..81219790 100644 --- a/examples/FsCheck.NUnit.Examples/PropertyExamples.fs +++ b/examples/FsCheck.NUnit.Examples/PropertyExamples.fs @@ -4,6 +4,7 @@ open NUnit.Framework open FsCheck open FsCheck.FSharp open FsCheck.NUnit +open FsCheck.Fluent [] type NUnitTest() = @@ -69,4 +70,19 @@ type NUnitTest() = [] member __.NoOutputOnSuccess (x:char) = - List.rev [x] = [x] \ No newline at end of file + List.rev [x] = [x] + + // Regression test for issue: Implies with Replay causes TargetInvocationException/NullReferenceException + // This test verifies that using Implies with Replay doesn't throw a NullReferenceException + // Note: This test will be exhausted because the condition is always false, but that's expected behavior + [] + member __.ImpliesWithReplayFalseCondition_shouldFail() = + // This will result in "Exhausted" because the condition is always false, + // but it should NOT throw a NullReferenceException (which was the bug) + false.Implies(true) + + // Regression test with a passing condition + [] + member __.ImpliesWithReplayTrueCondition() = + // This should pass because the condition is true and the property is true + true.Implies(true) \ No newline at end of file diff --git a/src/FsCheck/Internals.Common.fs b/src/FsCheck/Internals.Common.fs index e9a2be68..78d48e93 100644 --- a/src/FsCheck/Internals.Common.fs +++ b/src/FsCheck/Internals.Common.fs @@ -51,8 +51,8 @@ module internal Common = if en.MoveNext() then // Always yield the current, stop if predicate does not hold yield en.Current - if predicate en.Current then - yield! loop en } + if predicate en.Current then + yield! loop en } // Get enumerator of the sequence and yield all results // (making sure that the enumerator gets disposed) From 2ea24edaa19cc30b83eb709c1c2c47e9726b349f Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 27 Jan 2026 22:23:49 +0000 Subject: [PATCH 23/32] Merge stamps and labels in And/Or property combinators (#729) --- Directory.Packages.props | 1 - src/FsCheck/Testable.fs | 28 ++++++++----- tests/FsCheck.Test/Property.fs | 73 ++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 11 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cba68949..6eeced38 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,6 @@ - diff --git a/src/FsCheck/Testable.fs b/src/FsCheck/Testable.fs index 523a987c..456a6a7c 100644 --- a/src/FsCheck/Testable.fs +++ b/src/FsCheck/Testable.fs @@ -21,23 +21,31 @@ type Result = { Outcome : Outcome Stamp : list Labels : Set - Arguments : list } + Arguments : list } + member private t.MergeLabels(o) = + { t with Labels = Set.union t.Labels o.Labels } + member private t.MergeStamps(o) = + { t with Stamp = List.append t.Stamp o.Stamp } ///Returns a new result that is Passed if and only if both this ///and the given Result are Passed. static member internal ResAnd(l, r) = match (l.Outcome,r.Outcome) with - | (Outcome.Failed _,_) -> l //here a potential Failed in r is thrown away... + // no need to merge stamps when overall outcome is failed - they won't be shown anyway. + // no need to merge labels when overall outcome is not failed (passed, rejected) - they won't be shown anyway. + | (Outcome.Failed _,Outcome.Failed _) -> l.MergeLabels(r) + | (Outcome.Failed _,_) -> l | (_,Outcome.Failed _) -> r - | (_,Outcome.Passed) -> l - | (Outcome.Passed,_) -> r - | (Outcome.Rejected,Outcome.Rejected) -> l //or r, whatever + | (_,Outcome.Rejected) -> r.MergeStamps(l) + | (Outcome.Rejected,_) -> l.MergeStamps(r) + | (Outcome.Passed,Outcome.Passed) -> l.MergeStamps(r) static member internal ResOr(l, r) = match (l.Outcome, r.Outcome) with - | (Outcome.Failed _,_) -> r - | (_,Outcome.Failed _) -> l - | (Outcome.Passed,_) -> l - | (_,Outcome.Passed) -> r - | (Outcome.Rejected,Outcome.Rejected) -> l //or r, whatever + | (Outcome.Failed _,Outcome.Failed _) -> l.MergeLabels(r) + | (Outcome.Failed _,_) -> r.MergeStamps(l) + | (_,Outcome.Failed _) -> l.MergeStamps(r) + | (Outcome.Passed,_) -> l.MergeStamps(r) + | (_,Outcome.Passed) -> r.MergeStamps(l) + | (Outcome.Rejected,Outcome.Rejected) -> l.MergeStamps(r) //or r.MergeStamps(l), whatever type ResultContainer = | Value of Result diff --git a/tests/FsCheck.Test/Property.fs b/tests/FsCheck.Test/Property.fs index ed1858f1..dba2468f 100644 --- a/tests/FsCheck.Test/Property.fs +++ b/tests/FsCheck.Test/Property.fs @@ -312,4 +312,77 @@ module Property = failwith "Expected label to be applied" | t -> failwithf "Expected failing test with exception, got %A" t + [] + let ``And should merge stamps from both properties when both pass``() = + let prop1 = true |> Prop.collect "Property 1" + let prop2 = true |> Prop.collect "Property 2" + let resultRunner = GetResultRunner() + let config = Config.Quick.WithRunner(resultRunner).WithMaxTest(1) + Check.One(config, prop1 .&. prop2) + test <@ match resultRunner.Result with + | TestResult.Passed (d, _) -> + let stamps = d.Stamps |> Seq.collect snd |> Set.ofSeq + stamps.Contains("\"Property 1\"") && stamps.Contains("\"Property 2\"") + | _ -> false @> + + [] + let ``And should merge labels from both failing properties``() = + let prop1 = false |> Prop.label "L1" + let prop2 = false |> Prop.label "L2" + let resultRunner = GetResultRunner() + let config = Config.Quick.WithRunner(resultRunner).WithMaxTest(1) + Check.One(config, prop1 .&. prop2) + test <@ match resultRunner.Result with + | TestResult.Failed (d, _, _, _, _, _, _) -> + d.Labels.Contains("L1") && d.Labels.Contains("L2") + | _ -> false @> + + [] + let ``And should keep label from the failing property``() = + let prop1 = false |> Prop.label "L1" + let prop2 = true |> Prop.label "L2" + let resultRunner = GetResultRunner() + let config = Config.Quick.WithRunner(resultRunner).WithMaxTest(1) + Check.One(config, prop1 .&. prop2) + test <@ match resultRunner.Result with + | TestResult.Failed (d, _, _, _, _, _, _) -> + d.Labels.Contains("L1") && not(d.Labels.Contains("L2")) + | _ -> false @> + [] + let ``Or should merge stamps from both properties when both pass``() = + let prop1 = true |> Prop.collect "Property 1" + let prop2 = true |> Prop.collect "Property 2" + let resultRunner = GetResultRunner() + let config = Config.Quick.WithRunner(resultRunner).WithMaxTest(1) + Check.One(config, prop1 .|. prop2) + test <@ match resultRunner.Result with + | TestResult.Passed (d, _) -> + let stamps = d.Stamps |> Seq.collect snd |> Set.ofSeq + stamps.Contains("\"Property 1\"") && stamps.Contains("\"Property 2\"") + | _ -> false @> + + [] + let ``Or should merge stamps from both properties when one passes``() = + let prop1 = true |> Prop.collect "Property 1" + let prop2 = false |> Prop.collect "Property 2" + let resultRunner = GetResultRunner() + let config = Config.Quick.WithRunner(resultRunner).WithMaxTest(1) + Check.One(config, prop1 .|. prop2) + test <@ match resultRunner.Result with + | TestResult.Passed (d, _) -> + let stamps = d.Stamps |> Seq.collect snd |> Set.ofSeq + stamps.Contains("\"Property 1\"") && stamps.Contains("\"Property 2\"") + | _ -> false @> + + [] + let ``Or should merge labels from both failing properties when both fail``() = + let prop1 = false |> Prop.label "L1" + let prop2 = false |> Prop.label "L2" + let resultRunner = GetResultRunner() + let config = Config.Quick.WithRunner(resultRunner).WithMaxTest(1) + Check.One(config, prop1 .|. prop2) + test <@ match resultRunner.Result with + | TestResult.Failed (d, _, _, _, _, _, _) -> + d.Labels.Contains("L1") && d.Labels.Contains("L2") + | _ -> false @> From 2aad30f7c33cc8effef4646c3c52434719fc477d Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sun, 26 Apr 2026 13:55:17 +0100 Subject: [PATCH 24/32] Update xunit runner. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 6eeced38..10f524b7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -38,6 +38,6 @@ - + \ No newline at end of file From 50b1d62e46772fb9e860033148276ca6b544e646 Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sun, 26 Apr 2026 13:55:27 +0100 Subject: [PATCH 25/32] Tidy. --- .../FsCheck.XUnit.CSharpExamples/ReverseFixture.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/FsCheck.XUnit.CSharpExamples/ReverseFixture.cs b/examples/FsCheck.XUnit.CSharpExamples/ReverseFixture.cs index b696482c..9458ac1e 100644 --- a/examples/FsCheck.XUnit.CSharpExamples/ReverseFixture.cs +++ b/examples/FsCheck.XUnit.CSharpExamples/ReverseFixture.cs @@ -8,26 +8,26 @@ namespace FsCheck.XUnit.CSharpExamples public class ReverseFixture { [Property(QuietOnSuccess = true, EndSize = 10000)] - public Task Task_shouldFail(int i) + public Task ShouldFail_Task(int i) { - return System.Threading.Tasks.Task.FromResult(i < 2000); + return Task.FromResult(i < 2000); } [Property(QuietOnSuccess = true, EndSize = 1000)] - public async Task TaskDelay_shouldFail(int i) + public async Task ShouldFail_TaskDelay(int i) { - await System.Threading.Tasks.Task.Delay(TimeSpan.FromSeconds(4)).ConfigureAwait(false); + await Task.Delay(TimeSpan.FromSeconds(2)).ConfigureAwait(false); return false; } [Property(QuietOnSuccess = true)] - public bool Bcl(int[] xs) + public bool ShouldPass_Bool(int[] xs) { return xs.Reverse().Reverse().SequenceEqual(xs); } [Property(QuietOnSuccess = true)] - public void Bcl2(int[] xs) + public void ShouldPass_Void(int[] xs) { if(true == xs.Reverse().Reverse().SequenceEqual(xs)) { From de611a9e566551c6f81c86d38f937b563a916ea8 Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sun, 26 Apr 2026 14:02:18 +0100 Subject: [PATCH 26/32] Bump version to 3.3.3. --- FsCheck Release Notes.md | 8 ++++++++ src/FsCheck.NUnit/AssemblyInfo.fs | 8 ++++---- src/FsCheck.Xunit.v3/AssemblyInfo.fs | 8 ++++---- src/FsCheck.Xunit/AssemblyInfo.fs | 8 ++++---- src/FsCheck/AssemblyInfo.fs | 8 ++++---- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/FsCheck Release Notes.md b/FsCheck Release Notes.md index fb4108fa..cc9dd972 100644 --- a/FsCheck Release Notes.md +++ b/FsCheck Release Notes.md @@ -1,3 +1,11 @@ +## 3.3.3 - 26 April 2026 + +* Add Gen.pick and Gen.tryPick functions. + +* Fill NullReferenceException when using Replay with an Implies combinator. + +* Improve behavior of stamps and labels when using And/Or property combinators. + ### 3.3.2 - 9 November 2025 * Fixed FsCheck.NUnit failure reporting. (by Brian Rourke Boll) diff --git a/src/FsCheck.NUnit/AssemblyInfo.fs b/src/FsCheck.NUnit/AssemblyInfo.fs index 1f0f0608..a0f67ef9 100644 --- a/src/FsCheck.NUnit/AssemblyInfo.fs +++ b/src/FsCheck.NUnit/AssemblyInfo.fs @@ -7,8 +7,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] [] do () @@ -17,7 +17,7 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FsCheck.NUnit" let [] AssemblyProduct = "FsCheck.NUnit" let [] AssemblyDescription = "Integrates FsCheck with NUnit" - let [] AssemblyVersion = "3.3.2" - let [] AssemblyFileVersion = "3.3.2" + let [] AssemblyVersion = "3.3.3" + let [] AssemblyFileVersion = "3.3.3" let [] AssemblyKeyFile = "../../FsCheckKey.snk" diff --git a/src/FsCheck.Xunit.v3/AssemblyInfo.fs b/src/FsCheck.Xunit.v3/AssemblyInfo.fs index 56b013e0..16d8127f 100644 --- a/src/FsCheck.Xunit.v3/AssemblyInfo.fs +++ b/src/FsCheck.Xunit.v3/AssemblyInfo.fs @@ -7,8 +7,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] [] do () @@ -17,7 +17,7 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FsCheck.Xunit.v3" let [] AssemblyProduct = "FsCheck.Xunit.v3" let [] AssemblyDescription = "Integrates FsCheck with xUnit.NET v3" - let [] AssemblyVersion = "3.3.2" - let [] AssemblyFileVersion = "3.3.2" + let [] AssemblyVersion = "3.3.3" + let [] AssemblyFileVersion = "3.3.3" let [] AssemblyKeyFile = "../../FsCheckKey.snk" diff --git a/src/FsCheck.Xunit/AssemblyInfo.fs b/src/FsCheck.Xunit/AssemblyInfo.fs index 91fdf064..621012bd 100644 --- a/src/FsCheck.Xunit/AssemblyInfo.fs +++ b/src/FsCheck.Xunit/AssemblyInfo.fs @@ -7,8 +7,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] [] [] do () @@ -17,7 +17,7 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FsCheck.Xunit" let [] AssemblyProduct = "FsCheck.Xunit" let [] AssemblyDescription = "Integrates FsCheck with xUnit.NET v2" - let [] AssemblyVersion = "3.3.2" - let [] AssemblyFileVersion = "3.3.2" + let [] AssemblyVersion = "3.3.3" + let [] AssemblyFileVersion = "3.3.3" let [] AssemblyKeyFile = "../../FsCheckKey.snk" let [] InternalsVisibleTo = "FsCheck.Test" diff --git a/src/FsCheck/AssemblyInfo.fs b/src/FsCheck/AssemblyInfo.fs index aaf741ab..2d9f6897 100644 --- a/src/FsCheck/AssemblyInfo.fs +++ b/src/FsCheck/AssemblyInfo.fs @@ -7,8 +7,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] [] [] do () @@ -17,7 +17,7 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FsCheck" let [] AssemblyProduct = "FsCheck" let [] AssemblyDescription = "FsCheck is a tool for testing .NET programs automatically using randomly generated test cases." - let [] AssemblyVersion = "3.3.2" - let [] AssemblyFileVersion = "3.3.2" + let [] AssemblyVersion = "3.3.3" + let [] AssemblyFileVersion = "3.3.3" let [] AssemblyKeyFile = "../../FsCheckKey.snk" let [] InternalsVisibleTo = "FsCheck.Test" From ec83a8d2361d3fffe874f1e504e9b08344f14b26 Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sun, 26 Apr 2026 14:05:43 +0100 Subject: [PATCH 27/32] Bump version to 3.3.3 From c2363acfd5a283ba5366338036e94b1eb186c0ee Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sun, 26 Apr 2026 14:20:30 +0100 Subject: [PATCH 28/32] Clone repo via https. --- build.fsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.fsx b/build.fsx index 0f38641a..9845a48c 100644 --- a/build.fsx +++ b/build.fsx @@ -411,7 +411,7 @@ let releaseDocs (_ : HaveGeneratedDocs) = let tempDocsDir = "temp/gh-pages" cleanDirectories [tempDocsDir] let tempDocsDir = Directory.CreateDirectory tempDocsDir - runProcess "git" ["clone" ; "git@github.com:fscheck/FsCheck.git" ; "--single-branch" ; "--branch" ; "gh-pages" ; tempDocsDir.FullName] + runProcess "git" ["clone" ; "https://github.com/fscheck/FsCheck.git" ; "--single-branch" ; "--branch" ; "gh-pages" ; tempDocsDir.FullName] copyDir (DirectoryInfo "output") tempDocsDir true From b04f3b0f662bdd58da8ea606e18c08970c9fdcfc Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sun, 26 Apr 2026 15:35:43 +0100 Subject: [PATCH 29/32] Delete outdated docs/_template.html, it messed up the docs site --- docs/_template.html | 99 --------------------------------------------- 1 file changed, 99 deletions(-) delete mode 100644 docs/_template.html diff --git a/docs/_template.html b/docs/_template.html deleted file mode 100644 index f2b074c2..00000000 --- a/docs/_template.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - {{fsdocs-page-title}} - - - - - - - - - - - - - - - - - - - - - - - - - - -

- -

- {{fsdocs-content}} - {{fsdocs-tooltips}} -

- - - - - - - - -

- - - - From 08d6d5c3711383d7ad8bd603cbddc52a0b7fbb1d Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sat, 25 Jul 2026 23:35:37 +0100 Subject: [PATCH 30/32] C# record generation: fix bug manifesting as cast exception, if a positional record's properties do not appear in the same order as in the ctor. Happens (only?) with inheritance. Fixes #735 --- src/FsCheck/Internals.Reflect.fs | 48 +++++++++++++++++----------- tests/FsCheck.Test.CSharp/Records.cs | 7 ++-- tests/FsCheck.Test/Arbitrary.fs | 23 +++++++++++-- 3 files changed, 54 insertions(+), 24 deletions(-) diff --git a/src/FsCheck/Internals.Reflect.fs b/src/FsCheck/Internals.Reflect.fs index 31db1321..fcaec806 100644 --- a/src/FsCheck/Internals.Reflect.fs +++ b/src/FsCheck/Internals.Reflect.fs @@ -96,7 +96,6 @@ module internal Reflect = "ImmutableDictionary`2"; "ImmutableSortedDictionary`2" |] - /// Get information on the fields of an F# record type let getRecordFieldTypes (recordType: System.Type) = if isRecordType recordType then @@ -135,29 +134,42 @@ module internal Reflect = f.Invoke let getCSharpRecordFields (recordType: Type) = - if isCSharpRecordType recordType then - getProperties recordType - |> Seq.filter (fun p -> p.CanWrite) - |> Seq.map (fun p -> p.PropertyType) - else + if not <| isCSharpRecordType recordType then failwithf "The input type must be a C# record-like type. Got %A" recordType - let getCSharpRecordConstructor (t:Type) = - let props = getProperties t |> Seq.filter (fun p -> p.CanWrite) |> Seq.toArray + let maybeCtor = getPublicCtors recordType |> Seq.tryHead + let pars = + maybeCtor + |> Option.map (_.GetParameters()) + |> Option.defaultValue [||] + + getProperties recordType + |> Seq.filter (fun p -> p.CanWrite) + |> Seq.sortBy (fun p -> pars |> Array.tryFindIndex (fun param -> param.Name = p.Name) |> Option.defaultValue Int32.MaxValue) + |> Seq.map (fun p -> p.PropertyType) + + + let getCSharpRecordConstructor (recordType:Type) = + let maybeCtor = getPublicCtors recordType |> Seq.tryHead + let ctorPars = + maybeCtor + |> Option.map (_.GetParameters()) + |> Option.defaultValue [||] + + let props = getProperties recordType + |> Seq.filter (fun p -> p.CanWrite) + |> Seq.sortBy (fun p -> ctorPars |> Array.tryFindIndex (fun param -> param.Name = p.Name) |> Option.defaultValue Int32.MaxValue) + |> Seq.toArray let par = Expression.Parameter (typeof, "args") - - let maybeCtor = getPublicCtors t |> Seq.tryHead - let pars = - maybeCtor - |> Option.map (_.GetParameters() >> Array.mapi (fun i p -> + ctorPars + |> Array.mapi (fun i p -> Expression.Convert - (Expression.ArrayIndex (par, Expression.Constant i), p.ParameterType) : Expression)) - |> Option.defaultValue [||] + (Expression.ArrayIndex (par, Expression.Constant i), p.ParameterType) : Expression) let values = - props + props |> Seq.mapi (fun i p -> let idx = Expression.ArrayIndex (par, Expression.Constant i) Expression.Convert (idx, p.PropertyType) :> Expression) @@ -169,10 +181,10 @@ module internal Reflect = let newExpr = maybeCtor |> Option.map (fun ctor -> Expression.New (ctor, pars)) - |> Option.defaultWith (fun () -> Expression.New t) + |> Option.defaultWith (fun () -> Expression.New recordType) let body = - if t.IsValueType then + if recordType.IsValueType then Expression.Convert (Expression.MemberInit (newExpr, bindings), typeof) : Expression else Expression.MemberInit (newExpr, bindings) diff --git a/tests/FsCheck.Test.CSharp/Records.cs b/tests/FsCheck.Test.CSharp/Records.cs index d4119f1e..3d329705 100644 --- a/tests/FsCheck.Test.CSharp/Records.cs +++ b/tests/FsCheck.Test.CSharp/Records.cs @@ -17,9 +17,6 @@ public record Person public record PersonWithHeight : Person { public int HeightInInches { get; init; } - - public PersonWithHeight Grow(int inches) => - this with { HeightInInches = HeightInInches + inches }; } public record CtorAndProps(int A) @@ -27,6 +24,10 @@ public record CtorAndProps(int A) public int B { get; init; } } + public abstract record AbstractPositionalRecord(string S); + + public record PositionalSubRecord(string S, int I) : AbstractPositionalRecord(S); + public readonly record struct ReadOnlyStructPositionalRecord(byte Red, byte Green, byte Blue); public readonly record struct ReadOnlyStructInitOnlyRecord diff --git a/tests/FsCheck.Test/Arbitrary.fs b/tests/FsCheck.Test/Arbitrary.fs index 2ff8daed..18df0c24 100644 --- a/tests/FsCheck.Test/Arbitrary.fs +++ b/tests/FsCheck.Test/Arbitrary.fs @@ -749,9 +749,12 @@ module Arbitrary = [] let ``should derive generator for csharp record types``() = - generate |> sample 10 |> ignore - generate |> sample 10 |> ignore - generate |> sample 10 |> ignore + let s = generate |> sample 10 + test <@ s |> Seq.forall (fun rgb -> let b = rgb.Blue in true) @> + let s = generate |> sample 10 + test <@ s |> Seq.forall (fun r -> let b = r.C in true) @> + let s = generate |> sample 10 + test <@ s |> Seq.forall (fun r -> let b = r.Ex1 in true) @> let persons = generate |> sample 10 test <@ persons |> Seq.exists(fun p -> not (System.String.IsNullOrEmpty(p.FirstName))) @> @@ -763,6 +766,12 @@ module Arbitrary = let mixed = generate |> sample 10 test <@ mixed |> Seq.exists(fun p -> p.B <> 0) @> + [] + let ``should derive generator for csharp positional record subtype``() = + let sample = generate |> sample 10 + test <@ sample |> Seq.forall(fun p -> let s = (p :> CSharp.AbstractPositionalRecord).S in true) @> + + [] let ``should derive generator for csharp struct record types`` () = generate |> sample 10 |> ignore @@ -794,6 +803,14 @@ module Arbitrary = shrunkv <> value && (abs shrunkv.A <= abs value.A || abs shrunkv.B <= abs value.B)) + [] + let ``Derived generator for c# record types shrinks - PositionalSubRecord`` (value: CSharp.PositionalSubRecord) = + let shrunk = shrink value + shrunk + |> Seq.forall (fun shrunkv -> + shrunkv <> value + && (shrunkv.S <= value.S || abs shrunkv.I <= abs value.I)) + [] let ``should derive generator for Immutable collections``() = From 32e5701143e5cc90ee670b866c9b0cd8abf654bd Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sat, 25 Jul 2026 23:43:56 +0100 Subject: [PATCH 31/32] Docs: removed the note about 3.x being in pre-release. --- docs/index.fsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.fsx b/docs/index.fsx index 888a6a75..87b9dc9a 100644 --- a/docs/index.fsx +++ b/docs/index.fsx @@ -15,7 +15,7 @@ you can [find on NuGet](https://www.nuget.org/packages?q=fscheck). Warning: Documentation ---------------------- -The Documentation section below was written for version 2.x, but 3.x is the version that is currently maintained. Only v3 will get new features and fixes, even though it's in pre-release. +The Documentation section below was written for version 2.x, but 3.x is the version that is currently maintained. Only v3 will get new features and fixes. This leaves us in the unfortunate position that some documentation is out of date and incomplete. One exception is the API docs. They are generated from the 3.x code and are accurate - if in doubt, believe the API docs. From 7c583d6df4939643fd36f0439694be1456833aff Mon Sep 17 00:00:00 2001 From: Kurt Schelfthout Date: Sat, 25 Jul 2026 23:49:59 +0100 Subject: [PATCH 32/32] Bump version to 3.3.4 --- FsCheck Release Notes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/FsCheck Release Notes.md b/FsCheck Release Notes.md index cc9dd972..7cb2737d 100644 --- a/FsCheck Release Notes.md +++ b/FsCheck Release Notes.md @@ -1,3 +1,7 @@ +## 3.3.4 - 25 July 2026 + +* Fixed a bug in C# record type generation. + ## 3.3.3 - 26 April 2026 * Add Gen.pick and Gen.tryPick functions.

{{fsdocs-collection-name}}

{{fsdocs-collection-name}}

{{fsdocs-collection-name}}