Merge ed149b4 into a08143a

ariasemis · Jun 20, 2023 · 4d69c9a · 4d69c9a
2 parents a08143a + ed149b4
commit 4d69c9a
Show file tree

Hide file tree

Showing 22 changed files with 607 additions and 351 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "fake-cli": {
-      "version": "5.20.3",
+      "version": "6.0.0",
       "commands": [
         "fake"
       ]
     },
     "paket": {
-      "version": "5.257.0",
+      "version": "7.2.1",
       "commands": [
         "paket"
       ]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,23 +21,15 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: 🧰 Setup .NET Core 2.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '2.1.x'
-    - name: 🧰 Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-    - name: 🧰 Setup .NET 5
-      uses: actions/setup-dotnet@v1
+    - name: 🧰 Setup .NET
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '5.0.x'
+        global-json-file: .\global.json
     - name: 💾 Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with: 
         path: ~/.nuget/packages
         key: ${{ runner.OS }}-nuget-${{ hashFiles('**/paket.lock') }}
@@ -47,15 +39,16 @@ jobs:
     - name: 🔨 Build
       run: .\build.ps1 --target all
     - name: 📦 Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: nupkg
         path: ./src/Monies/bin/Release/*.nupkg
     - name: 📊 Publish coverage report
-      uses: coverallsapp/github-action@master
+      uses: coverallsapp/github-action@v2
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: ./src/Monies.Tests/TestResults/coverage.netcoreapp3.1.info
+        format: lcov
+        file: ./src/Monies.Tests/TestResults/coverage.net6.0.info
 
   deploy:
     needs: build
@@ -70,13 +63,13 @@ jobs:
       NUGET_KEY: ${{ secrets.NUGET_KEY }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: 🧰 Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '5.0.x'
+        global-json-file: .\global.json
     - name: 📦 Download Artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: nupkg
     - name: 🚀 Push to GitHub Feed

diff --git a/build.fsx b/build.fsx
@@ -1,10 +1,21 @@
 #r "paket:
+nuget FSharp.Core 6.0.0.0
 nuget Fake.Core.Target
 nuget Fake.DotNet.Cli
 nuget Fake.DotNet.Testing.Coverlet
 nuget Fake.Tools.GitVersion
 nuget GitVersion.CommandLine storage:packages
-"
+nuget Microsoft.Build 17.3.2
+nuget Microsoft.Build.Framework 17.3.2
+nuget Microsoft.Build.Tasks.Core 17.3.2
+nuget Microsoft.Build.Utilities.Core 17.3.2
+//"
+
+// I'm pinning some dependencies due to these issues with FAKE:
+// * https://github.com/fsprojects/FAKE/issues/2001
+// * https://github.com/fsprojects/FAKE/issues/2719
+// * https://github.com/fsprojects/FAKE/issues/2722
+// I totally need to move away from FAKE, it is causing a lot of headaches...
 
 #load "./.fake/build.fsx/intellisense.fsx"
 
@@ -83,7 +94,7 @@ Target.create "Test" (fun _ ->
         }
         |> Coverlet.withDotNetTestOptions (fun p ->
             { p with
-                OutputFormat = Coverlet.OutputFormat.Lcov
+                OutputFormat = [Coverlet.OutputFormat.Lcov]
                 Output = "TestResults/"
             })