From 6e448b54dd75dba81e05a74703d27103b89c2bc7 Mon Sep 17 00:00:00 2001
From: Merijn Hendriks <merijn.d.hendriks@gmail.com>
Date: Wed, 29 Dec 2021 14:19:01 +0100
Subject: [PATCH] Improve vscode debugging

---
 .vscode/extensions.json |  5 +++++
 .vscode/launch.json     | 30 ++++++++++++++++++++++--------
 Server/package.json     |  2 +-
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 .vscode/extensions.json

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..f00e1dd
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "ms-dotnettools.csharp"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6f02eec..a061ade 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,22 +2,36 @@
     "version": "0.2.0",
     "configurations": [
         {
+            "name": "Launcher",
+            "type": "coreclr",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "console": "externalTerminal",
+            "preLaunchTask": "build: launcher",
+            "program": "",
+            "linux": {
+                "program": "${workspaceFolder}/Launcher/bin/Debug/net6.0/linux-x64/Launcher.dll",
+            },
+            "osx": {
+                "program": "${workspaceFolder}/Launcher/bin/Debug/net6.0/osx-x64/Launcher.dll",
+            },
+            "windows": {
+                "program": "${workspaceFolder}/Launcher/bin/Debug/net6.0/win-x64/Launcher.dll",
+            }
+        },
+        {
+            "name": "Server",
             "type": "node",
             "request": "launch",
-            "name": "Server",
+            "cwd": "${workspaceFolder}",
+            "preLaunchTask": "build: server",
+            "console": "externalTerminal",
             "runtimeExecutable": "npm",
             "runtimeArgs": [
                 "--prefix",
                 "Server",
                 "run-script",
                 "debug"
-            ],
-            "cwd": "${workspaceFolder}",
-            "outFiles": [
-                "${workspaceFolder}/out/**/*.js"
-            ],
-            "skipFiles": [
-                "**/node_modules/**"
             ]
         }
     ]
diff --git a/Server/package.json b/Server/package.json
index 9cb577b..df6d999 100644
--- a/Server/package.json
+++ b/Server/package.json
@@ -10,7 +10,7 @@
         "build:exe": "npx nexe -t x64-14.15.3 -i obj/server.js -o bin/Server.exe",
         "build:icon": "cd node_modules/rcedit/bin && rcedit-x64.exe ../../../bin/Server.exe --set-icon ../../../assets/images/favicon.ico",
         "build": "npm run release:any && npm run build:icon",
-        "debug": "npm run release:any && node --trace-warnings obj/server.js",
+        "debug": "node --trace-warnings obj/server.js",
         "lint:fix": "npx eslint --fix \"./src/**/*.ts\"",
         "lint:check": "npx eslint \"./src/**/*.ts\"",
         "release:any": "npm run build:ts && npm run build:babel && npm run build:bundle && npm run build:exe"