Update fsdocs

Author: brianrourkeboll

.config/dotnet-tools.json

@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "fsdocs-tool": {
-      "version": "18.1.0",
+      "version": "20.0.0",
       "commands": [
         "fsdocs"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }

.github/workflows/dotnet.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.x
+        dotnet-version: 8.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
@@ -29,11 +29,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.x
+        dotnet-version: 8.x
       env:
         NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }}
     - name: Pack

.github/workflows/github-pages.yml

@@ -3,45 +3,50 @@ name: Publish docs to GitHub Pages
 on:
   push:
     branches: [ "main" ]
-    
+
 permissions:
+  contents: read
   pages: write
   id-token: write
 
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
 jobs:
   build-docs:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 7.x
+        dotnet-version: 8.x
     - name: Set up GitHub Pages
-      uses: actions/configure-pages@v3
+      uses: actions/configure-pages@v5
     - name: Restore dotnet tools
       run: dotnet tool restore
     - name: Restore dotnet projects
       run: dotnet restore
     - name: Build
-      run: dotnet build ./FSharp.Collections.Builders/FSharp.Collections.Builders.fsproj -c Release -f net7.0
+      run: dotnet build ./FSharp.Collections.Builders/FSharp.Collections.Builders.fsproj -c Release -f net8.0
     - name: Copy readme to docs folder
       run: cp README.md docs/index.md
     - name: Build docs
       run: |
         dotnet fsdocs build \
           --output ./out \
-          --properties Configuration=Release TargetFramework=net7.0 \
+          --properties Configuration=Release TargetFramework=net8.0 \
           --parameters \
             fsdocs-license-link https://github.com/brianrourkeboll/FSharp.Collections.Builders/blob/main/LICENSE.md \
             fsdocs-release-notes-link https://github.com/brianrourkeboll/FSharp.Collections.Builders/releases
     - name: Upload GitHub Pages artifact
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v3
       with:
         path: './out'
-  
+
   publish-docs:
 
     needs: build-docs
@@ -53,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v1
+      uses: actions/deploy-pages@v4

FSharp.Collections.Builders/FSharp.Collections.Builders.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>FSharp.Collections.Builders</PackageId>
     <Version>0.1.0-beta.2</Version>
@@ -16,7 +16,7 @@
     <PackageIcon>logo.png</PackageIcon>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Copyright>© 2023 Brian Rourke Boll</Copyright>
+    <Copyright>© 2024 Brian Rourke Boll</Copyright>
     <!-- FS3390: XML documentation validation -->
     <!-- FS1182: Unused values -->
     <WarnOn>$(WarnOn);3390;1182</WarnOn>
@@ -47,8 +47,8 @@
     <PackageReference Update="FSharp.Core" Version="6.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Update="FSharp.Core" Version="7.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Update="FSharp.Core" Version="8.0.100" />
   </ItemGroup>
 
 </Project>

README.md

@@ -29,7 +29,7 @@ list, array, and sequence expressions, including `for`, `while`, `yield!`, `try`
 ### `FSharp.Collections.Builders`
 
 Open `FSharp.Collections.Builders` for type-inference-friendly builders that behave similarly to the built-in list,
-array, and sequence expressions in that they treat any collection used with `for` or `yield!` as a `seq<_>`.
+array, and sequence expressions in that they treat any collection used with `for` or `yield!` as a `_ seq`.
 
 ```fsharp
 open FSharp.Collections.Builders
@@ -70,13 +70,13 @@ let ys = resizeArray { for x in xs -> float x * 2.0 }
 let f xs = resizeArray { for x in xs do if x % 3 = 0 then x }
 ```
 
-> `xs` is `seq<int>`.
+> `xs` is `int seq`.
 
 ```fsharp
 let g xs = resizeArray<float> { for x in xs -> x * x }
 ```
 
-> `xs` is `seq<float>`.
+> `xs` is `float seq`.
 
 ### `hashSet`
 
@@ -178,7 +178,7 @@ let m = map { for x in 1..100 -> x, x * x }
 > or
 >
 > ```fsharp
-> let m = (Map.empty, {1..100}) ||> Map.fold (fun m x -> m.Add (x, x * x))
+> let m = (Map.empty, {1..100}) ||> Seq.fold (fun m x -> m.Add (x, x * x))
 > ```
 
 ## Immutable collections from `System.Collections.Immutable`
@@ -269,7 +269,7 @@ let s =
 let s = sum { for x in xs do if x % 3 = 0 then x }
 ```
 
-The Greek capital letter sigma `Σ` (easily enterable via <kbd>⊞ Win</kbd> + <kbd>.</kbd> on Windows) may read better in certain domains:
+The Greek capital letter sigma `Σ` may read better in certain domains:
 
 ```fsharp
 Σ { for item in items -> item.Subtotal } <= 0.10 * total
@@ -308,7 +308,7 @@ let g xs =
 F#'s built-in [list](https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/lists#creating-and-initializing-lists),
 [array](https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/arrays#create-arrays),
 and [sequence](https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/sequences#sequence-expressions) expressions
-make initializing and transforming `'T list`, `'T array`, and `seq<'T>` quite nice:
+make initializing and transforming `'T list`, `'T array`, and `'T seq` quite nice:
 
 #### List literal
 
@@ -353,7 +353,7 @@ Or, to keep the ergonomics of sequence expressions, you must instantiate and ite
 let nums = ResizeArray [1; 2; 3]
 ```
 
-#### Instantiates and iterates over an intermediate `seq<int>`
+#### Instantiates and iterates over an intermediate `int seq`
 
 ```fsharp
 let nums = ResizeArray (seq { 1; 2; 3 })

docs/content/fsdocs-custom.css

@@ -0,0 +1,10 @@
+:root {
+    --monospace-font: 'Cascadia Code', 'Fira Code', monospace;
+}
+
+pre,
+code,
+.fsdocs-tip,
+.fssnip {
+    font-feature-settings: 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'zero', 'onum', 'calt';
+}