Updating SDKs including fantomas

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.2.2",
+      "version": "5.2.4",
       "commands": [
         "reportgenerator"
       ]

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.202'
+        dotnet-version: '8.0.204'
     - 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.202'
+        dotnet-version: '8.0.204'
     - name: Tools
       run: dotnet tool restore
     - name: Setup

AltCover.Engine/Json.fs

@@ -327,9 +327,10 @@ module internal Json =
         ))
 
       let tracked =
-        System.Collections.Generic.Dictionary<string, int *
-        NativeJson.Times *
-        NativeJson.Times>()
+        System.Collections.Generic.Dictionary<
+          string,
+          int * NativeJson.Times * NativeJson.Times
+         >()
 
       x.Descendants(XName.Get "TrackedMethod")
       |> Seq.iter (fun x ->

AltCover.Engine/Tasks.fs

@@ -543,17 +543,17 @@ type RetryDelete() =
   [<SuppressMessage("Gendarme.Rules.Performance",
                     "AvoidUnusedParametersRule",
                     Justification = "Replace the raw exception dump")>]
-  member internal self.Write0 (o: string->unit) (f:string) (_:string) : unit =
-    CommandLine.Format.Local("FailedToDelete", f)
-    |> o
+  member internal self.Write0 (o: string -> unit) (f: string) (_: string) : unit =
+    CommandLine.Format.Local("FailedToDelete", f) |> o
 
-  member internal self.Write (f:string) (dummy:string) : unit =
+  member internal self.Write (f: string) (dummy: string) : unit =
     self.Write0 (``base``.Log.LogWarning) f dummy
 
   override self.Execute() =
     if self.Files.IsNotNull then
       self.Files
       |> Seq.filter File.Exists
-      |> Seq.iter (fun f -> (CommandLine.I.doRetry File.Delete (self.Write f) 100 100 0 f))
+      |> Seq.iter (fun f ->
+        (CommandLine.I.doRetry File.Delete (self.Write f) 100 100 0 f))
 
     true

AltCover.Recorder.Tests/Adapter.fs

@@ -155,10 +155,8 @@ module Adapter =
       Definitive = false }
 
   let internal invokeIssue71Wrapper<'T when 'T :> System.Exception>
-    (
-      (unique: string),
-      (called: bool array)
-    ) =
+    ((unique: string), (called: bool array))
+    =
     let constructor =
       typeof<'T>
         .GetConstructor([| typeof<System.String> |])

AltCover.Tests/Tests.fs

@@ -302,15 +302,17 @@ module AltCoverTests =
     let path =
       Path.Combine(SolutionDir(), "packages")
 
-    let exclude =
-      Path.Combine(path, "altcover")
+    let exclude = Path.Combine(path, "altcover")
 
     // Looking for the Mono.Options symbols
     let files =
       Directory.GetFiles(path, "*.pdb", SearchOption.AllDirectories)
 
     files
-    |> Seq.filter (_.StartsWith(exclude, StringComparison.OrdinalIgnoreCase) >> not)
+    |> Seq.filter (
+      _.StartsWith(exclude, StringComparison.OrdinalIgnoreCase)
+      >> not
+    )
     |> Seq.filter (fun p -> Path.ChangeExtension(p, ".dll") |> File.Exists)
     |> Seq.iter (fun p ->
       let dll = Path.ChangeExtension(p, ".dll")
@@ -326,8 +328,8 @@ module AltCoverTests =
 
         match pdb with
         | Some name -> Assert.That(name, Is.EqualTo normalized)
-        //| _ ->
-        //  raise <| InvalidOperationException((sprintf "%A for %A" dll normalized))
+      //| _ ->
+      //  raise <| InvalidOperationException((sprintf "%A for %A" dll normalized))
       with :? BadImageFormatException ->
         ())
 
@@ -340,15 +342,17 @@ module AltCoverTests =
       let path =
         Path.Combine(SolutionDir(), "packages")
 
-      let exclude =
-        Path.Combine(path, "altcover")
+      let exclude = Path.Combine(path, "altcover")
 
       // Looking for the Mono.Options symbols
       let files =
         Directory.GetFiles(path, "*.pdb", SearchOption.AllDirectories)
 
       files
-      |> Seq.filter (_.StartsWith(exclude, StringComparison.OrdinalIgnoreCase) >> not)
+      |> Seq.filter (
+        _.StartsWith(exclude, StringComparison.OrdinalIgnoreCase)
+        >> not
+      )
       |> Seq.filter (fun p -> Path.ChangeExtension(p, ".dll") |> File.Exists)
       |> Seq.iter (fun p ->
         let dll0 = Path.ChangeExtension(p, ".dll")
@@ -383,8 +387,8 @@ module AltCoverTests =
             Assert.That(name, Is.EqualTo normalized)
             AltCover.ProgramDatabase.readSymbols def
             Assert.That(def.MainModule.HasSymbols, def.MainModule.FileName)
-          //| _ ->
-          //  raise <| InvalidOperationException((sprintf "%A for %A" dll normalized))
+        //| _ ->
+        //  raise <| InvalidOperationException((sprintf "%A for %A" dll normalized))
         with :? BadImageFormatException ->
           ())
     finally

AltCover.Tests/Tests3.fs

@@ -4905,7 +4905,15 @@ module AltCoverTests3 =
         .GetMethod("Write0", BindingFlags.NonPublic ||| BindingFlags.Instance)
 
     let mutable written = "written"
-    write0.Invoke(subject, [| (fun x -> written <- x); "xx"; "yy" |]) |> ignore
+
+    write0.Invoke(
+      subject,
+      [| (fun x -> written <- x)
+         "xx"
+         "yy" |]
+    )
+    |> ignore
+
     test <@ written = "Failed to delete file xx" @>
 
     let write =

Directory.Packages.props

@@ -21,7 +21,7 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <PackageVersion Include="CsvTextFieldParser" Version="1.2.2" />
     <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
-    <PackageVersion Include="Expecto" Version="10.1.0" />
+    <PackageVersion Include="Expecto" Version="10.2.1" />
     <PackageVersion Include="Expecto.TestResults" Version="8.13.2" />
     <PackageVersion Include="FAKE.Core.Environment" Version="6.0.0" />
     <PackageVersion Include="FAKE.Core.Process" Version="6.0.0" />

Samples/Sample7/Library.fs

@@ -52,9 +52,9 @@ module Problematic =
 
     for row = 0 to g.Height do
       for col = 0 to g.Width do
-        Assert.AreEqual(
+        Assert.That(
           System.Drawing.Rectangle(col, row, col, row),
-          g.Rectangle(col, row)
+          Is.EqualTo(g.Rectangle(col, row))
         )
 
   [<Test>]
@@ -64,9 +64,9 @@ module Problematic =
 
       for row = 0 to g.Height do
         for col = 0 to g.Width do
-          Assert.AreEqual(
+          Assert.That(
             System.Drawing.Rectangle(col, row, col, row),
-            g.Rectangle(col, row)
+            Is.EqualTo(g.Rectangle(col, row))
           )
     finally
       System.Console.WriteLine("Finally")

Samples/Sample7/Sample7.fsproj

@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsUnit" VersionOverride="5.6.0" />
-    <PackageReference Include="NUnit" VersionOverride="3.14.0" />
+    <PackageReference Include="FsUnit" />
+    <PackageReference Include="NUnit" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit3TestAdapter">
       <PrivateAssets>all</PrivateAssets>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.202",
+    "version": "8.0.204",
     "rollForward": "latestMinor"
   }
 }