diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 536abad305..d670a767ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,9 +14,11 @@ jobs:
       build: true
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        # We test against different OSes, because the build toolchain has OS-specific dependencies.
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
         node-version: ["20.x", "18.x", "16.x"]
     steps:
       - uses: actions/checkout@v4
diff --git a/package-lock.json b/package-lock.json
index 65d703de05..f98ef700b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55,6 +55,7 @@
         "node": "^16.0.0 || ^18.0.0 || ^20.0.0"
       },
       "optionalDependencies": {
+        "@nx/nx-win32-x64-msvc": "^16.8.1",
         "fsevents": "^2.3.2"
       }
     },
@@ -4595,7 +4596,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
diff --git a/package.json b/package.json
index db5ac8c01d..077b2ab3a2 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,8 @@
     "typescript": "^5.2.2"
   },
   "optionalDependencies": {
-    "fsevents": "^2.3.2"
+    "fsevents": "^2.3.2",
+    "@nx/nx-win32-x64-msvc": "^16.8.1"
   },
   "engines": {
     "node": "^16.0.0 || ^18.0.0 || ^20.0.0"
diff --git a/packages/browser/examples/demoClientApp/package.json b/packages/browser/examples/demoClientApp/package.json
index acce886d60..765b70b3f9 100644
--- a/packages/browser/examples/demoClientApp/package.json
+++ b/packages/browser/examples/demoClientApp/package.json
@@ -8,7 +8,7 @@
     "clean": "rm -rf ./dist",
     "start": "webpack-dev-server --mode development",
     "dev": "npm run start",
-    "build": "ASSET_PATH=\"/demo/\" webpack --mode production",
+    "build": "webpack --mode production",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
diff --git a/packages/browser/examples/demoClientApp/webpack.config.js b/packages/browser/examples/demoClientApp/webpack.config.js
index 903aa6ece7..ae6c69a538 100644
--- a/packages/browser/examples/demoClientApp/webpack.config.js
+++ b/packages/browser/examples/demoClientApp/webpack.config.js
@@ -47,7 +47,7 @@ module.exports = {
     }),
   ],
   output: {
-    publicPath: process.env.ASSET_PATH || "/",
+    publicPath: "./demo/",
   },
   devServer: {
     // TODO: PMCB55: make demo's 'prettier' by avoiding 'localhost'...