Merge branch 'release/Habu' into develop/github/consume-latest-nuget

# Conflicts: # Directory.Packages.props
SteveGilham · Mar 14, 2024 · 42fbe65 · 42fbe65
2 parents 2cbd3dc + c273b0a
commit 42fbe65
Show file tree

Hide file tree

Showing 41 changed files with 590 additions and 497 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.2.0",
+      "version": "5.2.2",
       "commands": [
         "reportgenerator"
       ]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -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
@@ -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

diff --git a/AltCover.Api.Tests/FSApiTests.fs b/AltCover.Api.Tests/FSApiTests.fs
@@ -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()
@@ -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" ] @>