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" ] 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..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,11 +13,13 @@ + + - - - - + + + + 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..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 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