Skip to content

Commit

Permalink
Merge branch 'develop/github/maintenance' into release/Habu
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveGilham committed Mar 14, 2024
2 parents 3ba64d6 + 3666624 commit c273b0a
Show file tree
Hide file tree
Showing 41 changed files with 588 additions and 495 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-reportgenerator-globaltool": {
"version": "5.2.0",
"version": "5.2.2",
"commands": [
"reportgenerator"
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.100'
dotnet-version: '8.0.202'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.100'
dotnet-version: '8.0.202'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand Down
14 changes: 12 additions & 2 deletions AltCover.Api.Tests/FSApiTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1183,9 +1183,9 @@ module FSApiTests =

// not input and output directories (inplace now allowed)
testWithFallback
<@ (prepareFragments) |> List.length = ((prepareNames |> List.length) - 2) @>
<@ (prepareFragments) |> List.length = ((prepareNames |> List.length) - 1) @>
(prepareFragments |> List.length)
(Is.EqualTo((prepareNames |> List.length) - 2))
(Is.EqualTo((prepareNames |> List.length) - 1))

let collect =
doc.Descendants()
Expand Down Expand Up @@ -1305,6 +1305,16 @@ module FSApiTests =
DotNet.ToTestArguments prep coll combined = "/p:AltCover=\"true\" /p:AltCoverReportFormat=\"OpenCover\" /p:AltCoverShowStatic=\"-\" /p:AltCoverShowSummary=\"R\" /p:AltCoverForce=\"true\" /p:AltCoverFailFast=\"true\""
@>

let tprep = TypeSafe.PrepareOptions.Create()

let prep2 =
AltCover.PrepareOptions.TypeSafe tprep

test
<@
DotNet.ToTestArguments prep2 coll combined = "/p:AltCover=\"true\" /p:AltCoverReportFormat=\"OpenCover\" /p:AltCoverShowStatic=\"-\" /p:AltCoverShowSummary=\"R\" /p:AltCoverForce=\"true\" /p:AltCoverFailFast=\"true\""
@>

let pprep2 = Options.Prepare()
test <@ (pprep2.WhatIf()).Command = [ "--save" ] @>

Expand Down
Loading

0 comments on commit c273b0a

Please sign in to comment.