Merge branch 'develop/maintenance' into release/v2

SteveGilham · Jan 21, 2024 · 698604d · 698604d
2 parents f041c1f + a971e3d
commit 698604d
Show file tree

Hide file tree

Showing 19 changed files with 819 additions and 755 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,16 +3,22 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.1.12",
+      "version": "5.2.0",
       "commands": [
         "reportgenerator"
       ]
     },
     "dotnet-fsharplint": {
-      "version": "0.21.3",
+      "version": "0.23.6",
       "commands": [
         "dotnet-fsharplint"
       ]
+    },
+    "coveralls.net": {
+      "version": "4.0.1",
+      "commands": [
+        "csmacnz.Coveralls"
+      ]
     }
   }
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,32 +14,32 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 2
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.100'
+        dotnet-version: '8.0.100'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
       run: dotnet run --project ./Build/Setup.fsproj
     - name: Build
       env:
-#        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         NUGET_API_TOKEN: ${{ secrets.NUGET_API_TOKEN }}
       run: dotnet run --project ./Build/Build.fsproj
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
           name: nupkgs
           path: _Packagin*/*.nupkg
   linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.100'
+        dotnet-version: '7.0.400'
     - name: Tools
       run: dotnet tool restore
     - name: Setup

diff --git a/Build/build.fs b/Build/build.fs
@@ -26,4 +26,4 @@ module Build =
     Targets.initTargets ()
     Target.runOrDefault <| Targets.defaultTarget ()
 
-    0 // return an integer exit code
+    0
diff --git a/Build/setup.fs b/Build/setup.fs
@@ -18,6 +18,13 @@ module Setup =
     "dotnet"
     |> Fake.Core.ProcessUtils.tryFindFileOnPath
 
+  let cliArguments =
+    { MSBuild.CliArguments.Create() with
+        ConsoleLogParameters = []
+        DistributedLoggers = None
+        Properties = []
+        DisableInternalBinLog = true }
+
   let dotnetOptions (o: DotNet.Options) =
     match dotnetPath with
     | Some f -> { o with DotNetCliPath = f }
@@ -27,5 +34,6 @@ module Setup =
     (fun o ->
       { o with
           Packages = [ "./packages" ]
+          MSBuildParams = cliArguments
           Common = dotnetOptions o.Common })
     "./Build/NuGet.csproj"