Skip to content

Bump several dependencies at once, see for details the referenced PRs #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 28, 2023
Merged

Bump several dependencies at once, see for details the referenced PRs #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0b16a5
Bump xunit.runner.visualstudio from 2.4.3 to 2.5.0
dependabot[bot] Jul 7, 2023
2c0da94
Bump xunit from 2.4.2 to 2.5.0
dependabot[bot] Jul 7, 2023
1bea4ed
Bump FsUnit.xUnit from 5.1.0 to 5.4.0
dependabot[bot] Jul 11, 2023
631c347
Bump Microsoft.NET.Test.Sdk from 17.6.1 to 17.7.2
dependabot[bot] Aug 29, 2023
b15f6b3
Bump fantomas from 6.0.4 to 6.2.0
dependabot[bot] Aug 29, 2023
41153da
Fix new exception type `MatchException` -> `EqualException.ForMismatc…
abelbraaksma Oct 28, 2023
64ef63f
Bump both the xUnit, xunit.runner and FsUnit.xUnit dependencies to 2.…
abelbraaksma Oct 28, 2023
0fb7f20
Update FSharp.Core to 7.0.401 in SmokeTests only
abelbraaksma Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"fantomas": {
"version": "6.0.4",
"version": "6.2.0",
"commands": [
"fantomas"
]
Expand Down
10 changes: 6 additions & 4 deletions src/FSharp.Control.TaskSeq.SmokeTests/FSharp.Control.TaskSeq.SmokeTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
</ItemGroup>

<ItemGroup>
<!-- our smoketests use the highest RTM (non-alpha) FSharp.Core, contrary to the base test project, which uses the lowest possible denominator -->
<PackageReference Update="FSharp.Core" Version="7.0.401" />
<PackageReference Include="FSharp.Control.TaskSeq" Version="0.4.0-alpha.1" />
<PackageReference Include="FsUnit.xUnit" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="FsUnit.xUnit" Version="5.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions src/FSharp.Control.TaskSeq.Test/FSharp.Control.TaskSeq.Test.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
<!-- we use 6.0.3 here and not 6.0.2 because TaskResult lib requires it-->
<PackageReference Update="FSharp.Core" Version="6.0.3" />
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="3.2.0" />
<PackageReference Include="FsUnit.xUnit" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="FsUnit.xUnit" Version="5.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
16 changes: 12 additions & 4 deletions src/FSharp.Control.TaskSeq.Test/Nunit.Extensions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ module ExtraCustomMatchers =
let private baseResultTypeTest value =
match value with
| null ->
MatchException("Result type", "<null>", "Value <null> or None is never Result.Ok or Result.Error")
EqualException.ForMismatchedValues(
"Result type",
"<null>",
"Value <null> or None is never Result.Ok or Result.Error"
)
|> raise

| _ ->
Expand All @@ -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 =
Expand All @@ -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


Expand Down