Merge pull request #25 from jwosty/jwosty/dotnet9

.NET 9

.config/dotnet-tools.json

@@ -3,34 +3,39 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.2.0",
+      "version": "9.0.2",
       "commands": [
         "paket"
-      ]
+      ],
+      "rollForward": false
     },
     "fable": {
-      "version": "4.0.0-theta-018",
+      "version": "4.24.0",
       "commands": [
         "fable"
-      ]
+      ],
+      "rollForward": false
     },
     "fake-cli": {
-      "version": "5.23.1",
+      "version": "6.1.3",
       "commands": [
         "fake"
-      ]
+      ],
+      "rollForward": false
     },
     "fsharp.formatting.commandtool": {
-      "version": "11.4.3",
+      "version": "11.5.1",
       "commands": [
         "fsdocs"
-      ]
+      ],
+      "rollForward": false
     },
     "sourcelink": {
       "version": "3.1.1",
       "commands": [
         "sourcelink"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }

.github/workflows/ci-ubuntu.yml

@@ -16,9 +16,12 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-            dotnet-version: '7.0.305'
+            dotnet-version: '9.0.100'
+      # Need this for Yarn 4.0 (see: https://github.com/actions/setup-node/issues/480#issuecomment-1915448139)
+      - name: Enable Corepack
+        run: corepack enable
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
       - name: Restore dependencies
         run: |
           dotnet tool restore

.github/workflows/publish-nuget.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-            dotnet-version: '7.0.305'
+            dotnet-version: '9.0.100'
       - name: Restore
         run: |
           dotnet tool restore

.gitignore

@@ -439,6 +439,8 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 
+### Yarn ###
+.yarn
 
 ### Bower ###
 bower_components

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

benchmark/benchmark.fs

@@ -19,7 +19,7 @@ type MLogger = Microsoft.Extensions.Logging.ILogger
 // FS0104: Enums may take values outside known cases
 #nowarn "0104"
 
-[<SimpleJob(RuntimeMoniker.Net70)>]
+[<SimpleJob(RuntimeMoniker.Net90)>]
 // [<EventPipeProfiler(EventPipeProfile.CpuSampling)>]
 type Benchmarks() =
     [<Params(10_000)>]

benchmark/benchmark.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

build/build.fs

@@ -117,6 +117,7 @@ let TestDotNet _ =
 
 let TestFable _ =
     Trace.log " -- Running Fable tests --"
+    Yarn.exec "pretest" id
     Yarn.exec "test" id
 
 let Test _ = ()

build/build.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "9.0.100",
     "rollForward": "latestPatch",
     "allowPrerelease": false
   }

package.json

@@ -12,14 +12,12 @@
     "mochaWatch": "cd tests/FSharp.Logf.Tests/Fable/ && instant-mocha ./bin/mocha --watch -t 10000",
     "testWatch": "concurrently \"yarn fableWatch\" \"yarn mochaWatch\""
   },
-  "dependencies": {},
   "devDependencies": {
     "concurrently": "^7.6.0",
-    "instant-mocha": "^1.5.0",
-    "mocha": "^8.2.1",
+    "mocha": "^9.1.3",
     "mocha-loader": "^5.1.5",
-    "mocha-webpack": "^1.1.0",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1"
-  }
+    "webpack": "^5.91.0",
+    "webpack-cli": "^5.1.4"
+  },
+  "packageManager": "yarn@4.5.3"
 }

paket.dependencies

@@ -5,42 +5,43 @@ nuget BenchmarkDotNet 0.13.5
 # Work around: https://github.com/dotnet/BenchmarkDotNet/issues/2358
 # Perfolizer is a transitive dependency (through BenchmarkDotNet)
 nuget Perfolizer 0.2.1
-nuget BlackFox.MasterOfFoo 1.0
+nuget BlackFox.MasterOfFoo 2.1.0
 nuget Expecto 8.1.0
 nuget Fable.Core 4.0
 nuget Fable.Mocha
-nuget FSharp.Core = 4.6.2
+nuget FSharp.Core = 5.0.0
 nuget Microsoft.Extensions.Logging 6.0.0
 nuget Microsoft.Extensions.Logging.Console
 nuget Microsoft.NET.Test.Sdk
 nuget Serilog
 nuget Serilog.Extensions.Logging
 nuget Serilog.Sinks.File
 nuget Serilog.Sinks.InMemory
-nuget Suave 2.5.0
+nuget Suave 2.6.0
 nuget YoloDev.Expecto.TestSdk
 
 group Build
     source https://api.nuget.org/v3/index.json
-    framework: net7.0
+    framework: net9.0
 
-    nuget Fake.DotNet.Paket ~> 5.23.1
+    nuget Fake.DotNet.Paket ~> 6.1.3
     nuget Fake.JavaScript.Yarn
     nuget Fake.Tools.Git
     nuget FSharp.Core >= 6
-    nuget Fake.Core.Target ~> 5.23.1
-    nuget Fake.DotNet.Cli ~> 5.23.1
+    nuget Fake.Core.Target ~> 6.1.3
+    nuget Fake.DotNet.Cli ~> 6.1.3
     nuget FSharp.Data
-    nuget Microsoft.Build ~> 17.2.0
-    nuget Microsoft.Build.Framework ~> 17.2.0
+    nuget MSBuild.StructuredLogger ~> 2.2.386
+    nuget Microsoft.Build ~> 17.11.4
+    nuget Microsoft.Build.Framework ~> 17.11.4
     nuget Paket.Core
     nuget System.IO.Compression
 
 group Test
     source https://api.nuget.org/v3/index.json
-    framework: net7.0
+    framework: net9.0
 
-    nuget BlackFox.MasterOfFoo >= 1.0
+    nuget BlackFox.MasterOfFoo >= 2.1.0
     nuget Expecto ~> 8.10.0
     nuget Fable.Browser.Dom
     nuget Fable.Core >= 4.0
@@ -49,7 +50,7 @@ group Test
     nuget Microsoft.NET.Test.Sdk
     nuget Serilog.Extensions.Logging
     nuget Serilog.Sinks.TextWriter
-    nuget Suave >= 2.5.0
+    nuget Suave >= 2.6.0
     nuget YoloDev.Expecto.TestSdk
-    nuget FSharp.Core >= 6.0.0
+    nuget FSharp.Core >= 7.0.0