From b0b16a5288c55d965689910b7d1ca23a1bf4d62c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:58:35 +0000 Subject: [PATCH 1/8] Bump xunit.runner.visualstudio from 2.4.3 to 2.5.0 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.3 to 2.5.0. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/v2.4.3...2.5.0) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../FSharp.Control.TaskSeq.SmokeTests.fsproj | 2 +- .../FSharp.Control.TaskSeq.Test.fsproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj index 75cc9dd0..226634ae 100644 --- a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj +++ b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj @@ -17,7 +17,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj index 1a3f1a51..a62b0311 100644 --- a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj +++ b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj @@ -59,7 +59,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 2c0da94f36a768d5edf6d18d6a86667d3d1d5c5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:58:30 +0000 Subject: [PATCH 2/8] Bump xunit from 2.4.2 to 2.5.0 Bumps [xunit](https://github.com/xunit/xunit) from 2.4.2 to 2.5.0. - [Commits](https://github.com/xunit/xunit/compare/2.4.2...2.5.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../FSharp.Control.TaskSeq.SmokeTests.fsproj | 2 +- .../FSharp.Control.TaskSeq.Test.fsproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj index 226634ae..abd8396d 100644 --- a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj +++ b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj @@ -16,7 +16,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj index a62b0311..f247578f 100644 --- a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj +++ b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj @@ -58,7 +58,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 1bea4eda3b0df8d1363333ede34a1aaad0d437a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 14:35:18 +0000 Subject: [PATCH 3/8] Bump FsUnit.xUnit from 5.1.0 to 5.4.0 Bumps [FsUnit.xUnit](https://github.com/fsprojects/FsUnit) from 5.1.0 to 5.4.0. - [Release notes](https://github.com/fsprojects/FsUnit/releases) - [Changelog](https://github.com/fsprojects/FsUnit/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/fsprojects/FsUnit/compare/5.1.0...5.4.0) --- updated-dependencies: - dependency-name: FsUnit.xUnit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../FSharp.Control.TaskSeq.SmokeTests.fsproj | 2 +- .../FSharp.Control.TaskSeq.Test.fsproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj index abd8396d..e65f8d20 100644 --- a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj +++ b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj @@ -14,7 +14,7 @@ - + diff --git a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj index f247578f..8f6f4ecf 100644 --- a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj +++ b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj @@ -56,7 +56,7 @@ - + From 631c34786e64c71142c25b0caae637c711c6977b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 14:06:44 +0000 Subject: [PATCH 4/8] Bump Microsoft.NET.Test.Sdk from 17.6.1 to 17.7.2 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.6.1 to 17.7.2. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.6.1...v17.7.2) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../FSharp.Control.TaskSeq.SmokeTests.fsproj | 2 +- .../FSharp.Control.TaskSeq.Test.fsproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj index e65f8d20..6bd4e2e7 100644 --- a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj +++ b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj @@ -15,7 +15,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj index 8f6f4ecf..d867513c 100644 --- a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj +++ b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj @@ -57,7 +57,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive From b15f6b3b7f380a48b9b8c3e649e5df3b0677622b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 14:06:39 +0000 Subject: [PATCH 5/8] Bump fantomas from 6.0.4 to 6.2.0 Bumps [fantomas](https://github.com/fsprojects/fantomas) from 6.0.4 to 6.2.0. - [Release notes](https://github.com/fsprojects/fantomas/releases) - [Changelog](https://github.com/fsprojects/fantomas/blob/main/CHANGELOG.md) - [Commits](https://github.com/fsprojects/fantomas/compare/v6.0.4...v6.2.0) --- updated-dependencies: - dependency-name: fantomas dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2823c12c..9e89cf8b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "fantomas": { - "version": "6.0.4", + "version": "6.2.0", "commands": [ "fantomas" ] From 41153da1caef742ff83d486fe9579c12b6bdd436 Mon Sep 17 00:00:00 2001 From: Abel Braaksma Date: Sat, 28 Oct 2023 17:20:19 +0200 Subject: [PATCH 6/8] Fix new exception type `MatchException` -> `EqualException.ForMismatchedValues`, thanks XUnit for making incompatible changes without first deprecating types See https://github.com/fsprojects/FsUnit/pull/240 for the FsUnit change (2nd commit) and https://github.com/fsprojects/FsUnit/issues/251, and https://xunit.net/releases/v2/2.5.0 --- .../Nunit.Extensions.fs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/FSharp.Control.TaskSeq.Test/Nunit.Extensions.fs b/src/FSharp.Control.TaskSeq.Test/Nunit.Extensions.fs index c32a1cfd..5fc1ccf4 100644 --- a/src/FSharp.Control.TaskSeq.Test/Nunit.Extensions.fs +++ b/src/FSharp.Control.TaskSeq.Test/Nunit.Extensions.fs @@ -22,7 +22,11 @@ module ExtraCustomMatchers = let private baseResultTypeTest value = match value with | null -> - MatchException("Result type", "", "Value or None is never Result.Ok or Result.Error") + EqualException.ForMismatchedValues( + "Result type", + "", + "Value or None is never Result.Ok or Result.Error" + ) |> raise | _ -> @@ -31,7 +35,7 @@ module ExtraCustomMatchers = if ty.FullName.StartsWith "Microsoft.FSharp.Core.FSharpResult" then FSharpValue.GetUnionFields(value, ty) |> fst else - MatchException("Result type", ty.Name, "Type must be Result<_, _>") + EqualException.ForMismatchedValues("Result type", ty.Name, "Type must be Result<_, _>") |> raise let private baseOptionTypeTest value = @@ -49,9 +53,13 @@ module ExtraCustomMatchers = | "None" -> None | _ -> raise - <| MatchException("Option type", ty.Name, "Unexpected field name for F# option type") + <| EqualException.ForMismatchedValues( + "Option type", + ty.Name, + "Unexpected field name for F# option type" + ) else - MatchException("Option type", ty.Name, "Type must be Option<_>") + EqualException.ForMismatchedValues("Option type", ty.Name, "Type must be Option<_>") |> raise From 64ef63fdd6c64d696305dc22127da447b25236f9 Mon Sep 17 00:00:00 2001 From: Abel Braaksma Date: Sat, 28 Oct 2023 17:28:39 +0200 Subject: [PATCH 7/8] Bump both the xUnit, xunit.runner and FsUnit.xUnit dependencies to 2.5.3, 2.5.3 and 5.5.0 respectively --- .../FSharp.Control.TaskSeq.SmokeTests.fsproj | 6 +++--- .../FSharp.Control.TaskSeq.Test.fsproj | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj index 6bd4e2e7..dd35e812 100644 --- a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj +++ b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj @@ -14,10 +14,10 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj index d867513c..b6d84d11 100644 --- a/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj +++ b/src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj @@ -56,10 +56,10 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all From 0fb7f20751ee449bab14302041bea4154c1db22b Mon Sep 17 00:00:00 2001 From: Abel Braaksma Date: Sat, 28 Oct 2023 17:34:23 +0200 Subject: [PATCH 8/8] Update FSharp.Core to 7.0.401 in SmokeTests only --- .../FSharp.Control.TaskSeq.SmokeTests.fsproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj index dd35e812..75c962ec 100644 --- a/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj +++ b/src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj @@ -13,6 +13,8 @@ + +