cwtools · tboby · Jul 12, 2025 · Jul 10, 2025 · Jul 10, 2025 · Jul 11, 2025
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - uses: actions/setup-node@v4
       with:
         node-version: 18
@@ -27,7 +27,7 @@ jobs:
     - name: Test
       run: /bin/sh ./build.sh DryRelease
     - name: 'Upload Artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: cwtools-vscode-pipeline.vsix
         path: temp/*.vsix

diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,6 @@ nupkgs/
 .ionide/
 .vscode-test/
 .fake
-.ionide
+.ionide
+*.user
+cwtools.local.props
diff --git a/.vscode-test.js b/.vscode-test.js
@@ -0,0 +1,15 @@
+/** @type {import('@vscode/test-cli').TestConfig} */
+module.exports = {
+  vscode: 'stable',
+  extensionDevelopmentPath: "release",
+  extensionTestsEnv: { NODE_ENV: 'test' },
+  extensionTestsPath: './out/client/test/suite',
+  files: './out/client/test/suite/**/*.test.js',
+  launchArgs: [
+    // Sample workspace the tests expect
+    './client/test/sample mod',
+    // Bring the file under test into the workspace
+    './client/test/sample mod/events/irm.txt'
+  ]
+  // workplaceFolder: "D:\Synced\Git\Personal\cwtools-vscode\client\test\sample mod"
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,50 +9,38 @@
             "name": ".NET Core Attach",
             "type": "coreclr",
             "request": "attach",
-            "processId": "${command:pickProcess}",
+            "processName": "CWTools Server.exe",
             "symbolOptions": {
-                "searchPaths": ["${workspaceFolder}/out/server/local"],
+                "searchPaths": ["${workspaceFolder}/release/bin/server/win-x64","${workspaceFolder}/release/bin/server/linux-x64","${workspaceFolder}/release/bin/server/osx-x64" ],
                 "searchMicrosoftSymbolServer": true
             },
-            "justMyCode": false
+            "preLaunchTask": "Wait For Process",
+            "presentation": {
+                "hidden": true
+            }
         },
         {
-            "name": "Extension",
-            "type": "extensionHost",
+            "name": "Extension Tests (CLI)",
+            "type": "node",
             "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "F:\\Games\\Steam\\steamapps\\common\\Stellaris", "--extensionDevelopmentPath=${workspaceFolder}"
-            ],
-            "outFiles": [
-                "${workspaceFolder}/out/**/*.js"
-            ],
-            "preLaunchTask": "npm: watch"
+            "program": "${workspaceFolder}/node_modules/@vscode/test-cli/bin/vscode-test",
+            "args": ["-c", "${workspaceFolder}/.vscode-test.js"],
+            "cwd": "${workspaceFolder}"
         },
         {
-            "name": "Extension Tests",
+            "preLaunchTask": "UpdateBuildDebug",
+            "name": "Quick update, Build and Launch Extension (Debug)",
             "type": "extensionHost",
-            "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "${workspaceFolder}/client/test/sample mod",
-                "${workspaceFolder}/client/test/sample mod/events/irm.txt",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/client/test/suite"
+                "D:\\Games\\Steam\\steamapps\\common\\Stellaris",
+                "--extensionDevelopmentPath=${workspaceRoot}/release"
             ],
-            "outFiles": [
-                "${workspaceFolder}/out/client/test/**/*.js"
-            ]
-        },
-        {
-            "preLaunchTask": "Build",
-			"name": "Quick Build and Launch Extension",
-			"type": "extensionHost",
-			"runtimeExecutable": "${execPath}",
-			"args": ["D:\\Games\\Steam\\steamapps\\common\\Stellaris",  "--extensionDevelopmentPath=${workspaceRoot}/release" ],
-			"stopOnEntry": false,
-			"request": "launch",
-            "sourceMaps": false
+            "request": "launch",
+            "sourceMaps": false,
+            "presentation": {
+                "hidden": true
+            }
         },
         {
             "preLaunchTask": "UpdateBuild",
@@ -64,29 +52,30 @@
                 "--extensionDevelopmentPath=${workspaceRoot}/release"
             ],
             "request": "launch",
-            "sourceMaps": false
+            "sourceMaps": false,
+            "presentation": {
+                "hidden": true
+            }
         },
