Update build script for v0.24

fsbolero · Dec 11, 2024 · 244517f · 244517f
1 parent ad63cbe
commit 244517f
Show file tree

Hide file tree

Showing 8 changed files with 561 additions and 530 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,22 +3,25 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.1.4",
+      "version": "9.0.2",
       "commands": [
         "paket"
-      ]
+      ],
+      "rollForward": false
     },
     "dotnet-serve": {
-      "version": "1.10.172",
+      "version": "1.10.175",
       "commands": [
         "dotnet-serve"
-      ]
+      ],
+      "rollForward": false
     },
     "fsdocs-tool": {
-      "version": "17.2.2",
+      "version": "20.0.1",
       "commands": [
         "fsdocs"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.0.100'
+          dotnet-version: '8.0.404'
 
       - name: Install dependencies
         run: ./tools/install.ps1
@@ -55,4 +55,4 @@ jobs:
           target-branch: master
 
 env:
-  BOLERO_BRANCH: releases/v0.22
+  BOLERO_BRANCH: releases/v0.24
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/paket.lock b/paket.lock
@@ -2,33 +2,33 @@ STORAGE: NONE
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
-    FSharp.Core (6.0.3)
+    FSharp.Core (9.0.100)
     FSharp.Text.RegexProvider (2.1)
       FSharp.Core (>= 4.3.4)
-    HtmlAgilityPack (1.11.42)
-    Markdig (0.28.1)
-      System.Memory (>= 4.5.4)
-    System.Buffers (4.5.1)
-    System.Memory (4.5.4)
-      System.Buffers (>= 4.5.1)
-      System.Numerics.Vectors (>= 4.4)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
-    System.Numerics.Vectors (4.5)
+    HtmlAgilityPack (1.11.71)
+    Markdig (0.38)
+      System.Memory (>= 4.5.5)
+    System.Buffers (4.6)
+    System.Memory (4.6)
+      System.Buffers (>= 4.6)
+      System.Numerics.Vectors (>= 4.6)
+      System.Runtime.CompilerServices.Unsafe (>= 6.1)
+    System.Numerics.Vectors (4.6)
     System.Reflection.Emit.ILGeneration (4.7)
     System.Reflection.Emit.Lightweight (4.7)
       System.Reflection.Emit.ILGeneration (>= 4.7)
-    System.Runtime.CompilerServices.Unsafe (6.0)
-    WebSharper (6.1.5.317)
+    System.Runtime.CompilerServices.Unsafe (6.1)
+    WebSharper (6.1.7.476)
       FSharp.Core (>= 6.0)
       System.Reflection.Emit.Lightweight (>= 4.7)
-    WebSharper.FSharp (6.1.5.317)
-      WebSharper (6.1.5.317)
+    WebSharper.FSharp (6.1.7.476)
+      WebSharper (6.1.7.476)
     WebSharper.HighlightJS (6.1.0.269)
       WebSharper (>= 6.1.3 < 6.2)
-    WebSharper.MathJS (6.1.5.317)
-      WebSharper (6.1.5.317)
+    WebSharper.MathJS (6.1.7.476)
+      WebSharper (6.1.7.476)
     WebSharper.UI (6.1.4.317)
       HtmlAgilityPack (>= 1.11)
       WebSharper (>= 6.1.5 < 6.2)
       WebSharper.MathJS (>= 6.1.5 < 6.2)
-    YamlDotNet (11.2.1)
+    YamlDotNet (16.2.1)
diff --git a/src/Website/index.html b/src/Website/index.html
@@ -7,9 +7,9 @@
   <link rel="icon" type="image/png" href="/img/favicon-16x16.png" sizes="16x16">
   <link rel="icon" type="image/png" href="/img/favicon-32x32.png" sizes="32x32">
   <meta ws-replace="meta" />
-  <link rel="stylesheet" href="/css/all.css" />
   <link rel="stylesheet" href="/docs/content/fsdocs-default.css" />
   <link rel="stylesheet" href="/docs/content/fsdocs-custom.css" />
+  <link rel="stylesheet" href="/css/all.css" />
   <script ws-replace="Head"></script>
 </head>
 <body>

diff --git a/src/Website/scss/all.scss b/src/Website/scss/all.scss
@@ -37,10 +37,28 @@ body {
   color: #222;
 }
 
-pre, code {
+pre, code, code.hljs {
   font-family: $family-monospace;
+  background-color: #f5f5f5;
 }
 
 code {
   background-color: transparent;
 }
+
+/* OVERRIDES FOR fsdocs-default.css */
+
+body {
+  display: block;
+  background-color: transparent;
+}
+
+header {
+  border-bottom: 0;
+  padding: 0;
+  height: auto;
+}
+
+.fsdocs-tip {
+  position: fixed !important;
+}
diff --git a/tools/gen-refdoc.ps1 b/tools/gen-refdoc.ps1
@@ -10,17 +10,19 @@ $BoleroSlnFolder = resolve-path $BoleroSlnFolder
 $OutputDir = resolve-path ./build
 
 if (test-path "$OutputDir/docs/reference") {
-    rm -r $OutputDir/docs/reference/*
+    rm -r $OutputDir/docs/reference/
 }
-else {
-    mkdir $OutputDir/docs/reference
-}
-mv $OutputDir/docs/reference.html $OutputDir/docs/reference/_template.html
+mkdir $OutputDir/docs/reference
 
 if (-not (test-path "$OutputDir/docstmp/")) {
     mkdir "$OutputDir/docstmp/"
 }
 
+if (test-path "$OutputDir/docs/reference.html")
+{
+    mv $OutputDir/docs/reference.html $OutputDir/docs/reference/_template.html
+}
+
 dotnet tool restore
 
 dotnet fsdocs build `