Upgrade to .NET 8

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "7.1.5",
+      "version": "8.0.3",
       "commands": [
         "paket"
       ]
     },
-    "fantomas-tool": {
-      "version": "4.7.9",
+    "fantomas": {
+      "version": "6.2.3",
       "commands": [
         "fantomas"
       ]

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-6.0-focal
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:1-8.0
 
 # [Optional] Uncomment this section to install additional OS packages.
 RUN apt-get update --fix-missing && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/devcontainer.json

@@ -1,50 +1,51 @@
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.106.0/containers/dotnetcore-3.1-fsharp
 {
     "name": "F# (.NET Core)",
     "build": {
         "dockerfile": "Dockerfile",
         "args": {}
     },
-    // Set container specific defaults for F# in .NET Core 2.1+
-    "settings": {
-        "terminal.integrated.profiles.linux": {
-            "bash": {
-                "path": "bash",
-                "icon": "terminal-bash"
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.profiles.linux": {
+                    "bash": {
+                        "path": "bash",
+                        "icon": "terminal-bash"
+                    },
+                    "zsh": {
+                        "path": "zsh"
+                    },
+                    "pwsh": {
+                        "path": "pwsh",
+                        "icon": "terminal-powershell"
+                    }
+                },
+                "FSharp.dotnetRoot": "/bin"
             },
-            "zsh": {
-                "path": "zsh"
-            },
-            "pwsh": {
-                "path": "pwsh",
-                "icon": "terminal-powershell"
-            }
-        },
-        "FSharp.dotnetRoot": "/bin",
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "ms-dotnettools.csharp",
+                "editorconfig.editorconfig",
+                "ybaumes.highlight-trailing-white-spaces",
+                "aaron-bond.better-comments",
+                "gruntfuggly.todo-tree",
+                "cschleiden.vscode-github-actions",
+                "GitHub.copilot",
+                "ionide.ionide-fsharp"
+            ]
+        }
     },
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": [
-        "ms-dotnettools.csharp",
-        "editorconfig.editorconfig",
-        "ybaumes.highlight-trailing-white-spaces",
-        "aaron-bond.better-comments",
-        "gruntfuggly.todo-tree",
-        "cschleiden.vscode-github-actions",
-        "GitHub.copilot",
-        "ionide.ionide-fsharp",
-    ],
     // "runArgs": [],
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
     "forwardPorts": [
         5901,
         6080
     ],
     // Use 'postCreateCommand' to run commands after the container is created.
-    "postCreateCommand": "dotnet run restore",
+    "postStartCommand": "dotnet run restore",
     // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
     "remoteUser": "vscode",
     "features": {
-        "desktop-lite": "latest"
+        "ghcr.io/devcontainers/features/desktop-lite:1": {}
     }
-}
+}

.editorconfig

@@ -9,8 +9,8 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.fs]
+fsharp_multiline_bracket_style = stroustrup
 max_line_length = 90
-fsharp_single_argument_web_mode = true
 
 [*.{c,f}sproj]
 indent_size = 2

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        dotnet: [6.0.300]
+        dotnet: [8.0.201]
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/cd.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        dotnet: [6.0.300]
+        dotnet: [8.0.201]
     runs-on: ${{ matrix.os }}
 
     steps:

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        dotnet: [6.0.300]
+        dotnet: [8.0.201]
     runs-on: ${{ matrix.os }}
 
     steps:

.vscode/launch.json

@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Andromeda/AvaloniaApp/bin/Debug/net6.0/Andromeda.AvaloniaApp",
+            "program": "${workspaceFolder}/src/Andromeda/AvaloniaApp/bin/Debug/net8.0/Andromeda.AvaloniaApp",
             "args": [],
             "cwd": "${workspaceFolder}/src/Andromeda/AvaloniaApp",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
@@ -19,4 +19,4 @@
             "internalConsoleOptions": "openOnSessionStart"
         }
     ]
-}
+}

.vscode/settings.json

@@ -7,5 +7,5 @@
     },
     "editor.formatOnSave": true,
     "files.trimFinalNewlines": true,
-    "FSharp.workspacePath": "Andromeda-for-GOG.sln"
+    "FSharp.workspacePath": "./Andromeda-for-GOG.sln"
 }

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.7.0] - 2024-03-08
+
+### Changed
+
+- Updated runtime: .NET 6 -> .NET 8
+- Updated dependencies
+
 ## [0.6.1] - 2022-06-09
 
 ### Fixed

paket.dependencies

@@ -5,10 +5,12 @@ storage: none
 
 nuget FSharp.Core content: none
 nuget Avalonia
+nuget Avalonia.Desktop
 nuget Avalonia.Diagnostics
 nuget FsToolkit.ErrorHandling
-nuget JaggerJo.Avalonia.FuncUI.DSL
-nuget JaggerJo.Avalonia.FuncUI.Elmish
+nuget Avalonia.FuncUI
+nuget Avalonia.FuncUI.Elmish
+nuget Avalonia.Themes.Simple
 nuget MessageBox.Avalonia
 nuget Mono.Posix.NETStandard
 nuget NicoVIII.GogApi