+    ],
+    "compounds": [
         {
-            "preLaunchTask": "UpdateBuildLocal",
-            "name": "Quick update, Build and Launch Extension (Local)",
-            "type": "extensionHost",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "D:\\Games\\Steam\\steamapps\\common\\Stellaris",
-                "--extensionDevelopmentPath=${workspaceRoot}/release"
-            ],
-            "request": "launch",
-            "sourceMaps": false
+            "name": "Debug cwtools",
+            "configurations": ["Quick update, Build and Launch Extension (Debug)", ".NET Core Attach"],
+            "presentation": {
+                "group": "Full",
+                "order": 2
+            }
         },
-		{
-            "name": "Launch Only",
-			"type": "extensionHost",
-			"runtimeExecutable": "${execPath}",
-			"args": ["--extensionDevelopmentPath=${workspaceRoot}/release" ],
-			"stopOnEntry": false,
-			"request": "launch",
-            "sourceMaps": false,
-
+        {
+            "name": "Run cwtools (optimised)",
+            "configurations": [
+                "Quick update, Build and Launch Extension"
+            ],
+            "presentation": {
+                "group": "Full",
+                "order": 1
+            }
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -3,6 +3,22 @@
 {
     "version": "2.0.0",
     "tasks": [
+        {
+            "label": "Wait For Process",
+            "type": "shell",
+            "problemMatcher": [],
+            // --- Linux & macOS Command ---
+            "linux": {
+                "command": "echo 'Waiting for process to start...'; while ! pgrep -f 'CWTools Server'; do sleep 1; done; echo 'Process found. Continuing!'"
+            },
+            "osx": {
+                "command": "echo 'Waiting for process to start...'; while ! pgrep -f 'CWTools Server'; do sleep 1; done; echo 'Process found. Continuing!'"
+            },
+            // --- Windows Command (using PowerShell) ---
+            "windows": {
+                "command": "echo 'Waiting for process to start...'; while (-not (Get-Process -Name 'CWTools Server' -ErrorAction SilentlyContinue)) { Start-Sleep -Seconds 1 }; echo 'Process found. Continuing!'"
+            }
+        },
         {
             "type": "npm",
             "script": "watch-client",
@@ -30,6 +46,20 @@
                 "isDefault": true
             }
         },
+        {
+            "command": "${workspaceRoot}/build.sh",
+            "windows": {
+                "command": "${workspaceRoot}/build.cmd"
+            },
+            "label": "BuildLocalDebug",
+            "args": [
+                "QuickBuildLocalDebug"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
         {
             "command": "${workspaceRoot}/build.sh",
             "windows": {
@@ -44,21 +74,35 @@
                 "isDefault": true
             }
         },
+        {
+            "command": "${workspaceRoot}/build.sh",
+            "windows": {
+                "command": "${workspaceRoot}/build.cmd"
+            },
+            "label": "BuildDebug",
+            "args": [
+                "QuickBuildDebug"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
         {
             "label": "PaketUpdate",
             "command": "dotnet",
-            "args": ["paket", "update", "-g", "git"]
+            "args": ["paket", "update", "-g", "git", "--no-install"]
         },
         {
             "label": "UpdateBuild",
             "dependsOn" :[ "PaketUpdate" ,"Build" ],
             "dependsOrder": "sequence"
         },
         {
-            "label": "UpdateBuildLocal",
+            "label": "UpdateBuildDebug",
             "dependsOn": [
                 "PaketUpdate",
-                "BuildLocal"
+                "BuildDebug"
             ],
             "dependsOrder": "sequence"
         }

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,15 @@
+# Contributing
+
+To use a local cwtools git repo, create a file called `cwtools.local.props` containing:
+
+```xml
+<Project>
+  <PropertyGroup>
+    <!-- turn on the local path and define where cwtools lives -->
+    <UseLocalCwtools Condition="'$(UseLocalCwtools)' == ''">>True</UseLocalCwtools>
+    <CwtoolsPath>../../../cwtools/cwtools/cwtools.fsproj</CwtoolsPath>
+  </PropertyGroup>
+</Project>
+```
+
+And amend the path to your repo. The default assumes it's adjacent to this repo.
diff --git a/build.nu b/build.nu
@@ -0,0 +1,10 @@
+def main [profile? : string] {
+
+dotnet tool restore
+dotnet paket restore
+let exit_code = $env.LAST_EXIT_CODE
+if $exit_code != 0 {
+    exit $exit_code
+}
+dotnet run --project build -- -t ($profile | default "QuickBuild")
+}