Update devcontainer, tooling and dependencies

NicoVIII · Mar 9, 2024 · 3456410 · 3456410
1 parent 82087f6
commit 3456410
Show file tree

Hide file tree

Showing 8 changed files with 531 additions and 694 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.2.1",
+      "version": "8.0.3",
       "commands": [
         "paket"
       ]
     },
     "fsdocs-tool": {
-      "version": "18.1.0",
+      "version": "20.0.0",
       "commands": [
         "fsdocs"
       ]
     },
     "fantomas": {
-      "version": "6.0.3",
+      "version": "6.2.3",
       "commands": [
         "fantomas"
       ]

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,22 +1,17 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/dotnet-fsharp
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet-fsharp
 {
     "name": "F# (.NET)",
-    "image": "mcr.microsoft.com/vscode/devcontainers/dotnet:0-6.0",
-    // Set *default* container specific settings.json values on container create.
+    // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+    "image": "mcr.microsoft.com/devcontainers/dotnet:1-6.0-bookworm",
+
+    // Features to add to the dev container. More info: https://containers.dev/features.
+    // "features": {},
+
+    // Configure tool-specific properties.
     "customizations": {
+        // Configure properties specific to VS Code.
         "vscode": {
-            "settings": {
-                "terminal.integrated.profiles.linux": {
-                    "bash": {
-                        "path": "bash"
-                    },
-                    "zsh": {
-                        "path": "zsh"
-                    }
-                },
-                "FSharp.dotnetRoot": "/usr/bin"
-            },
             // Add the IDs of extensions you want installed when the container is created.
             "extensions": [
                 "editorconfig.editorconfig",
@@ -25,13 +20,20 @@
                 "gruntfuggly.todo-tree",
                 "ms-dotnettools.csharp",
                 "Ionide.Ionide-fsharp"
-            ]
+            ],
+            "settings": {
+                "FSharp.dotnetRoot": "/usr/bin"
+            }
         }
     },
+
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": [
-        8080
-    ],
+    // "forwardPorts": [],
+
     // Use 'postCreateCommand' to run commands after the container is created.
-    "postCreateCommand": "dotnet tool restore && dotnet run restore"
-}
+    // "postCreateCommand": "dotnet restore",
+    "postStartCommand": "dotnet tool restore && dotnet run restore"
+
+    // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+    // "remoteUser": "root"
+}
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
     "editor.formatOnSave": true,
     "files.trimFinalNewlines": true,
-    "FSharp.workspacePath": "TypedPersistence.sln"
+    "json.format.keepLines": true,
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/paket.dependencies b/paket.dependencies
@@ -8,14 +8,4 @@ nuget FsCheck
 nuget FSharp.Core >= 6.0 lowest_matching: true, redirects: force
 nuget Expecto.FsCheck
 nuget FsToolkit.ErrorHandling
-nuget NicoVIII.FSharp.Json prerelease
-
-group Docs
-  source https://api.nuget.org/v3/index.json
-
-  framework: netcoreapp3.1, netstandard2.1, netstandard2.0
-  storage: symlink
-
-  nuget FSharp.Compiler.Service ~> 35.0
-  nuget FSharp.Formatting ~> 4.1
-  nuget Newtonsoft.Json
+nuget NicoVIII.FSharp.Json
diff --git a/paket.lock b/paket.lock
@@ -8,80 +8,11 @@ NUGET
     Expecto.FsCheck (9.0.4)
       Expecto (>= 9.0.4)
       FsCheck (>= 2.14.3)
-    FsCheck (2.16.5)
+    FsCheck (2.16.6)
       FSharp.Core (>= 4.2.3)
     FSharp.Core (6.0) - redirects: force
     FsToolkit.ErrorHandling (2.13)
       FSharp.Core (>= 4.7.2)
     Mono.Cecil (0.11.5)
-    NicoVIII.FSharp.Json (0.6)
-      FSharp.Core (>= 4.3.4)
-
-GROUP Docs
-STORAGE: SYMLINK
-RESTRICTION: || (== netcoreapp3.1) (== netstandard2.0) (== netstandard2.1)
-NUGET
-  remote: https://api.nuget.org/v3/index.json
-    FSharp.Compiler.Service (35.0)
-      FSharp.Core (>= 4.6.2)
-      System.Buffers (>= 4.5)
-      System.Collections.Immutable (>= 1.5)
-      System.Memory (>= 4.5.3)
-      System.Reflection.Emit (>= 4.3)
-      System.Reflection.Metadata (>= 1.6)
-      System.Reflection.TypeExtensions (>= 4.3)
-      System.Runtime.Loader (>= 4.0)
-    FSharp.Core (7.0.300)
-    FSharp.Formatting (4.1)
-      FSharp.Compiler.Service (>= 35.0)
-    Microsoft.NETCore.Platforms (7.0.2)
-    Microsoft.NETCore.Targets (5.0)
-    Newtonsoft.Json (13.0.3)
-    System.Buffers (4.5.1)
-    System.Collections.Immutable (7.0)
-      System.Memory (>= 4.5.5)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    System.IO (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-      System.Text.Encoding (>= 4.3)
-      System.Threading.Tasks (>= 4.3)
-    System.Memory (4.5.5)
-      System.Buffers (>= 4.5.1) - restriction: || (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) (== netstandard2.1)
-      System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== netcoreapp3.1) (< netcoreapp2.0)) (== netstandard2.0) (== netstandard2.1)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== netcoreapp3.1) (>= monotouch)) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (&& (== netcoreapp3.1) (>= xamarinios)) (&& (== netcoreapp3.1) (>= xamarinmac)) (&& (== netcoreapp3.1) (>= xamarintvos)) (&& (== netcoreapp3.1) (>= xamarinwatchos)) (== netstandard2.0) (== netstandard2.1)
-    System.Numerics.Vectors (4.5) - restriction: || (&& (== netcoreapp3.1) (< netcoreapp2.0)) (== netstandard2.0) (== netstandard2.1)
-    System.Reflection (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.IO (>= 4.3)
-      System.Reflection.Primitives (>= 4.3)
-      System.Runtime (>= 4.3)
-    System.Reflection.Emit (4.7)
-      System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== netcoreapp3.1) (< netcoreapp2.0) (< netstandard2.1)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) (&& (== netstandard2.1) (< netstandard1.1)) (&& (== netstandard2.1) (< netstandard2.0)) (&& (== netstandard2.1) (>= uap10.1))
-    System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== netcoreapp3.1) (< netcoreapp2.0) (< netstandard2.1)) (&& (== netcoreapp3.1) (< netstandard1.1)) (&& (== netcoreapp3.1) (< netstandard2.0)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0) (&& (== netstandard2.1) (< netstandard1.1)) (&& (== netstandard2.1) (< netstandard2.0)) (&& (== netstandard2.1) (>= uap10.1))
-    System.Reflection.Metadata (7.0.1)
-      System.Collections.Immutable (>= 7.0)
-      System.Memory (>= 4.5.5)
-    System.Reflection.Primitives (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Reflection.TypeExtensions (4.7)
-    System.Runtime (4.3.1)
-      Microsoft.NETCore.Platforms (>= 1.1.1)
-      Microsoft.NETCore.Targets (>= 1.1.3)
-    System.Runtime.CompilerServices.Unsafe (6.0)
-    System.Runtime.Loader (4.3)
-      System.IO (>= 4.3)
-      System.Reflection (>= 4.3)
-      System.Runtime (>= 4.3)
-    System.Text.Encoding (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
-    System.Threading.Tasks (4.3)
-      Microsoft.NETCore.Platforms (>= 1.1)
-      Microsoft.NETCore.Targets (>= 1.1)
-      System.Runtime (>= 4.3)
+    NicoVIII.FSharp.Json (0.7)
+      FSharp.Core (>= 6.0)